[java-idp-testbed] branch master updated: Bump testbed to V4 dependencies and config.
Scott Cantor
cantor.2 at osu.edu
Thu Nov 8 10:38:51 EST 2018
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-idp-testbed.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-testbed.git;a=commit;h=28dd540531af422197b6d99095a19f313a755da1
The following commit(s) were added to refs/heads/master by this push:
new 28dd540 Bump testbed to V4 dependencies and config.
28dd540 is described below
commit 28dd540531af422197b6d99095a19f313a755da1
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Nov 8 10:38:42 2018 -0500
Bump testbed to V4 dependencies and config.
---
.classpath | 2 +-
.project | 1 +
.settings/org.eclipse.jdt.core.prefs | 7 +++---
idp-testbed.launch | 2 +-
pom.xml | 8 +++---
.../resources/system/conf/testbed-opensaml.xml | 29 ++++++++--------------
src/main/webapp/WEB-INF/test/test-servlet.xml | 21 ++++++----------
7 files changed, 29 insertions(+), 41 deletions(-)
diff --git a/.classpath b/.classpath
index 794ca6d..271ce0c 100644
--- a/.classpath
+++ b/.classpath
@@ -24,7 +24,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
diff --git a/.project b/.project
index cdc2417..d7fc346 100644
--- a/.project
+++ b/.project
@@ -3,6 +3,7 @@
<name>java-idp-testbed</name>
<comment></comment>
<projects>
+ <project>java-idp-jetty-base</project>
</projects>
<buildSpec>
<buildCommand>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 0af3689..fe66103 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -73,7 +73,8 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16
diff --git a/idp-testbed.launch b/idp-testbed.launch
index 064bbb2..17a1271 100644
--- a/idp-testbed.launch
+++ b/idp-testbed.launch
@@ -13,6 +13,6 @@
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--lib=${workspace_loc:idp-conf/src/test/resources} --lib=${workspace_loc:idp-conf/src/main/resources}"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="java-idp-testbed"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djetty.home=/opt/jetty/jetty-9.3 -Didp.home=classpath: -Didp.webflows=classpath*:/flows -Didp.logfiles=${workspace_loc:java-idp-testbed/src/main/resources/logs} -Djava.io.tmpdir=tmp"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djetty.home=/opt/jetty/jetty-9.3 -Didp.home=classpath: -Didp.webflows=classpath*:/flows -Didp.logfiles=${workspace_loc:java-idp-testbed/src/main/resources/logs} -Djava.io.tmpdir=tmp -Didp.loglevel.idp=INFO"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:idp-jetty-base/src/main/resources/jetty-base}"/>
</launchConfiguration>
diff --git a/pom.xml b/pom.xml
index 0d21582..d286f39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>net.shibboleth</groupId>
<artifactId>parent</artifactId>
- <version>7.11.1-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -15,12 +15,12 @@
<properties>
<idp.groupId>net.shibboleth.idp</idp.groupId>
- <idp.version>3.4.2-SNAPSHOT</idp.version>
+ <idp.version>4.0.0-SNAPSHOT</idp.version>
<idp-jetty-base.version>9.3.1-SNAPSHOT</idp-jetty-base.version>
<jetty.version>9.3.23.v20180228</jetty.version>
<opensaml.groupId>org.opensaml</opensaml.groupId>
- <opensaml.version>3.4.1-SNAPSHOT</opensaml.version>
- <spring-extensions.version>5.4.1-SNAPSHOT</spring-extensions.version>
+ <opensaml.version>4.0.0-SNAPSHOT</opensaml.version>
+ <spring-extensions.version>6.0.0-SNAPSHOT</spring-extensions.version>
</properties>
<repositories>
diff --git a/src/main/resources/system/conf/testbed-opensaml.xml b/src/main/resources/system/conf/testbed-opensaml.xml
index 9526fc1..dd343db 100644
--- a/src/main/resources/system/conf/testbed-opensaml.xml
+++ b/src/main/resources/system/conf/testbed-opensaml.xml
@@ -22,17 +22,8 @@
p:coalescing="true"
p:ignoreComments="true"
p:ignoreElementContentWhitespace="true"
- p:namespaceAware="true">
- <property name="builderAttributes">
- <map>
- <entry>
- <key>
- <value>http://apache.org/xml/properties/security-manager</value>
- </key>
- <bean id="shibboleth.XercesSecurityManager" class="${idp.xml.securityManager:com.sun.org.apache.xerces.internal.util.SecurityManager}" />
- </entry>
- </map>
- </property>
+ p:namespaceAware="true"
+ p:securityManagerAttributeName="http://apache.org/xml/properties/security-manager">
<property name="builderFeatures">
<map>
<entry>
@@ -55,26 +46,28 @@
<bean id="shibboleth.MarshallerFactory" factory-method="getMarshallerFactory" class="org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport" depends-on="shibboleth.OpenSAMLConfig" />
<bean id="shibboleth.UnmarshallerFactory" factory-method="getUnmarshallerFactory" class="org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport" depends-on="shibboleth.OpenSAMLConfig" />
- <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean" >
- <property name="overrideLogging" value="false"/>
+ <bean id="shibboleth.VelocityEngine" class="net.shibboleth.ext.spring.velocity.VelocityEngineFactoryBean">
<property name="velocityProperties">
<props>
- <prop key="runtime.log.logsystem.class">
- net.shibboleth.utilities.java.support.velocity.SLF4JLogChute
- </prop>
<prop key="input.encoding">UTF-8</prop>
<prop key="output.encoding">UTF-8</prop>
- <prop key="resource.loader">classpath, string</prop>
+ <prop key="resource.loader">file, classpath, string, springMacro</prop>
<prop key="classpath.resource.loader.class">
org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
</prop>
+ <prop key="springMacro.resource.loader.class">
+ org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+ </prop>
<prop key="string.resource.loader.class">
org.apache.velocity.runtime.resource.loader.StringResourceLoader
</prop>
<prop key="file.resource.loader.class">
org.apache.velocity.runtime.resource.loader.FileResourceLoader
</prop>
- <prop key="file.resource.loader.path">${idp.home}</prop>
+ <prop key="velocimacro.library">
+ net/shibboleth/ext/spring/velocity/spring.vm
+ </prop>
+ <prop key="file.resource.loader.path">#{'%{idp.views:%{idp.home}/views}'.trim()},%{idp.home}/system/views</prop>
<prop key="file.resource.loader.cache">false</prop>
</props>
</property>
diff --git a/src/main/webapp/WEB-INF/test/test-servlet.xml b/src/main/webapp/WEB-INF/test/test-servlet.xml
index 4cf882d..0c3406c 100644
--- a/src/main/webapp/WEB-INF/test/test-servlet.xml
+++ b/src/main/webapp/WEB-INF/test/test-servlet.xml
@@ -2,32 +2,25 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
+ 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
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
">
- <context:component-scan base-package="test"/>
-
+ <context:component-scan base-package="test" />
<!-- HandlerMappings: Prefer first the WebFlow one, then the standard Spring MVC default ones.
Have to enumerate them all explicitly b/c we're overriding the built-in defaults. -->
- <bean class="org.springframework.webflow.mvc.servlet.FlowHandlerMapping">
- <property name="flowRegistry" ref="flowRegistry"/>
- <property name="order" value="0"/>
- </bean>
+ <bean class="org.springframework.webflow.mvc.servlet.FlowHandlerMapping" p:order="0" p:flowRegistry-ref="flowRegistry" />
- <bean class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
- <property name="order" value="1"/>
- </bean>
-
- <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping">
- <property name="order" value="2"/>
- </bean>
+ <bean class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping" p:order="1" />
+ <bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" p:order="2" />
<!-- HandlerAdapters: These aren't ordered. Add the WebFlow one, then the standard Spring MVC default ones.
@@ -41,7 +34,7 @@
<bean class="org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter" />
- <bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter" />
+ <bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter" />
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list