X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=shibsp%2FMakefile.am;h=7184a59b34f719c8e8ec0f5760cdf9a0b562636c;hb=73514022d6a44deb8da9be57c8ed9d7e823d3b6b;hp=14ef6979ae99fffe175e6334464bc2e2226c3f0f;hpb=8126d39ab17e55c2031861b615d1098c941b17bd;p=shibboleth%2Fsp.git

diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 14ef697..7184a59 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -1,8 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
 
-pkgsysconfdir = $(sysconfdir)/@PACKAGE@
-xmldir = $(datadir)/xml
-
 lib_LTLIBRARIES = libshibsp.la libshibsp-lite.la
 
 libshibspincludedir = $(includedir)/shibsp
@@ -37,6 +34,7 @@ libshibspinclude_HEADERS = \
 	RequestMapper.h \
 	ServiceProvider.h \
 	SessionCache.h \
+	SessionCacheEx.h \
 	SPConfig.h \
 	SPRequest.h \
 	TransactionLog.h \
@@ -45,9 +43,11 @@ libshibspinclude_HEADERS = \
 attrinclude_HEADERS = \
 	attribute/Attribute.h \
 	attribute/AttributeDecoder.h \
+	attribute/ExtensibleAttribute.h \
 	attribute/NameIDAttribute.h \
 	attribute/ScopedAttribute.h \
-	attribute/SimpleAttribute.h
+	attribute/SimpleAttribute.h \
+	attribute/XMLAttribute.h
 
 attrfiltinclude_HEADERS = \
 	attribute/filtering/AttributeFilter.h \
@@ -78,7 +78,8 @@ liteinclude_HEADERS = \
 	lite/SAMLConstants.h
 
 mdinclude_HEADERS = \
-	metadata/MetadataExt.h
+	metadata/MetadataExt.h \
+	metadata/MetadataProviderCriteria.h
 
 reminclude_HEADERS = \
 	remoting/ddf.h \
@@ -86,7 +87,8 @@ reminclude_HEADERS = \
 	
 secinclude_HEADERS = \
 	security/PKIXTrustEngine.h \
-	security/SecurityPolicy.h
+	security/SecurityPolicy.h \
+	security/SecurityPolicyProvider.h
 
 utilinclude_HEADERS = \
 	util/CGIParser.h \
@@ -103,26 +105,40 @@ common_sources = \
 	AbstractSPRequest.cpp \
 	Application.cpp \
 	ServiceProvider.cpp \
-	SessionCache.cpp \
 	SPConfig.cpp \
 	attribute/Attribute.cpp \
+	attribute/ExtensibleAttribute.cpp \
+	attribute/NameIDAttribute.cpp \
+	attribute/SimpleAttribute.cpp \
+	attribute/ScopedAttribute.cpp \
+	attribute/XMLAttribute.cpp \
 	handler/impl/AbstractHandler.cpp \
 	handler/impl/AssertionConsumerService.cpp \
 	handler/impl/AssertionLookup.cpp \
 	handler/impl/ChainingLogoutInitiator.cpp \
 	handler/impl/ChainingSessionInitiator.cpp \
+	handler/impl/CookieSessionInitiator.cpp \
+	handler/impl/FormSessionInitiator.cpp \
 	handler/impl/LocalLogoutInitiator.cpp \
 	handler/impl/LogoutHandler.cpp \
+	handler/impl/MetadataGenerator.cpp \
 	handler/impl/RemotedHandler.cpp \
+	handler/impl/StatusHandler.cpp \
+	handler/impl/SessionHandler.cpp \
 	handler/impl/SAML1Consumer.cpp \
 	handler/impl/SAML2Consumer.cpp \
 	handler/impl/SAML2ArtifactResolution.cpp \
+	handler/impl/SAML2Logout.cpp \
 	handler/impl/SAML2LogoutInitiator.cpp \
+	handler/impl/SAML2NameIDMgmt.cpp \
 	handler/impl/SAML2SessionInitiator.cpp \
 	handler/impl/SAMLDSSessionInitiator.cpp \
 	handler/impl/SessionInitiator.cpp \
 	handler/impl/Shib1SessionInitiator.cpp \
+	handler/impl/TransformSessionInitiator.cpp \
 	handler/impl/WAYFSessionInitiator.cpp \
+	impl/ChainingAccessControl.cpp \
+    impl/StorageServiceSessionCache.cpp \
 	impl/XMLAccessControl.cpp \
 	impl/XMLRequestMapper.cpp \
 	impl/XMLServiceProvider.cpp \
