[java-identity-provider] branch master updated: IDP-1534 Remove line which should have been deleted in previous

[Rod Widdowson]

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

rdw 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=7617e44912d6a67b9063f7c93a7fa9bfc2e02ca2

The following commit(s) were added to refs/heads/master by this push:
       new  7617e44   IDP-1534 Remove line which should have been deleted in previous
7617e44 is described below

commit 7617e44912d6a67b9063f7c93a7fa9bfc2e02ca2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jan 24 13:22:21 2020 +0000

    IDP-1534 Remove line which should have been deleted in previous
---
 .../resources/system/flows/admin/status-flow.xml   |  2 +-
 idp-war-distribution/.classpath                    | 13 ++++++
 idp-war-distribution/.project                      | 49 ++++++++++++++--------
 3 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/idp-conf/src/main/resources/system/flows/admin/status-flow.xml b/idp-conf/src/main/resources/system/flows/admin/status-flow.xml
index 4e592f3..2f3d391 100644
--- a/idp-conf/src/main/resources/system/flows/admin/status-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/admin/status-flow.xml
@@ -28,7 +28,7 @@
     <end-state id="Status" view="status">
         <on-entry>
             <evaluate expression="WriteAuditLog" />
-            <evaluate expression="T(org.springframework.beans.factory.BeanFactoryUtils).beansOfTypeIncludingAncestors(flowRequestContext.getActiveFlow().getApplicationContext(), T(net.shibboleth.utilities.java.support.service.AbstractReloadableService)).values()" result="requestScope.services" />            <evaluate expression="ServiceCollection" result="requestScope.services" />
+            <evaluate expression="T(org.springframework.beans.factory.BeanFactoryUtils).beansOfTypeIncludingAncestors(flowRequestContext.getActiveFlow().getApplicationContext(), T(net.shibboleth.utilities.java.support.service.AbstractReloadableService)).values()" result="requestScope.services" />
             <evaluate expression="environment" result="requestScope.environment" />
             <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.metrics.AttributeResolverGaugeSet')" result="requestScope.attributeResolverGaugeSet" />
             <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.metrics.MetadataGaugeSet')" result="requestScope.metadataResolverGaugeSet" />            
diff --git a/idp-war-distribution/.classpath b/idp-war-distribution/.classpath
index a454e3e..bc0556c 100644
--- a/idp-war-distribution/.classpath
+++ b/idp-war-distribution/.classpath
@@ -10,5 +10,18 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/idp-war-distribution/.project b/idp-war-distribution/.project
index dee4957..1da03ec 100644
--- a/idp-war-distribution/.project
+++ b/idp-war-distribution/.project
@@ -1,19 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-    <name>idp-war-distribution</name>
-    <comment></comment>
-    <projects>
-    </projects>
-    <buildSpec>
-        <buildCommand>
-            <name>org.eclipse.jdt.core.javabuilder</name>
-        </buildCommand>
-        <buildCommand>
-            <name>org.eclipse.m2e.core.maven2Builder</name>
-        </buildCommand>
-    </buildSpec>
-    <natures>
-        <nature>org.eclipse.jdt.core.javanature</nature>
-        <nature>org.eclipse.m2e.core.maven2Nature</nature>
-    </natures>
-</projectDescription>
\ No newline at end of file
+	<name>idp-war-distribution</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

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