[java-idp-testbed COMMIT] in /trunk/src/main: resources/creds/idp.crt resources/system/conf/testbed-beans.xml webapp/...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Jun  4 18:48:09 2014
New Revision: 259

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=259&view=rev
Log:
Remove IdP cert and wiring from testbed.

Modified:
    trunk/src/main/resources/creds/idp.crt
    trunk/src/main/resources/system/conf/testbed-beans.xml
    trunk/src/main/webapp/WEB-INF/sp/testbed.xml

Modified: trunk/src/main/resources/system/conf/testbed-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/system/conf/testbed-beans.xml?rev=259&r1=258&r2=259&view=diff
==============================================================================
--- trunk/src/main/resources/system/conf/testbed-beans.xml (original)
+++ trunk/src/main/resources/system/conf/testbed-beans.xml Wed Jun  4 18:48:09 2014
@@ -25,26 +25,6 @@
     <!-- TODO: for the file references, might be preferable to make these resolved as classpath resources,
          instead of relative filesystem references. -->
     
-    <bean id="testbed.idp.EntityID" class="java.lang.String">
-        <constructor-arg value="https://idp.example.org" />
-    </bean>
-    
-    <bean id="testbed.idp.PrivateKey" class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean">
-        <property name="resource">
-            <bean class="org.springframework.core.io.FileSystemResource">
-                <constructor-arg value="${testbed.home}/creds/idp.key" />
-            </bean>
-        </property>
-    </bean>
-    
-    <bean id="testbed.idp.X509Certificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
-        <property name="resource">
-            <bean class="org.springframework.core.io.FileSystemResource">
-                <constructor-arg value="${testbed.home}/creds/idp.crt" />
-            </bean>
-        </property>
-    </bean>
-    
     <bean id="testbed.sp.EntityID" class="java.lang.String">
         <constructor-arg value="https://sp.example.org" />
     </bean>

Modified: trunk/src/main/webapp/WEB-INF/sp/testbed.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/webapp/WEB-INF/sp/testbed.xml?rev=259&r1=258&r2=259&view=diff
==============================================================================
--- trunk/src/main/webapp/WEB-INF/sp/testbed.xml (original)
+++ trunk/src/main/webapp/WEB-INF/sp/testbed.xml Wed Jun  4 18:48:09 2014
@@ -18,12 +18,6 @@
         <property name="entityId" ref="testbed.sp.EntityID" />
     </bean>
 
-    <!-- Used as a shortcut to do encryption to the IdP half. -->
-    <bean id="idp.Credential" class="org.opensaml.security.x509.BasicX509Credential" >
-        <constructor-arg ref="testbed.idp.X509Certificate" />
-        <property name="entityId" ref="testbed.idp.EntityID" />
-    </bean>
-
     <!--
     TODO: These aren't used at the moment, but we probably should do sig verification in the tests.