Remove TC config and place it on the wiki to be maintained - SIDP-348

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@2889 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/doc/RELEASE-NOTES.txt b/doc/RELEASE-NOTES.txt
index cb26686..b247b78 100644 (file)
--- a/doc/RELEASE-NOTES.txt
+++ b/doc/RELEASE-NOTES.txt
@@ -1,3 +1,8 @@
+Changes in Release 2.1.4
+=============================================
+[SIDP-340] - Default tc-config.xml causes TCNonPortableObjectError
+[SIDP-348] - Remove Terracotta Configuration from IdP Install
+
 Changes in Release 2.1.3
 =============================================
 [SIDP-244] - Error message on invalid ACS could be improved

diff --git a/src/installer/resources/conf-tmpl/tc-config.xml b/src/installer/resources/conf-tmpl/tc-config.xml
deleted file mode 100644 (file)
index 48f3ffd..0000000
--- a/src/installer/resources/conf-tmpl/tc-config.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<tc:tc-config xmlns:tc="http://www.terracotta.org/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.terracotta.org/config http://www.terracotta.org/schema/terracotta-4.xsd">
-
-    <!--
-        Terracotta configuration file for Shibboleth.
-        
-        Complete documentation on the contents of this file may be found here:
-        http://terracotta.org/web/display/docs/Configuration+Guide+and+Reference
-    -->
-
-    <servers>
-        <!-- EXAMPLE SERVER CONFIGURATION -->
-        <!-- 
-            <server name="UNIQUE_ID" host="HOST">
-            <dso>
-            <persistence>
-            <mode>permanent-store</mode>
-            </persistence>
-            </dso>
-            
-            <logs>$IDP_HOME$/cluster/server/logs</logs>
-            <data>$IDP_HOME$/cluster/server/data</data>
-            <statistics>$IDP_HOME$/cluster/server/stats</statistics>
-            </server>
-        -->
-        <!-- START Terracotta server definitions -->
-
-
-        <!-- END Terracotta server definitions -->
-
-        <ha>
-            <mode>networked-active-passive</mode>
-            <networked-active-passive>
-                <election-time></election-time>
-            </networked-active-passive>
-        </ha>
-    </servers>
-
-    <system>
-        <configuration-model>production</configuration-model>
-    </system>
-
-    <clients>
-        <logs>$IDP_HOME$/cluster/client/logs-%i</logs>
-        <statistics>$IDP_HOME$/cluster/client/stats-%i</statistics>
-        <modules>
-            <module name="tim-vector" version="2.3.1" group-id="org.terracotta.modules"/>
-        </modules>
-    </clients>
-
-    <application>
-        <dso>
-            <additional-boot-jar-classes>
-                <include>javax.security.auth.Subject</include>
-                <include>javax.security.auth.Subject$SecureSet</include>
-                <include>javax.security.auth.x500.X500Principal</include>
-                <include>javax.security.auth.kerberos.KerberosPrincipal</include>
-            </additional-boot-jar-classes>
-            <roots>
-                <root>
-                    <root-name>storageService</root-name>
-                    <field-name>edu.internet2.middleware.shibboleth.common.util.EventingMapBasedStorageService.store</field-name>
-                </root>
-            </roots>
-            <instrumented-classes>
-                <include>
-                    <class-expression>edu.vt.middleware.ldap.jaas.LdapPrincipal</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include>
-                <include>
-                    <class-expression>edu.internet2.middleware.shibboleth.idp.authn.UsernamePrincipal</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include> 
-                <include>
-                    <class-expression>edu.vt.middleware.ldap.jaas.LdapCredential</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include>
-                <include>
-                    <class-expression>edu.internet2.middleware.shibboleth.idp.authn.AuthenticationException</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include>
-                <include>
-                    <class-expression>org.opensaml.util.storage.AbstractExpiringObject</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include>
-                <include>
-                    <class-expression>edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.TransientIdEntry</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include>
-                <include>
-                    <class-expression>edu.internet2.middleware.shibboleth.idp.authn.LoginContextEntry</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include>
-                <include>
-                    <class-expression>edu.internet2.middleware.shibboleth.idp.authn.LoginContext</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include>
-                <include>
-                    <class-expression>edu.internet2.middleware.shibboleth.idp.authn.ShibbolethSSOLoginContext</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include>
-                <include>
-                    <class-expression>edu.internet2.middleware.shibboleth.idp.authn.Saml2LoginContext</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include>
-                <include>
-                    <class-expression>edu.internet2.middleware.shibboleth.idp.session.impl.AuthenticationMethodInformationImpl</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include>
-                <include>
-                    <class-expression>org.opensaml.util.storage.ReplayCacheEntry</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include>
-                <include>
-                    <class-expression>edu.internet2.middleware.shibboleth.idp.session.impl.SessionManagerEntry</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include>
-                <include>
-                    <class-expression>edu.internet2.middleware.shibboleth.common.session.impl.AbstractSession</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include>
-                <include>
-                    <class-expression>edu.internet2.middleware.shibboleth.idp.session.impl.SessionImpl</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include>
-                <include>
-                    <class-expression>edu.internet2.middleware.shibboleth.idp.session.impl.ServiceInformationImpl</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include>
-                <include>
-                    <class-expression>org.opensaml.common.binding.artifact.BasicSAMLArtifactMapEntry</class-expression>
-                    <honor-transient>true</honor-transient>
-                </include>
-            </instrumented-classes>
-            <locks>
-                <autolock auto-synchronized="false">
-                    <method-expression>* edu.vt.middleware.ldap.jaas.LdapPrincipal.*(..)</method-expression>
-                    <lock-level>write</lock-level>
-                </autolock>
-                <autolock auto-synchronized="false">
-                    <method-expression>* edu.internet2.middleware.shibboleth.idp.authn.LoginContext.set*(..)</method-expression>
-                    <lock-level>write</lock-level>
-                </autolock>
-                <autolock auto-synchronized="false">
-                    <method-expression>* edu.internet2.middleware.shibboleth.idp.authn.LoginContext.get*(..)</method-expression>
-                    <lock-level>read</lock-level>
-                </autolock>
-                <autolock auto-synchronized="false">
-                    <method-expression>* edu.internet2.middleware.shibboleth.idp.authn.ShibbolethSSOLoginContext.set*(..)</method-expression>
-                    <lock-level>write</lock-level>
-                </autolock>
-                <autolock auto-synchronized="false">
-                    <method-expression>* edu.internet2.middleware.shibboleth.idp.authn.ShibbolethSSOLoginContext.get*(..)</method-expression>
-                    <lock-level>read</lock-level>
-                </autolock>
-                <autolock auto-synchronized="false">
-                    <method-expression>* edu.internet2.middleware.shibboleth.idp.authn.Saml2LoginContext.set*(..)</method-expression>
-                    <lock-level>write</lock-level>
-                </autolock>
-                <autolock auto-synchronized="false">
-                    <method-expression>* edu.internet2.middleware.shibboleth.idp.authn.Saml2LoginContext.get*(..)</method-expression>
-                    <lock-level>read</lock-level>
-                </autolock>
-                <autolock auto-synchronized="false">
-                    <method-expression>* edu.internet2.middleware.shibboleth.common.session.impl.AbstractSession.set*(..)</method-expression>
-                    <lock-level>write</lock-level>
-                </autolock>
-                <autolock auto-synchronized="false">
-                    <method-expression>* edu.internet2.middleware.shibboleth.common.session.impl.AbstractSession.get*(..)</method-expression>
-                    <lock-level>read</lock-level>
-                </autolock>
-                <autolock auto-synchronized="false">
-                    <method-expression>* edu.internet2.middleware.shibboleth.idp.session.impl.SessionImpl.set*(..)</method-expression>
-                    <lock-level>write</lock-level>
-                </autolock>
-                <autolock auto-synchronized="false">
-                    <method-expression>* edu.internet2.middleware.shibboleth.idp.session.impl.SessionImpl.get*(..)</method-expression>
-                    <lock-level>read</lock-level>
-                </autolock>
-                <autolock auto-synchronized="false">
-                    <method-expression>* edu.internet2.middleware.shibboleth.idp.session.impl.AuthenticationMethodInformationImpl.set*(..)</method-expression>
-                    <lock-level>write</lock-level>
-                </autolock>
-                <autolock auto-synchronized="false">
-                    <method-expression>* edu.internet2.middleware.shibboleth.idp.session.impl.AuthenticationMethodInformationImpl.get*(..)</method-expression>
-                    <lock-level>read</lock-level>
-                </autolock>
-                <autolock auto-synchronized="false">
-                    <method-expression>* edu.internet2.middleware.shibboleth.idp.session.impl.ServiceInformationImpl.set*(..)</method-expression>
-                    <lock-level>write</lock-level>
-                </autolock>
-                <autolock auto-synchronized="false">
-                    <method-expression>* edu.internet2.middleware.shibboleth.idp.session.impl.ServiceInformationImpl.get*(..)</method-expression>
-                    <lock-level>read</lock-level>
-                </autolock>
-            </locks>
-        </dso>
-    </application>
-
-</tc:tc-config>
\ No newline at end of file