@@ -138,18 +154,22 @@ common_sources = \
 
 libshibsp_lite_la_SOURCES = \
 	${common_sources} \
-	impl/RemotedSessionCache.cpp \
 	lite/CommonDomainCookie.cpp \
 	lite/SAMLConstants.cpp
 
 libshibsp_la_SOURCES = \
 	${common_sources} \
+	attribute/DOMAttributeDecoder.cpp \
+	attribute/KeyInfoAttributeDecoder.cpp \
 	attribute/NameIDAttributeDecoder.cpp \
+	attribute/NameIDFromScopedAttributeDecoder.cpp \
 	attribute/ScopedAttributeDecoder.cpp \
 	attribute/StringAttributeDecoder.cpp \
+	attribute/XMLAttributeDecoder.cpp \
 	attribute/filtering/impl/AttributeFilter.cpp \
 	attribute/filtering/impl/ChainingAttributeFilter.cpp \
 	attribute/filtering/impl/XMLAttributeFilter.cpp \
+	attribute/filtering/impl/BasicFilteringContext.cpp \
 	attribute/filtering/impl/MatchFunctor.cpp \
 	attribute/filtering/impl/AndMatchFunctor.cpp \
 	attribute/filtering/impl/AnyMatchFunctor.cpp \
@@ -171,31 +191,58 @@ libshibsp_la_SOURCES = \
 	attribute/filtering/impl/AttributeScopeMatchesShibMDScopeFunctor.cpp \
 	attribute/resolver/impl/ChainingAttributeResolver.cpp \
 	attribute/resolver/impl/QueryAttributeResolver.cpp \
+	attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp \
+	attribute/resolver/impl/ChainingAttributeExtractor.cpp \
+	attribute/resolver/impl/DelegationAttributeExtractor.cpp \
+	attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp \
 	attribute/resolver/impl/XMLAttributeExtractor.cpp \
 	binding/impl/ArtifactResolver.cpp \
 	binding/impl/SOAPClient.cpp \
-	impl/StorageServiceSessionCache.cpp \
+	impl/XMLSecurityPolicyProvider.cpp \
+	metadata/DynamicMetadataProvider.cpp \
 	metadata/MetadataExtImpl.cpp \
 	metadata/MetadataExtSchemaValidators.cpp \
+	metadata/MetadataProviderCriteria.cpp \
 	security/PKIXTrustEngine.cpp \
 	security/SecurityPolicy.cpp
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibsp_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 1:0:0
-libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 1:0:0
+libshibsp_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 5:0:0
+libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 5:0:0
 libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
 
+pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
+pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@-@PACKAGE_VERSION@
+logdir = ${localstatedir}/log
+rundir = $(localstatedir)/run
+xmldir = $(datadir)/xml
+
 paths.h: ${srcdir}/paths.h.in Makefile ${top_builddir}/config.status
 	rm -f $@.tmp
 	sed < ${srcdir}/$@.in > $@.tmp \
+	    -e 's:@-PREFIX-@:${prefix}:g' \
+        -e 's:@-LIBDIR-@:${libdir}:g' \
+        -e 's:@-SYSCONFDIR-@:${sysconfdir}:g' \
+        -e 's:@-LOGDIR-@:${logdir}:g' \
+        -e 's:@-RUNDIR-@:${rundir}:g' \
+        -e 's:@-XMLDIR-@:${xmldir}:g' \
 	    -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
-	    -e 's:@-XMLDIR-@:${xmldir}:g'
+	    -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
+	    -e 's:@-XMLTOOLINGXMLDIR-@:${XMLTOOLINGXMLDIR}:g' \
+	    -e 's:@-OPENSAMLXMLDIR-@:${OPENSAMLXMLDIR}:g'
 	cmp -s $@ $@.tmp || mv $@.tmp $@
 	rm -f $@.tmp
 
 install-exec-hook:
 	for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
 
-EXTRA_DIST = shibsp.vcproj shibsp-lite.vcproj paths.h.in resource.h shibsp.rc
+EXTRA_DIST = \
+	shibsp.vcxproj \
+	shibsp-lite.vcxproj \
+	shibsp.vcxproj.filters \
+	shibsp-lite.vcxproj.filters \
+	paths.h.in \
+	resource.h \
+	shibsp.rc
 BUILT_SOURCES = paths.h