Improve property inheritance, first batch of SessionInitiators, rename providerId.

[shibboleth/sp.git] / shibsp / Makefile.am

diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 33b0e17..b3045c6 100644 (file)
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -9,6 +9,12 @@ libshibspincludedir = $(includedir)/shibsp
 
 attrincludedir = $(includedir)/shibsp/attribute
 
+attrresincludedir = $(includedir)/shibsp/attribute/resolver
+
+bindincludedir = $(includedir)/shibsp/binding
+
+handincludedir = $(includedir)/shibsp/handler
+
 mdincludedir = $(includedir)/shibsp/metadata
 
 remincludedir = $(includedir)/shibsp/remoting
@@ -18,13 +24,11 @@ secincludedir = $(includedir)/shibsp/security
 utilincludedir = $(includedir)/shibsp/util
 
 libshibspinclude_HEADERS = \
-       AbstractHandler.h \
        AbstractSPRequest.h \
        AccessControl.h \
        Application.h \
        base.h \
        exceptions.h \
-       Handler.h \
        paths.h \
        RequestMapper.h \
        ServiceProvider.h \
@@ -36,19 +40,35 @@ libshibspinclude_HEADERS = \
 
 attrinclude_HEADERS = \
        attribute/Attribute.h \
+       attribute/AttributeDecoder.h \
        attribute/NameIDAttribute.h \
        attribute/ScopedAttribute.h \
        attribute/SimpleAttribute.h
 
+attrresinclude_HEADERS = \
+       attribute/resolver/AttributeResolver.h \
+       attribute/resolver/ResolutionContext.h
+
+bindinclude_HEADERS = \
+       binding/ArtifactResolver.h \
+       binding/SOAPClient.h
+
+handinclude_HEADERS = \
+       handler/AbstractHandler.h \
+       handler/AssertionConsumerService.h \
+       handler/Handler.h \
+       handler/RemotedHandler.h
+
 mdinclude_HEADERS = \
        metadata/MetadataExt.h
 
 reminclude_HEADERS = \
-       ddf.h \
-       ListenerService.h
+       remoting/ddf.h \
+       remoting/ListenerService.h
        
 secinclude_HEADERS = \
-       security/PKIXTrustEngine.h
+       security/PKIXTrustEngine.h \
+       security/SecurityPolicy.h
 
 utilinclude_HEADERS = \
        util/DOMPropertySet.h \
@@ -61,13 +81,26 @@ noinst_HEADERS = \
        remoting/impl/SocketListener.h
 
 libshibsp_la_SOURCES = \
-       AbstractHandler.cpp \
        AbstractSPRequest.cpp \
        Application.cpp \
        ServiceProvider.cpp \
        SessionCache.cpp \
        SPConfig.cpp \
        attribute/Attribute.cpp \
+       attribute/NameIDAttributeDecoder.cpp \
+       attribute/SimpleAttributeDecoder.cpp \
+       attribute/ScopedAttributeDecoder.cpp \
+       attribute/resolver/impl/AttributeResolver.cpp \
+       attribute/resolver/impl/SimpleAttributeResolver.cpp \
+       binding/impl/ArtifactResolver.cpp \
+       binding/impl/SOAPClient.cpp \
+       handler/impl/AbstractHandler.cpp \
+       handler/impl/AssertionConsumerService.cpp \
+       handler/impl/ChainingSessionInitiator.cpp \
+       handler/impl/RemotedHandler.cpp \
+       handler/impl/SAML1Consumer.cpp \
+       handler/impl/SAML2Consumer.cpp \
+       handler/impl/Shib1SessionInitiator.cpp \
        impl/RemotedSessionCache.cpp \
        impl/StorageServiceSessionCache.cpp \
        impl/XMLAccessControl.cpp \
@@ -81,6 +114,7 @@ libshibsp_la_SOURCES = \
        remoting/impl/TCPListener.cpp \
        remoting/impl/UnixListener.cpp \
        security/PKIXTrustEngine.cpp \
+       security/SecurityPolicy.cpp \
        util/DOMPropertySet.cpp \
        util/SPConstants.cpp \
        util/TemplateParameters.cpp