[spring-extensions] branch master updated: IDP-1167 dos2unix as apporpriate
Rod Widdowson
rdw at steadingsoftware.com
Sun May 21 09:36:21 EDT 2017
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository spring-extensions.
View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=c06855125461f6547bbea714d0bf5842d67a56a7
The following commit(s) were added to refs/heads/master by this push:
new c068551 IDP-1167 dos2unix as apporpriate
c068551 is described below
commit c06855125461f6547bbea714d0bf5842d67a56a7
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun May 21 14:29:23 2017 +0100
IDP-1167 dos2unix as apporpriate
https://issues.shibboleth.net/jira/browse/IDP-1167
Undo the damage caused by inappropriate windows set ups since forever.
1) grep for <cr> in the tree
2) exclude binary files (*.png, *.jks, *.pk*, *.der, *.pem and so forth)
3) run dos2unix on the rest
---
.../ext/spring/error/ErrorRaisingController.java | 126 ++++++++++-----------
src/test/resources/logback-test.xml | 36 +++---
.../ext/spring/resource/FileBackedHTTPBean.xml | 40 +++----
.../ext/spring/resource/MemBackedHTTPBean.xml | 38 +++----
.../ext/spring/resource/TestResource.txt | 16 +--
.../shibboleth/ext/spring/resource/oldStyle.xml | 86 +++++++-------
.../shibboleth/ext/spring/service/BrokenBean1.xml | 20 ++--
.../shibboleth/ext/spring/service/BrokenBean2.xml | 16 +--
.../ext/spring/service/ReloadableBeans1.xml | 102 ++++++++---------
.../ext/spring/service/ReloadableSpringService.xml | 58 +++++-----
.../ext/spring/service/ServiceableBean1.xml | 24 ++--
.../ext/spring/service/ServiceableBean2.xml | 24 ++--
12 files changed, 293 insertions(+), 293 deletions(-)
diff --git a/src/main/java/net/shibboleth/ext/spring/error/ErrorRaisingController.java b/src/main/java/net/shibboleth/ext/spring/error/ErrorRaisingController.java
index 3a91c73..e35a024 100644
--- a/src/main/java/net/shibboleth/ext/spring/error/ErrorRaisingController.java
+++ b/src/main/java/net/shibboleth/ext/spring/error/ErrorRaisingController.java
@@ -1,64 +1,64 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.ext.spring.error;
-
-import javax.annotation.Nonnull;
-import javax.servlet.http.HttpServletRequest;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * MVC controller for responding to errors by dispatching them to the MVC error handling umbrella.
- */
-public class ErrorRaisingController {
-
- /** Class logger. */
- @Nonnull private final Logger log = LoggerFactory.getLogger(ErrorRaisingController.class);
-
- /**
- * Handle an error dispatched by the container by re-raising it.
- *
- * @param httpRequest the HTTP request
- *
- * @throws Throwable
- */
- @RequestMapping
- // Checkstyle: IllegalThrows OFF
- public void raiseError(@Nonnull final HttpServletRequest httpRequest) throws Throwable {
-
- final Object uri = httpRequest.getAttribute("javax.servlet.error.request_uri");
-
- final Object exception = httpRequest.getAttribute("javax.servlet.error.exception");
- if (exception == null || !(exception instanceof Exception)) {
- log.error("No exception found in request attribute, raising a generic error");
- throw new IllegalArgumentException("No exception found in request attribute");
- }
-
- final Exception e = (Exception) exception;
- log.error("Propagating exception thrown by request to {}", uri);
- if (e.getCause() != null) {
- throw e.getCause();
- } else {
- throw e;
- }
- }
- // Checkstyle: IllegalThrows ON
-
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.shibboleth.ext.spring.error;
+
+import javax.annotation.Nonnull;
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * MVC controller for responding to errors by dispatching them to the MVC error handling umbrella.
+ */
+public class ErrorRaisingController {
+
+ /** Class logger. */
+ @Nonnull private final Logger log = LoggerFactory.getLogger(ErrorRaisingController.class);
+
+ /**
+ * Handle an error dispatched by the container by re-raising it.
+ *
+ * @param httpRequest the HTTP request
+ *
+ * @throws Throwable
+ */
+ @RequestMapping
+ // Checkstyle: IllegalThrows OFF
+ public void raiseError(@Nonnull final HttpServletRequest httpRequest) throws Throwable {
+
+ final Object uri = httpRequest.getAttribute("javax.servlet.error.request_uri");
+
+ final Object exception = httpRequest.getAttribute("javax.servlet.error.exception");
+ if (exception == null || !(exception instanceof Exception)) {
+ log.error("No exception found in request attribute, raising a generic error");
+ throw new IllegalArgumentException("No exception found in request attribute");
+ }
+
+ final Exception e = (Exception) exception;
+ log.error("Propagating exception thrown by request to {}", uri);
+ if (e.getCause() != null) {
+ throw e.getCause();
+ } else {
+ throw e;
+ }
+ }
+ // Checkstyle: IllegalThrows ON
+
}
\ No newline at end of file
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 3db9f1c..4cfbb12 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
- <logger name="net.shibboleth.ext.spring" level="TRACE"/>
- <logger name="net.shibboleth.utilities" level="DEBUG"/>
-
- <appender name="CONSOLE" 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="WARN">
- <appender-ref ref="CONSOLE"/>
- </root>
-
-</configuration>
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+ <logger name="net.shibboleth.ext.spring" level="TRACE"/>
+ <logger name="net.shibboleth.utilities" level="DEBUG"/>
+
+ <appender name="CONSOLE" 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="WARN">
+ <appender-ref ref="CONSOLE"/>
+ </root>
+
+</configuration>
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/FileBackedHTTPBean.xml b/src/test/resources/net/shibboleth/ext/spring/resource/FileBackedHTTPBean.xml
index f0ef12c..ae24d2d 100644
--- a/src/test/resources/net/shibboleth/ext/spring/resource/FileBackedHTTPBean.xml
+++ b/src/test/resources/net/shibboleth/ext/spring/resource/FileBackedHTTPBean.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="clientBuilder"
- class="net.shibboleth.utilities.java.support.httpclient.FileCachingHttpClientBuilder"
- p:maxCacheEntries="3" p:cacheDirectory-ref="theDir" />
-
- <bean id="apacheClient" factory-bean="clientBuilder" init-method="initialize" destroy-method="destroy"
- factory-method="buildClient" />
-
- <bean id="ShibResource" class="net.shibboleth.ext.spring.resource.HTTPResource"
- c:client-ref="apacheClient" c:url="https://git.shibboleth.net/view/?p=spring-extensions.git;a=blob_plain;f=src/test/resources/data/document.xml;h=e8ec7c0d20c7a6b8193e1868398cda0c28df45ed;hb=HEAD" />
-
-<!-- for testing we will use our test resource -->
- <bean id="TestResource" class="net.shibboleth.ext.spring.resource.TestHTTPResource"
- c:client-ref="apacheClient" c:url="https://git.shibboleth.net/view/?p=spring-extensions.git;a=blob_plain;f=src/test/resources/data/document.xml;h=e8ec7c0d20c7a6b8193e1868398cda0c28df45ed;hb=HEAD" />
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean id="clientBuilder"
+ class="net.shibboleth.utilities.java.support.httpclient.FileCachingHttpClientBuilder"
+ p:maxCacheEntries="3" p:cacheDirectory-ref="theDir" />
+
+ <bean id="apacheClient" factory-bean="clientBuilder" init-method="initialize" destroy-method="destroy"
+ factory-method="buildClient" />
+
+ <bean id="ShibResource" class="net.shibboleth.ext.spring.resource.HTTPResource"
+ c:client-ref="apacheClient" c:url="https://git.shibboleth.net/view/?p=spring-extensions.git;a=blob_plain;f=src/test/resources/data/document.xml;h=e8ec7c0d20c7a6b8193e1868398cda0c28df45ed;hb=HEAD" />
+
+<!-- for testing we will use our test resource -->
+ <bean id="TestResource" class="net.shibboleth.ext.spring.resource.TestHTTPResource"
+ c:client-ref="apacheClient" c:url="https://git.shibboleth.net/view/?p=spring-extensions.git;a=blob_plain;f=src/test/resources/data/document.xml;h=e8ec7c0d20c7a6b8193e1868398cda0c28df45ed;hb=HEAD" />
+
</beans>
\ No newline at end of file
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/MemBackedHTTPBean.xml b/src/test/resources/net/shibboleth/ext/spring/resource/MemBackedHTTPBean.xml
index 25b89a1..97a3b7f 100644
--- a/src/test/resources/net/shibboleth/ext/spring/resource/MemBackedHTTPBean.xml
+++ b/src/test/resources/net/shibboleth/ext/spring/resource/MemBackedHTTPBean.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="clientBuilder" class="net.shibboleth.utilities.java.support.httpclient.InMemoryCachingHttpClientBuilder"
- p:maxCacheEntries="3" />
-
- <bean id="apacheClient"
- factory-bean="clientBuilder"
- factory-method="buildClient"/>
-
- <bean id="Resource" class="net.shibboleth.ext.spring.resource.HTTPResource"
- c:client-ref="apacheClient" c:url="https://git.shibboleth.net/view/?p=spring-extensions.git;a=blob_plain;f=src/test/resources/data/document.xml;h=e8ec7c0d20c7a6b8193e1868398cda0c28df45ed;hb=HEAD" />
-
- <!-- for testing we will use our test resource -->
- <bean id="TestResource" class="net.shibboleth.ext.spring.resource.TestHTTPResource"
- c:client-ref="apacheClient" c:url="https://git.shibboleth.net/view/?p=spring-extensions.git;a=blob_plain;f=src/test/resources/data/document.xml;h=e8ec7c0d20c7a6b8193e1868398cda0c28df45ed;hb=HEAD" />
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean id="clientBuilder" class="net.shibboleth.utilities.java.support.httpclient.InMemoryCachingHttpClientBuilder"
+ p:maxCacheEntries="3" />
+
+ <bean id="apacheClient"
+ factory-bean="clientBuilder"
+ factory-method="buildClient"/>
+
+ <bean id="Resource" class="net.shibboleth.ext.spring.resource.HTTPResource"
+ c:client-ref="apacheClient" c:url="https://git.shibboleth.net/view/?p=spring-extensions.git;a=blob_plain;f=src/test/resources/data/document.xml;h=e8ec7c0d20c7a6b8193e1868398cda0c28df45ed;hb=HEAD" />
+
+ <!-- for testing we will use our test resource -->
+ <bean id="TestResource" class="net.shibboleth.ext.spring.resource.TestHTTPResource"
+ c:client-ref="apacheClient" c:url="https://git.shibboleth.net/view/?p=spring-extensions.git;a=blob_plain;f=src/test/resources/data/document.xml;h=e8ec7c0d20c7a6b8193e1868398cda0c28df45ed;hb=HEAD" />
+
</beans>
\ No newline at end of file
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/TestResource.txt b/src/test/resources/net/shibboleth/ext/spring/resource/TestResource.txt
index b471347..eec216c 100644
--- a/src/test/resources/net/shibboleth/ext/spring/resource/TestResource.txt
+++ b/src/test/resources/net/shibboleth/ext/spring/resource/TestResource.txt
@@ -1,9 +1,9 @@
-Entirely Different Data
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvina [...]
-
-Vivamus fermentum semper porta. Nunc diam velit, adipiscing ut tristique vitae, sagittis vel odio. Maecenas convallis ullamcorper ultricies. Curabitur ornare, ligula semper consectetur sagittis, nisi diam iaculis velit, id fringilla sem nunc vel mi. Nam dictum, odio nec pretium volutpat, arcu ante placerat erat, non tristique elit urna et turpis. Quisque mi metus, ornare sit amet fermentum et, tincidunt et orci. Fusce eget orci a orci congue vestibulum. Ut dolor diam, elementum et vestib [...]
-
-Suspendisse lectus leo, consectetur in tempor sit amet, placerat quis neque. Etiam luctus porttitor lorem, sed suscipit est rutrum non. Curabitur lobortis nisl a enim congue semper. Aenean commodo ultrices imperdiet. Vestibulum ut justo vel sapien venenatis tincidunt. Phasellus eget dolor sit amet ipsum dapibus condimentum vitae quis lectus. Aliquam ut massa in turpis dapibus convallis. Praesent elit lacus, vestibulum at malesuada et, ornare et est. Ut augue nunc, sodales ut euismod non, [...]
-
+Entirely Different Data
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvina [...]
+
+Vivamus fermentum semper porta. Nunc diam velit, adipiscing ut tristique vitae, sagittis vel odio. Maecenas convallis ullamcorper ultricies. Curabitur ornare, ligula semper consectetur sagittis, nisi diam iaculis velit, id fringilla sem nunc vel mi. Nam dictum, odio nec pretium volutpat, arcu ante placerat erat, non tristique elit urna et turpis. Quisque mi metus, ornare sit amet fermentum et, tincidunt et orci. Fusce eget orci a orci congue vestibulum. Ut dolor diam, elementum et vestib [...]
+
+Suspendisse lectus leo, consectetur in tempor sit amet, placerat quis neque. Etiam luctus porttitor lorem, sed suscipit est rutrum non. Curabitur lobortis nisl a enim congue semper. Aenean commodo ultrices imperdiet. Vestibulum ut justo vel sapien venenatis tincidunt. Phasellus eget dolor sit amet ipsum dapibus condimentum vitae quis lectus. Aliquam ut massa in turpis dapibus convallis. Praesent elit lacus, vestibulum at malesuada et, ornare et est. Ut augue nunc, sodales ut euismod non, [...]
+
Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In euismod ultrices facilisis. Vestibulum porta sapien adipiscing augue congue id pretium lectus molestie. Proin quis dictum nisl. Morbi id quam sapien, sed vestibulum sem. Duis elementum rutrum mauris sed convallis. Proin vestibulum magna mi. Aenean tristique hendrerit magna, ac facilisis nulla hendrerit ut. Sed non tortor sodales quam auctor elementum. Donec hendrerit nunc eget elit pharetra pul [...]
\ No newline at end of file
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/oldStyle.xml b/src/test/resources/net/shibboleth/ext/spring/resource/oldStyle.xml
index d051c40..1173881 100644
--- a/src/test/resources/net/shibboleth/ext/spring/resource/oldStyle.xml
+++ b/src/test/resources/net/shibboleth/ext/spring/resource/oldStyle.xml
@@ -1,44 +1,44 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-
- <bean id="shibboleth.NonCachingHttpClient"
- lazy-init="true"
- class="net.shibboleth.ext.spring.factory.HttpClientFactoryBean"
- p:tLSSocketFactory="#{ %{idp.httpclient.useTrustEngineTLSSocketFactory:false} ? @'shibboleth.TrustEngineTLSSocketFactory' : null }"
- p:connectionDisregardTLSCertificate="%{idp.httpclient.connectionDisregardTLSCertificate:false}"
- p:connectionTimeout="%{idp.httpclient.connectionTimeout:-1}" />
-
- <bean id="urlBean" class="java.net.URL" c:_0="%{the.url}"/>
-
- <bean id="namedString" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
- c:client-ref="shibboleth.NonCachingHttpClient"
- c:url="%{the.url}"
- c:resource="%{file.name}"/>
-
- <bean id="namedURL" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
- c:client-ref="shibboleth.NonCachingHttpClient"
- c:url-ref="urlBean"
- c:resource="%{file.name}"/>
-
- <bean id="namedFileString" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
- c:client-ref="shibboleth.NonCachingHttpClient"
- c:url="%{the.url}"
- c:resource="file://%{file.name}"/>
-
- <bean id="numberedString" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
- c:_0-ref="shibboleth.NonCachingHttpClient"
- c:_1="%{the.url}"
- c:_2="%{file.name}"/>
-
- <bean id="numberedURL" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
- c:_0-ref="shibboleth.NonCachingHttpClient"
- c:_1-ref="urlBean"
- c:_2="%{file.name}"/>
-</beans>
-
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+ <bean id="shibboleth.NonCachingHttpClient"
+ lazy-init="true"
+ class="net.shibboleth.ext.spring.factory.HttpClientFactoryBean"
+ p:tLSSocketFactory="#{ %{idp.httpclient.useTrustEngineTLSSocketFactory:false} ? @'shibboleth.TrustEngineTLSSocketFactory' : null }"
+ p:connectionDisregardTLSCertificate="%{idp.httpclient.connectionDisregardTLSCertificate:false}"
+ p:connectionTimeout="%{idp.httpclient.connectionTimeout:-1}" />
+
+ <bean id="urlBean" class="java.net.URL" c:_0="%{the.url}"/>
+
+ <bean id="namedString" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
+ c:client-ref="shibboleth.NonCachingHttpClient"
+ c:url="%{the.url}"
+ c:resource="%{file.name}"/>
+
+ <bean id="namedURL" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
+ c:client-ref="shibboleth.NonCachingHttpClient"
+ c:url-ref="urlBean"
+ c:resource="%{file.name}"/>
+
+ <bean id="namedFileString" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
+ c:client-ref="shibboleth.NonCachingHttpClient"
+ c:url="%{the.url}"
+ c:resource="file://%{file.name}"/>
+
+ <bean id="numberedString" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
+ c:_0-ref="shibboleth.NonCachingHttpClient"
+ c:_1="%{the.url}"
+ c:_2="%{file.name}"/>
+
+ <bean id="numberedURL" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
+ c:_0-ref="shibboleth.NonCachingHttpClient"
+ c:_1-ref="urlBean"
+ c:_2="%{file.name}"/>
+</beans>
+
\ No newline at end of file
diff --git a/src/test/resources/net/shibboleth/ext/spring/service/BrokenBean1.xml b/src/test/resources/net/shibboleth/ext/spring/service/BrokenBean1.xml
index 1e13f96..0f35477 100644
--- a/src/test/resources/net/shibboleth/ext/spring/service/BrokenBean1.xml
+++ b/src/test/resources/net/shibboleth/ext/spring/service/BrokenBean1.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-
- <bean id="RequestedAttributesMapper"
- class="net.shibboleth.ext.spring.service.TestServiceableComponent"
- p:theValue="One"
- p:id="RequestedAttributesMapper"
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+
+ <bean id="RequestedAttributesMapper"
+ class="net.shibboleth.ext.spring.service.TestServiceableComponent"
+ p:theValue="One"
+ p:id="RequestedAttributesMapper"
</beans>
\ No newline at end of file
diff --git a/src/test/resources/net/shibboleth/ext/spring/service/BrokenBean2.xml b/src/test/resources/net/shibboleth/ext/spring/service/BrokenBean2.xml
index 917f9e5..ccfe427 100644
--- a/src/test/resources/net/shibboleth/ext/spring/service/BrokenBean2.xml
+++ b/src/test/resources/net/shibboleth/ext/spring/service/BrokenBean2.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="RequestedAttributesMapper"
- class="net.shibboleth.ext.spring.spring.naturestudy.TheBean"
- p:message="Spring"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean id="RequestedAttributesMapper"
+ class="net.shibboleth.ext.spring.spring.naturestudy.TheBean"
+ p:message="Spring"/>
</beans>
\ No newline at end of file
diff --git a/src/test/resources/net/shibboleth/ext/spring/service/ReloadableBeans1.xml b/src/test/resources/net/shibboleth/ext/spring/service/ReloadableBeans1.xml
index caa597a..e5630a6 100644
--- a/src/test/resources/net/shibboleth/ext/spring/service/ReloadableBeans1.xml
+++ b/src/test/resources/net/shibboleth/ext/spring/service/ReloadableBeans1.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
-
- <!-- This bean exists in the "top" level context. -->
- <bean id="nonReloadableBean" class="net.shibboleth.ext.spring.service.NonReloadableTestBean"
- c:_0="One">
- <!-- This ensures that this singleton gets a "fresh" copy of the injected bean each call. -->
- <lookup-method name="getChild" bean="reloadableBean" />
- </bean>
-
- <!-- This bean only exists in the embedded "reloadable" context because of its custom scope. -->
- <bean id="reloadableBean" class="net.shibboleth.ext.spring.service.ReloadableTestBean" scope="reloadable"
- c:_0="Two" c:_1="10" />
-
- <!--
- This machinery installs an embedded copy of this same bean set into itself. The "default" profile ensures that
- the embedded copy ignores these beans because the bean profile there is overridden to a non-default value.
- The BeanFactoryPostProcessor ensures that the embedded version's reloadable beans become singletons and the
- rest are ignored (via lazy-init). Most of this can be buried in parent beans.
- -->
- <beans profile="default">
- <bean id="reloadableBeanService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
- p:beanProfiles="reloadable"
- p:serviceConfigurations="classpath:/net/shibboleth/ext/spring/service/ReloadableBeans1.xml">
- <constructor-arg name="claz" value="org.springframework.context.ApplicationContext" />
- <constructor-arg name="strategy">
- <bean class="net.shibboleth.ext.spring.service.ApplicationContextServiceStrategy" />
- </constructor-arg>
- <property name="beanFactoryPostProcessors">
- <bean class="net.shibboleth.ext.spring.config.NonReloadableExcluder" />
- </property>
- </bean>
-
- <bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
- <property name="scopes">
- <map>
- <entry key="reloadable">
- <bean class="net.shibboleth.ext.spring.config.ReloadableScope"
- c:service-ref="reloadableBeanService" />
- </entry>
- </map>
- </property>
- </bean>
- </beans>
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+
+ <!-- This bean exists in the "top" level context. -->
+ <bean id="nonReloadableBean" class="net.shibboleth.ext.spring.service.NonReloadableTestBean"
+ c:_0="One">
+ <!-- This ensures that this singleton gets a "fresh" copy of the injected bean each call. -->
+ <lookup-method name="getChild" bean="reloadableBean" />
+ </bean>
+
+ <!-- This bean only exists in the embedded "reloadable" context because of its custom scope. -->
+ <bean id="reloadableBean" class="net.shibboleth.ext.spring.service.ReloadableTestBean" scope="reloadable"
+ c:_0="Two" c:_1="10" />
+
+ <!--
+ This machinery installs an embedded copy of this same bean set into itself. The "default" profile ensures that
+ the embedded copy ignores these beans because the bean profile there is overridden to a non-default value.
+ The BeanFactoryPostProcessor ensures that the embedded version's reloadable beans become singletons and the
+ rest are ignored (via lazy-init). Most of this can be buried in parent beans.
+ -->
+ <beans profile="default">
+ <bean id="reloadableBeanService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
+ p:beanProfiles="reloadable"
+ p:serviceConfigurations="classpath:/net/shibboleth/ext/spring/service/ReloadableBeans1.xml">
+ <constructor-arg name="claz" value="org.springframework.context.ApplicationContext" />
+ <constructor-arg name="strategy">
+ <bean class="net.shibboleth.ext.spring.service.ApplicationContextServiceStrategy" />
+ </constructor-arg>
+ <property name="beanFactoryPostProcessors">
+ <bean class="net.shibboleth.ext.spring.config.NonReloadableExcluder" />
+ </property>
+ </bean>
+
+ <bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
+ <property name="scopes">
+ <map>
+ <entry key="reloadable">
+ <bean class="net.shibboleth.ext.spring.config.ReloadableScope"
+ c:service-ref="reloadableBeanService" />
+ </entry>
+ </map>
+ </property>
+ </bean>
+ </beans>
+</beans>
diff --git a/src/test/resources/net/shibboleth/ext/spring/service/ReloadableSpringService.xml b/src/test/resources/net/shibboleth/ext/spring/service/ReloadableSpringService.xml
index c1b0686..e9c253d 100644
--- a/src/test/resources/net/shibboleth/ext/spring/service/ReloadableSpringService.xml
+++ b/src/test/resources/net/shibboleth/ext/spring/service/ReloadableSpringService.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-
- <bean id="testReloadableSpringService" class="net.shibboleth.ext.spring.service.ReloadableSpringService">
- <constructor-arg value="net.shibboleth.ext.spring.service.TestServiceableComponent" />
- <property name="serviceConfigurations">
- <util:list>
- <value>classpath:/net/shibboleth/ext/spring/service/ServiceableBean1.xml</value>
- </util:list>
- </property>
- </bean>
-
- <bean id="testReloadableSpringServiceWithCustomID" class="net.shibboleth.ext.spring.service.ReloadableSpringService">
- <constructor-arg value="net.shibboleth.ext.spring.service.TestServiceableComponent" />
- <property name="id" value="CustomID" />
- <property name="serviceConfigurations">
- <util:list>
- <value>classpath:/net/shibboleth/ext/spring/service/ServiceableBean1.xml</value>
- </util:list>
- </property>
- </bean>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+
+ <bean id="testReloadableSpringService" class="net.shibboleth.ext.spring.service.ReloadableSpringService">
+ <constructor-arg value="net.shibboleth.ext.spring.service.TestServiceableComponent" />
+ <property name="serviceConfigurations">
+ <util:list>
+ <value>classpath:/net/shibboleth/ext/spring/service/ServiceableBean1.xml</value>
+ </util:list>
+ </property>
+ </bean>
+
+ <bean id="testReloadableSpringServiceWithCustomID" class="net.shibboleth.ext.spring.service.ReloadableSpringService">
+ <constructor-arg value="net.shibboleth.ext.spring.service.TestServiceableComponent" />
+ <property name="id" value="CustomID" />
+ <property name="serviceConfigurations">
+ <util:list>
+ <value>classpath:/net/shibboleth/ext/spring/service/ServiceableBean1.xml</value>
+ </util:list>
+ </property>
+ </bean>
+
</beans>
\ No newline at end of file
diff --git a/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean1.xml b/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean1.xml
index 509a47e..cf1f27a 100644
--- a/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean1.xml
+++ b/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean1.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
-
-
- <bean id="TheTestServiceableComponentOne"
- class="net.shibboleth.ext.spring.service.TestServiceableComponent"
- p:id="TheTestServiceableComponentOne"
- p:theValue="One"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+
+
+ <bean id="TheTestServiceableComponentOne"
+ class="net.shibboleth.ext.spring.service.TestServiceableComponent"
+ p:id="TheTestServiceableComponentOne"
+ p:theValue="One"/>
</beans>
\ No newline at end of file
diff --git a/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean2.xml b/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean2.xml
index 7a1cbf5..690584f 100644
--- a/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean2.xml
+++ b/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean2.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
- default-init-method="initialize"
- default-destroy-method="destroy">
-
-
- <bean id="TheTestServiceableComponentTwo"
- class="net.shibboleth.ext.spring.service.TestServiceableComponent"
- p:id="TheTestServiceableComponentTwo"
- p:theValue="Two"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+
+
+ <bean id="TheTestServiceableComponentTwo"
+ class="net.shibboleth.ext.spring.service.TestServiceableComponent"
+ p:id="TheTestServiceableComponentTwo"
+ p:theValue="Two"/>
</beans>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list