[java-identity-provider] branch master updated: Remove seemingly-superfluous parent paths from bean imports.

Scott Cantor cantor.2 at osu.edu
Thu Dec 28 16:00:43 EST 2017


This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=8dce89dacc1e8e647b99872c9a80907b3142bae1

The following commit(s) were added to refs/heads/master by this push:
       new  8dce89d   Remove seemingly-superfluous parent paths from bean imports.
8dce89d is described below

commit 8dce89dacc1e8e647b99872c9a80907b3142bae1
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Dec 28 16:00:40 2017 -0500

    Remove seemingly-superfluous parent paths from bean imports.
---
 .../main/resources/system/flows/intercept/attribute-release-flow.xml    | 2 +-
 .../src/main/resources/system/flows/intercept/context-check-flow.xml    | 2 +-
 .../main/resources/system/flows/intercept/expiring-password-flow.xml    | 2 +-
 idp-conf/src/main/resources/system/flows/intercept/impersonate-flow.xml | 2 +-
 .../src/main/resources/system/flows/intercept/terms-of-use-flow.xml     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml b/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
index daedbea..ac8e623 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
@@ -215,6 +215,6 @@
         <transition on="InvalidAttributeContext" to="proceed" />
     </global-transitions>
 
-    <bean-import resource="../../../system/flows/intercept/attribute-release-beans.xml" />
+    <bean-import resource="attribute-release-beans.xml" />
 
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/intercept/context-check-flow.xml b/idp-conf/src/main/resources/system/flows/intercept/context-check-flow.xml
index 0c9b840..fc90c37 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/context-check-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/intercept/context-check-flow.xml
@@ -26,6 +26,6 @@
             then="proceed" else="ContextCheckDenied" />
     </decision-state>
     
-    <bean-import resource="../../../system/flows/intercept/context-check-beans.xml" />
+    <bean-import resource="context-check-beans.xml" />
 
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml b/idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml
index f25fadf..360cfb8 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml
@@ -43,6 +43,6 @@
 
     <end-state id="proceed" />
 
-    <bean-import resource="../../../system/flows/intercept/expiring-password-beans.xml" />
+    <bean-import resource="expiring-password-beans.xml" />
 
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/intercept/impersonate-flow.xml b/idp-conf/src/main/resources/system/flows/intercept/impersonate-flow.xml
index b07ff31..5248d1b 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/impersonate-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/intercept/impersonate-flow.xml
@@ -71,6 +71,6 @@
 
     <end-state id="proceed" />
 
-    <bean-import resource="../../../system/flows/intercept/impersonate-beans.xml" />
+    <bean-import resource="impersonate-beans.xml" />
 
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml b/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml
index ee6f646..2066a7b 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml
@@ -68,6 +68,6 @@
 
     <end-state id="proceed" />
 
-    <bean-import resource="../../../system/flows/intercept/terms-of-use-beans.xml" />
+    <bean-import resource="terms-of-use-beans.xml" />
 
 </flow>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list