Shorten "built-in" plugin types, delete stale files, new config file.
authorcantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Fri, 9 Feb 2007 02:29:33 +0000 (02:29 +0000)
committercantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Fri, 9 Feb 2007 02:29:33 +0000 (02:29 +0000)
git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2162 cb58f699-b61c-0410-a6fe-9272a202ed29

37 files changed:
Makefile.am
Shibboleth.dsw [deleted file]
apache/mod_shib13.dsp [deleted file]
apache/mod_shib20.dsp [deleted file]
isapi_shib/isapi_shib.dsp [deleted file]
nsapi_shib/nsapi_shib.dsp [deleted file]
posttest/posttest.dsp [deleted file]
posttest/posttest.vcproj [deleted file]
schemas/Makefile.am
schemas/cs-sstc-schema-assertion-01.xsd [deleted file]
schemas/cs-sstc-schema-assertion-1.1.xsd [deleted file]
schemas/cs-sstc-schema-protocol-01.xsd [deleted file]
schemas/cs-sstc-schema-protocol-1.1.xsd [deleted file]
schemas/saml-schema-assertion-2.0.xsd [deleted file]
schemas/saml-schema-metadata-2.0.xsd [deleted file]
schemas/shibboleth-spconfig-2.0.xsd [new file with mode: 0644]
schemas/shibboleth-targetconfig-1.0.xsd
schemas/soap-envelope.xsd [deleted file]
schemas/xenc-schema.xsd [deleted file]
schemas/xml.xsd [deleted file]
schemas/xmldsig-core-schema.xsd [deleted file]
shar/shar.dsp [deleted file]
shar/test-client.cpp [deleted file]
shar/testclient.dsp [deleted file]
shar/testclient.vcproj [deleted file]
shibsp/AccessControl.h
shibsp/RequestMapper.h
shibsp/ServiceProvider.h
shibsp/SessionCache.h
shibsp/impl/XMLAccessControl.cpp
shibsp/impl/XMLRequestMapper.cpp
shibsp/impl/XMLServiceProvider.cpp
shibsp/remoting/ListenerService.h
siterefresh/siterefresh.dsp [deleted file]
test/Makefile.am
test/inittest.cpp [deleted file]
test/posttest.cpp [deleted file]

index b006f94..2989f94 100644 (file)
@@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I .
 EXTRA_DIST = \
        schemas doc isapi_shib isapi_shib_gui \
        Shibboleth.sln libtool.m4 acx_pthread.m4 acx_rpctest.m4 depcomp \
-       config_win32.h posttest/posttest.vcproj shibtest/shibtest.vcproj \
+       config_win32.h shibtest/shibtest.vcproj \
        shibboleth.spec.in shibboleth.spec pkginfo.in pkginfo checkinstall
 
 dist-hook:
diff --git a/Shibboleth.dsw b/Shibboleth.dsw
deleted file mode 100644 (file)
index b951432..0000000
+++ /dev/null
@@ -1,269 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "isapi_shib"=.\isapi_shib\isapi_shib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name shib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name shibtarget
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "isapi_shib_gui"=.\isapi_shib_gui\isapi_shib_gui.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "mod_shib13"=.\apache\mod_shib13.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name shibtarget
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name shib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mod_shib20"=.\apache\mod_shib20.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name shib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name shibtarget
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "nsapi_shib"=.\nsapi_shib\nsapi_shib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name shib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name shibtarget
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "oncrpc"=.\oncrpc\oncrpc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "posttest"=.\posttest\posttest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name shib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "shar"=.\shar\shar.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name oncrpc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name shib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name shibtarget
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "shib"=.\shib\shib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "shib_mysql_ccache"=".\shib-mysql-ccache\shib_mysql_ccache.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name shib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name shibtarget
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "shibtarget"=".\shib-target\shibtarget.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name shib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name oncrpc
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "shibtest"=.\shibtest\shibtest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name shib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name shibtarget
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "siterefresh"=.\siterefresh\siterefresh.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name shib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name shibtarget
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testclient"=.\shar\testclient.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name shib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name shibtarget
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name oncrpc
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "xmlproviders"=.\xmlproviders\xmlproviders.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name shib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/apache/mod_shib13.dsp b/apache/mod_shib13.dsp
deleted file mode 100644 (file)
index 8c833c5..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mod_shib13" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=mod_shib13 - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "mod_shib13.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "mod_shib13.mak" CFG="mod_shib13 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mod_shib13 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_shib13 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "mod_shib13 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_SHIB13_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "..\..\..\opensaml\c" /I "\Apache\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "EAPI" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 log4cpp.lib xerces-c_2.lib ApacheCore.lib saml_5.lib /nologo /dll /machine:I386 /out:"Release/mod_shib_13.so" /libpath:"../../../opensaml/c/saml/Release" /libpath:"\Apache\libexec"
-
-!ELSEIF  "$(CFG)" == "mod_shib13 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_SHIB13_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "..\..\..\opensaml\c" /I "\Apache\include" /D "_WINDOWS" /D "EAPI" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 log4cppD.lib xerces-c_2D.lib ApacheCore.lib saml_5D.lib /nologo /dll /debug /machine:I386 /out:"Debug/mod_shib_13.so" /pdbtype:sept /libpath:"../../../opensaml/c/saml/Debug" /libpath:"\Apache\libexec"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "mod_shib13 - Win32 Release"
-# Name "mod_shib13 - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\mod_shib_13.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod_shib_13.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# End Target
-# End Project
diff --git a/apache/mod_shib20.dsp b/apache/mod_shib20.dsp
deleted file mode 100644 (file)
index 58846ef..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mod_shib20" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=mod_shib20 - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "mod_shib20.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "mod_shib20.mak" CFG="mod_shib20 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mod_shib20 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_shib20 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "mod_shib20 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "mod_shib20___Win32_Release"
-# PROP Intermediate_Dir "mod_shib20___Win32_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_SHIB20_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "..\..\..\opensaml\c" /I "\Apache2\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 log4cpp.lib xerces-c_2.lib libapr.lib libhttpd.lib saml_5.lib /nologo /dll /machine:I386 /out:"mod_shib20___Win32_Release/mod_shib_20.so" /libpath:"../../../opensaml/c/saml/Release" /libpath:"\httpd-2.0.52\srclib\apr\Release" /libpath:"\httpd-2.0.52\Release"
-
-!ELSEIF  "$(CFG)" == "mod_shib20 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "mod_shib20___Win32_Debug"
-# PROP BASE Intermediate_Dir "mod_shib20___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "mod_shib20___Win32_Debug"
-# PROP Intermediate_Dir "mod_shib20___Win32_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_SHIB20_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "..\..\..\opensaml\c" /I "\Apache2\include" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 log4cppD.lib xerces-c_2D.lib libapr.lib libhttpd.lib saml_5D.lib /nologo /dll /debug /machine:I386 /out:"mod_shib20___Win32_Debug/mod_shib_20.so" /pdbtype:sept /libpath:"../../../opensaml/c/saml/Debug" /libpath:"\httpd-2.0.52\srclib\apr\Debug" /libpath:"\httpd-2.0.52\Debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "mod_shib20 - Win32 Release"
-# Name "mod_shib20 - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\mod_shib_20.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod_shib_20.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# End Target
-# End Project
diff --git a/isapi_shib/isapi_shib.dsp b/isapi_shib/isapi_shib.dsp
deleted file mode 100644 (file)
index 69d292e..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="isapi_shib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=isapi_shib - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "isapi_shib.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "isapi_shib.mak" CFG="isapi_shib - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "isapi_shib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "isapi_shib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "isapi_shib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_SHIB_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I ".." /I "..\..\..\opensaml\c" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 log4cpp.lib xerces-c_2.lib advapi32.lib kernel32.lib saml_5.lib /nologo /dll /machine:I386 /libpath:"..\..\..\opensaml\c\saml\Release" /export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "isapi_shib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_SHIB_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".." /I "..\..\..\opensaml\c" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 log4cppD.lib xerces-c_2D.lib advapi32.lib kernel32.lib saml_5D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\opensaml\c\saml\Debug" /export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "isapi_shib - Win32 Release"
-# Name "isapi_shib - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\isapi_shib.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\isapi_shib.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# End Target
-# End Project
diff --git a/nsapi_shib/nsapi_shib.dsp b/nsapi_shib/nsapi_shib.dsp
deleted file mode 100644 (file)
index 3f9bbd0..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-# Microsoft Developer Studio Project File - Name="nsapi_shib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=nsapi_shib - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "nsapi_shib.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "nsapi_shib.mak" CFG="nsapi_shib - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "nsapi_shib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "nsapi_shib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "nsapi_shib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NSAPI_SHIB_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I ".." /I "..\..\..\opensaml\c" /I "\\KRAMER\iPlanet\plugins\include" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 log4cpp.lib xerces-c_2.lib saml_5.lib ns-httpd30.lib /nologo /dll /machine:I386 /libpath:"..\..\..\opensaml\c\saml\Release" /libpath:"\\KRAMER\iPlanet\plugins\lib"
-
-!ELSEIF  "$(CFG)" == "nsapi_shib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NSAPI_SHIB_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".." /I "..\..\..\opensaml\c" /I "\\KRAMER\iPlanet\plugins\include" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 log4cppD.lib xerces-c_2D.lib saml_5D.lib ns-httpd30.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\opensaml\c\saml\Debug" /libpath:"\\KRAMER\iPlanet\plugins\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "nsapi_shib - Win32 Release"
-# Name "nsapi_shib - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\nsapi_shib.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nsapi_shib.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# End Target
-# End Project
diff --git a/posttest/posttest.dsp b/posttest/posttest.dsp
deleted file mode 100644 (file)
index 6f3d10c..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-# Microsoft Developer Studio Project File - Name="posttest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=posttest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "posttest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "posttest.mak" CFG="posttest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "posttest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "posttest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "posttest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "..\..\..\opensaml\c" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 xerces-c_2.lib saml_5.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\opensaml\c\saml\Release"
-
-!ELSEIF  "$(CFG)" == "posttest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "..\..\..\opensaml\c" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib saml_5D.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\opensaml\c\saml\Debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "posttest - Win32 Release"
-# Name "posttest - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\test\posttest.cpp
-# End Source File
-# End Target
-# End Project
diff --git a/posttest/posttest.vcproj b/posttest/posttest.vcproj
deleted file mode 100644 (file)
index 6489634..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="posttest"
-       ProjectGUID="{16E70C47-789E-43D5-AFDF-964D386C3CB5}"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory=".\Release"
-                       IntermediateDirectory=".\Release"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TypeLibraryName=".\Release/posttest.tlb"
-                               HeaderFileName=""
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..,..\..\cpp-opensaml1;&quot;..\..\cpp-opensaml2&quot;;&quot;..\..\cpp-xmltooling&quot;"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               RuntimeTypeInfo="true"
-                               UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=".\Release/posttest.pch"
-                               AssemblerListingLocation=".\Release/"
-                               ObjectFile=".\Release/"
-                               ProgramDataBaseFileName=".\Release/"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1033"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="xerces-c_2.lib saml_5.lib saml2.lib xmltooling1.lib"
-                               OutputFile=".\Release/posttest.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\cpp-opensaml1\saml\Release;..\..\cpp-opensaml2\Release;..\..\cpp-xmltooling\Release"
-                               ProgramDatabaseFile=".\Release/posttest.pdb"
-                               SubSystem="1"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory=".\Debug"
-                       IntermediateDirectory=".\Debug"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TypeLibraryName=".\Debug/posttest.tlb"
-                               HeaderFileName=""
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..;&quot;..\..\cpp-opensaml1&quot;;&quot;..\..\cpp-opensaml2&quot;;&quot;..\..\cpp-xmltooling&quot;"
-                               PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               RuntimeTypeInfo="true"
-                               UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=".\Debug/posttest.pch"
-                               AssemblerListingLocation=".\Debug/"
-                               ObjectFile=".\Debug/"
-                               ProgramDataBaseFileName=".\Debug/"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="4"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1033"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="xerces-c_2D.lib saml_5D.lib saml2D.lib xmltooling1D.lib"
-                               OutputFile=".\Debug/posttest.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\cpp-opensaml1\saml\Debug;..\..\cpp-opensaml2\Debug;..\..\cpp-xmltooling\Debug"
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\test\posttest.cpp"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
index 0c596e6..32b39ad 100644 (file)
@@ -8,18 +8,9 @@ pkgxml_DATA = \
        catalog.xml \
     shibboleth-metadata-1.0.xsd \
     shibboleth-targetconfig-1.0.xsd \
-            cs-sstc-schema-assertion-01.xsd \
-            cs-sstc-schema-protocol-01.xsd \
-            cs-sstc-schema-assertion-1.1.xsd \
-            cs-sstc-schema-protocol-1.1.xsd \
-            soap-envelope.xsd \
-            xmldsig-core-schema.xsd \
-                       xenc-schema.xsd \
-            xml.xsd \
+    shibboleth-spconfig-2.0.xsd \
             shibboleth.xsd \
             shibboleth-trust-1.0.xsd \
-                       saml-schema-assertion-2.0.xsd \
-                       saml-schema-metadata-2.0.xsd \
                        metadata_v12_to_v11.xsl \
                        metadata_v12_to_v13.xsl \
                        metadata_v13_to_v12.xsl \
@@ -44,4 +35,5 @@ CLEANFILES = catalog.xml
 EXTRA_DIST =
        catalog.xml.in \
     shibboleth-metadata-1.0.xsd \
-    shibboleth-targetconfig-1.0.xsd
+    shibboleth-targetconfig-1.0.xsd \
+       shibboleth-spconfig-2.0.xsd
diff --git a/schemas/cs-sstc-schema-assertion-01.xsd b/schemas/cs-sstc-schema-assertion-01.xsd
deleted file mode 100644 (file)
index 16e8cc9..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v3.5 NT (http://www.xmlspy.com) by Phill Hallam-Baker (VeriSign Inc.) -->
-<schema targetNamespace="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
-        <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
-        <annotation>
-                <documentation>
-                Document identifier: cs-sstc-schema-assertion-01
-                Location: http://www.oasis-open.org/committees/security/docs/
-                </documentation>
-        </annotation>
-        <simpleType name="IDType">
-                <restriction base="string"/>
-        </simpleType>
-        <simpleType name="IDReferenceType">
-                <restriction base="string"/>
-        </simpleType>
-        <simpleType name="DecisionType">
-                <restriction base="string">
-                        <enumeration value="Permit"/>
-                        <enumeration value="Deny"/>
-                        <enumeration value="Indeterminate"/>
-                </restriction>
-        </simpleType>
-        <element name="AssertionIDReference" type="saml:IDReferenceType"/>
-        <element name="Assertion" type="saml:AssertionType"/>
-        <complexType name="AssertionType">
-                <sequence>
-                        <element ref="saml:Conditions" minOccurs="0"/>
-                        <element ref="saml:Advice" minOccurs="0"/>
-                        <choice maxOccurs="unbounded">
-                                <element ref="saml:Statement"/>
-                                <element ref="saml:SubjectStatement"/>
-                                <element ref="saml:AuthenticationStatement"/>
-                                <element ref="saml:AuthorizationDecisionStatement"/>
-                                <element ref="saml:AttributeStatement"/>
-                        </choice>
-                        <element ref="ds:Signature" minOccurs="0"/>
-                </sequence>
-                <attribute name="MajorVersion" type="integer" use="required"/>
-                <attribute name="MinorVersion" type="integer" use="required"/>
-                <attribute name="AssertionID" type="saml:IDType" use="required"/>
-                <attribute name="Issuer" type="string" use="required"/>
-                <attribute name="IssueInstant" type="dateTime" use="required"/>
-        </complexType>
-        <element name="Conditions" type="saml:ConditionsType"/>
-        <complexType name="ConditionsType">
-                <choice minOccurs="0" maxOccurs="unbounded">
-                        <element ref="saml:AudienceRestrictionCondition"/>
-                        <element ref="saml:Condition"/>
-                </choice>
-                <attribute name="NotBefore" type="dateTime" use="optional"/>
-                <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
-        </complexType>
-        <element name="Condition" type="saml:ConditionAbstractType"/>
-        <complexType name="ConditionAbstractType" abstract="true"/>
-        <element name="AudienceRestrictionCondition" type="saml:AudienceRestrictionConditionType"/>
-        <complexType name="AudienceRestrictionConditionType">
-                <complexContent>
-                        <extension base="saml:ConditionAbstractType">
-                                <sequence>
-                                        <element ref="saml:Audience" maxOccurs="unbounded"/>
-                                </sequence>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="Audience" type="anyURI"/>
-        <element name="Advice" type="saml:AdviceType"/>
-        <complexType name="AdviceType">
-                <choice minOccurs="0" maxOccurs="unbounded">
-                        <element ref="saml:AssertionIDReference"/>
-                        <element ref="saml:Assertion"/>
-                        <any namespace="##other" processContents="lax"/>
-                </choice>
-        </complexType>
-        <element name="Statement" type="saml:StatementAbstractType"/>
-        <complexType name="StatementAbstractType" abstract="true"/>
-        <element name="SubjectStatement" type="saml:SubjectStatementAbstractType"/>
-        <complexType name="SubjectStatementAbstractType" abstract="true">
-                <complexContent>
-                        <extension base="saml:StatementAbstractType">
-                                <sequence>
-                                        <element ref="saml:Subject"/>
-                                </sequence>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="Subject" type="saml:SubjectType"/>
-        <complexType name="SubjectType">
-                <choice>
-                        <sequence>
-                                <element ref="saml:NameIdentifier"/>
-                                <element ref="saml:SubjectConfirmation" minOccurs="0"/>
-                        </sequence>
-                        <element ref="saml:SubjectConfirmation"/>
-                </choice>
-        </complexType>
-        <element name="NameIdentifier" type="saml:NameIdentifierType"/>
-        <complexType name="NameIdentifierType">
-                <simpleContent>
-                        <extension base="string">
-                                <attribute name="NameQualifier" type="string" use="optional"/>
-                                <attribute name="Format" type="anyURI" use="optional"/>
-                        </extension>
-                </simpleContent>
-        </complexType>
-        <element name="SubjectConfirmation" type="saml:SubjectConfirmationType"/>
-        <complexType name="SubjectConfirmationType">
-                <sequence>
-                        <element ref="saml:ConfirmationMethod" maxOccurs="unbounded"/>
-                        <element ref="saml:SubjectConfirmationData" minOccurs="0"/>
-                        <element ref="ds:KeyInfo" minOccurs="0"/>
-                </sequence>
-        </complexType>
-        <element name="SubjectConfirmationData" type="anyType"/>
-        <element name="ConfirmationMethod" type="anyURI"/>
-        <element name="AuthenticationStatement" type="saml:AuthenticationStatementType"/>
-        <complexType name="AuthenticationStatementType">
-                <complexContent>
-                        <extension base="saml:SubjectStatementAbstractType">
-                                <sequence>
-                                        <element ref="saml:SubjectLocality" minOccurs="0"/>
-                                        <element ref="saml:AuthorityBinding" minOccurs="0" maxOccurs="unbounded"/>
-                                </sequence>
-                                <attribute name="AuthenticationMethod" type="anyURI" use="required"/>
-                                <attribute name="AuthenticationInstant" type="dateTime" use="required"/>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="SubjectLocality" type="saml:SubjectLocalityType"/>
-        <complexType name="SubjectLocalityType">
-                <attribute name="IPAddress" type="string" use="optional"/>
-                <attribute name="DNSAddress" type="string" use="optional"/>
-        </complexType>
-        <element name="AuthorityBinding" type="saml:AuthorityBindingType"/>
-        <complexType name="AuthorityBindingType">
-                <attribute name="AuthorityKind" type="QName" use="required"/>
-                <attribute name="Location" type="anyURI" use="required"/>
-                <attribute name="Binding" type="anyURI" use="required"/>
-        </complexType>
-        <element name="AuthorizationDecisionStatement" type="saml:AuthorizationDecisionStatementType"/>
-        <complexType name="AuthorizationDecisionStatementType">
-                <complexContent>
-                        <extension base="saml:SubjectStatementAbstractType">
-                                <sequence>
-                                        <element ref="saml:Action" maxOccurs="unbounded"/>
-                                        <element ref="saml:Evidence" minOccurs="0"/>
-                                </sequence>
-                                <attribute name="Resource" type="anyURI" use="required"/>
-                                <attribute name="Decision" type="saml:DecisionType" use="required"/>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="Action" type="saml:ActionType"/>
-        <complexType name="ActionType">
-                <simpleContent>
-                        <extension base="string">
-                                <attribute name="Namespace" type="anyURI"/>
-                        </extension>
-                </simpleContent>
-        </complexType>
-        <element name="Evidence" type="saml:EvidenceType"/>
-        <complexType name="EvidenceType">
-                <choice maxOccurs="unbounded">
-                        <element ref="saml:AssertionIDReference"/>
-                        <element ref="saml:Assertion"/>
-                </choice>
-        </complexType>
-        <element name="AttributeStatement" type="saml:AttributeStatementType"/>
-        <complexType name="AttributeStatementType">
-                <complexContent>
-                        <extension base="saml:SubjectStatementAbstractType">
-                                <sequence>
-                                        <element ref="saml:Attribute" maxOccurs="unbounded"/>
-                                </sequence>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="AttributeDesignator" type="saml:AttributeDesignatorType"/>
-        <complexType name="AttributeDesignatorType">
-                <attribute name="AttributeName" type="string" use="required"/>
-                <attribute name="AttributeNamespace" type="anyURI" use="required"/>
-        </complexType>
-        <element name="Attribute" type="saml:AttributeType"/>
-        <complexType name="AttributeType">
-                <complexContent>
-                        <extension base="saml:AttributeDesignatorType">
-                                <sequence>
-                                        <element ref="saml:AttributeValue" maxOccurs="unbounded"/>
-                                </sequence>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="AttributeValue" type="anyType"/>
-</schema>
diff --git a/schemas/cs-sstc-schema-assertion-1.1.xsd b/schemas/cs-sstc-schema-assertion-1.1.xsd
deleted file mode 100644 (file)
index 26f9458..0000000
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="urn:oasis:names:tc:SAML:1.0:assertion" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="unqualified" attributeFormDefault="unqualified" version="1.1">
-       <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
-       <annotation>
-               <documentation>
-                Document identifier: sstc-saml-schema-assertion-1.1-draft-02
-                Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security
-                Revision history:
-                draft-01 (Eve Maler):
-                  Note that V1.1 of this schema has the same namespace as V1.0.
-                  Minor cosmetic updates.
-                  Changed IDType to restrict from xsd:ID.
-                  Changed IDReferenceType to restrict from xsd:IDREF.
-                  Set version attribute on schema element to 1.1.
-                draft-02 (Prateek Mishra, Rob Philpott):
-                  Added DoNotCacheCondition element and DoNotCacheConditionType
-                draft-03 (Scott Cantor)
-                                 Rebased ID content directly on XML Schema types
-                </documentation>
-       </annotation>
-       <simpleType name="DecisionType">
-               <restriction base="string">
-                       <enumeration value="Permit"/>
-                       <enumeration value="Deny"/>
-                       <enumeration value="Indeterminate"/>
-               </restriction>
-       </simpleType>
-       <element name="AssertionIDReference" type="NCName"/>
-       <element name="Assertion" type="saml:AssertionType"/>
-       <complexType name="AssertionType">
-               <sequence>
-                       <element ref="saml:Conditions" minOccurs="0"/>
-                       <element ref="saml:Advice" minOccurs="0"/>
-                       <choice maxOccurs="unbounded">
-                               <element ref="saml:Statement"/>
-                               <element ref="saml:SubjectStatement"/>
-                               <element ref="saml:AuthenticationStatement"/>
-                               <element ref="saml:AuthorizationDecisionStatement"/>
-                               <element ref="saml:AttributeStatement"/>
-                       </choice>
-                       <element ref="ds:Signature" minOccurs="0"/>
-               </sequence>
-               <attribute name="MajorVersion" type="integer" use="required"/>
-               <attribute name="MinorVersion" type="integer" use="required"/>
-               <attribute name="AssertionID" type="ID" use="required"/>
-               <attribute name="Issuer" type="string" use="required"/>
-               <attribute name="IssueInstant" type="dateTime" use="required"/>
-       </complexType>
-       <element name="Conditions" type="saml:ConditionsType"/>
-       <complexType name="ConditionsType">
-               <choice minOccurs="0" maxOccurs="unbounded">
-                       <element ref="saml:AudienceRestrictionCondition"/>
-                       <element ref="saml:DoNotCacheCondition"/>
-                       <element ref="saml:Condition"/>
-               </choice>
-               <attribute name="NotBefore" type="dateTime" use="optional"/>
-               <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
-       </complexType>
-       <element name="Condition" type="saml:ConditionAbstractType"/>
-       <complexType name="ConditionAbstractType" abstract="true"/>
-       <element name="AudienceRestrictionCondition" type="saml:AudienceRestrictionConditionType"/>
-       <complexType name="AudienceRestrictionConditionType">
-               <complexContent>
-                       <extension base="saml:ConditionAbstractType">
-                               <sequence>
-                                       <element ref="saml:Audience" maxOccurs="unbounded"/>
-                               </sequence>
-                       </extension>
-               </complexContent>
-       </complexType>
-       <element name="Audience" type="anyURI"/>
-       <element name="DoNotCacheCondition" type="saml:DoNotCacheConditionType" />
-       <complexType name="DoNotCacheConditionType">
-               <complexContent>
-                       <extension base="saml:ConditionAbstractType"/>
-               </complexContent>
-       </complexType>
-       <element name="Advice" type="saml:AdviceType"/>
-       <complexType name="AdviceType">
-               <choice minOccurs="0" maxOccurs="unbounded">
-                       <element ref="saml:AssertionIDReference"/>
-                       <element ref="saml:Assertion"/>
-                       <any namespace="##other" processContents="lax"/>
-               </choice>
-       </complexType>
-       <element name="Statement" type="saml:StatementAbstractType"/>
-       <complexType name="StatementAbstractType" abstract="true"/>
-       <element name="SubjectStatement" type="saml:SubjectStatementAbstractType"/>
-       <complexType name="SubjectStatementAbstractType" abstract="true">
-               <complexContent>
-                       <extension base="saml:StatementAbstractType">
-                               <sequence>
-                                       <element ref="saml:Subject"/>
-                               </sequence>
-                       </extension>
-               </complexContent>
-       </complexType>
-       <element name="Subject" type="saml:SubjectType"/>
-       <complexType name="SubjectType">
-               <choice>
-                       <sequence>
-                               <element ref="saml:NameIdentifier"/>
-                               <element ref="saml:SubjectConfirmation" minOccurs="0"/>
-                       </sequence>
-                       <element ref="saml:SubjectConfirmation"/>
-               </choice>
-       </complexType>
-       <element name="NameIdentifier" type="saml:NameIdentifierType"/>
-       <complexType name="NameIdentifierType">
-               <simpleContent>
-                       <extension base="string">
-                               <attribute name="NameQualifier" type="string" use="optional"/>
-                               <attribute name="Format" type="anyURI" use="optional"/>
-                       </extension>
-               </simpleContent>
-       </complexType>
-       <element name="SubjectConfirmation" type="saml:SubjectConfirmationType"/>
-       <complexType name="SubjectConfirmationType">
-               <sequence>
-                       <element ref="saml:ConfirmationMethod" maxOccurs="unbounded"/>
-                       <element ref="saml:SubjectConfirmationData" minOccurs="0"/>
-                       <element ref="ds:KeyInfo" minOccurs="0"/>
-               </sequence>
-       </complexType>
-       <element name="SubjectConfirmationData" type="anyType"/>
-       <element name="ConfirmationMethod" type="anyURI"/>
-       <element name="AuthenticationStatement" type="saml:AuthenticationStatementType"/>
-       <complexType name="AuthenticationStatementType">
-               <complexContent>
-                       <extension base="saml:SubjectStatementAbstractType">
-                               <sequence>
-                                       <element ref="saml:SubjectLocality" minOccurs="0"/>
-                                       <element ref="saml:AuthorityBinding" minOccurs="0" maxOccurs="unbounded"/>
-                               </sequence>
-                               <attribute name="AuthenticationMethod" type="anyURI" use="required"/>
-                               <attribute name="AuthenticationInstant" type="dateTime" use="required"/>
-                       </extension>
-               </complexContent>
-       </complexType>
-       <element name="SubjectLocality" type="saml:SubjectLocalityType"/>
-       <complexType name="SubjectLocalityType">
-               <attribute name="IPAddress" type="string" use="optional"/>
-               <attribute name="DNSAddress" type="string" use="optional"/>
-       </complexType>
-       <element name="AuthorityBinding" type="saml:AuthorityBindingType"/>
-       <complexType name="AuthorityBindingType">
-               <attribute name="AuthorityKind" type="QName" use="required"/>
-               <attribute name="Location" type="anyURI" use="required"/>
-               <attribute name="Binding" type="anyURI" use="required"/>
-       </complexType>
-       <element name="AuthorizationDecisionStatement" type="saml:AuthorizationDecisionStatementType"/>
-       <complexType name="AuthorizationDecisionStatementType">
-               <complexContent>
-                       <extension base="saml:SubjectStatementAbstractType">
-                               <sequence>
-                                       <element ref="saml:Action" maxOccurs="unbounded"/>
-                                       <element ref="saml:Evidence" minOccurs="0"/>
-                               </sequence>
-                               <attribute name="Resource" type="anyURI" use="required"/>
-                               <attribute name="Decision" type="saml:DecisionType" use="required"/>
-                       </extension>
-               </complexContent>
-       </complexType>
-       <element name="Action" type="saml:ActionType"/>
-       <complexType name="ActionType">
-               <simpleContent>
-                       <extension base="string">
-                               <attribute name="Namespace" type="anyURI"/>
-                       </extension>
-               </simpleContent>
-       </complexType>
-       <element name="Evidence" type="saml:EvidenceType"/>
-       <complexType name="EvidenceType">
-               <choice maxOccurs="unbounded">
-                       <element ref="saml:AssertionIDReference"/>
-                       <element ref="saml:Assertion"/>
-               </choice>
-       </complexType>
-       <element name="AttributeStatement" type="saml:AttributeStatementType"/>
-       <complexType name="AttributeStatementType">
-               <complexContent>
-                       <extension base="saml:SubjectStatementAbstractType">
-                               <sequence>
-                                       <element ref="saml:Attribute" maxOccurs="unbounded"/>
-                               </sequence>
-                       </extension>
-               </complexContent>
-       </complexType>
-       <element name="AttributeDesignator" type="saml:AttributeDesignatorType"/>
-       <complexType name="AttributeDesignatorType">
-               <attribute name="AttributeName" type="string" use="required"/>
-               <attribute name="AttributeNamespace" type="anyURI" use="required"/>
-       </complexType>
-       <element name="Attribute" type="saml:AttributeType"/>
-       <complexType name="AttributeType">
-               <complexContent>
-                       <extension base="saml:AttributeDesignatorType">
-                               <sequence>
-                                       <element ref="saml:AttributeValue" maxOccurs="unbounded"/>
-                               </sequence>
-                       </extension>
-               </complexContent>
-       </complexType>
-       <element name="AttributeValue" type="anyType"/>
-</schema>
diff --git a/schemas/cs-sstc-schema-protocol-01.xsd b/schemas/cs-sstc-schema-protocol-01.xsd
deleted file mode 100644 (file)
index bbd7297..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v4.2 U (http://www.xmlspy.com) by Phillip Hallam-Baker (Phillip Hallam-Baker) -->
-<schema targetNamespace="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
-        <import namespace="urn:oasis:names:tc:SAML:1.0:assertion" schemaLocation="cs-sstc-schema-assertion-01.xsd"/>
-        <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
-        <annotation>
-                <documentation>
-                Document identifier: cs-sstc-schema-protocol-01
-                Location: http://www.oasis-open.org/committees/security/docs/
-                </documentation>
-        </annotation>
-        <complexType name="RequestAbstractType" abstract="true">
-                <sequence>
-                        <element ref="samlp:RespondWith" minOccurs="0" maxOccurs="unbounded"/>
-                        <element ref="ds:Signature" minOccurs="0"/>
-                </sequence>
-                <attribute name="RequestID" type="saml:IDType" use="required"/>
-                <attribute name="MajorVersion" type="integer" use="required"/>
-                <attribute name="MinorVersion" type="integer" use="required"/>
-                <attribute name="IssueInstant" type="dateTime" use="required"/>
-        </complexType>
-        <element name="RespondWith" type="QName"/>
-        <element name="Request" type="samlp:RequestType"/>
-        <complexType name="RequestType">
-                <complexContent>
-                        <extension base="samlp:RequestAbstractType">
-                                <choice>
-                                        <element ref="samlp:Query"/>
-                                        <element ref="samlp:SubjectQuery"/>
-                                        <element ref="samlp:AuthenticationQuery"/>
-                                        <element ref="samlp:AttributeQuery"/>
-                                        <element ref="samlp:AuthorizationDecisionQuery"/>
-                                        <element ref="saml:AssertionIDReference" maxOccurs="unbounded"/>
-                                        <element ref="samlp:AssertionArtifact" maxOccurs="unbounded"/>
-                                </choice>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="AssertionArtifact" type="string"/>
-        <element name="Query" type="samlp:QueryAbstractType"/>
-        <complexType name="QueryAbstractType" abstract="true"/>
-        <element name="SubjectQuery" type="samlp:SubjectQueryAbstractType"/>
-        <complexType name="SubjectQueryAbstractType" abstract="true">
-                <complexContent>
-                        <extension base="samlp:QueryAbstractType">
-                                <sequence>
-                                        <element ref="saml:Subject"/>
-                                </sequence>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="AuthenticationQuery" type="samlp:AuthenticationQueryType"/>
-        <complexType name="AuthenticationQueryType">
-                <complexContent>
-                        <extension base="samlp:SubjectQueryAbstractType">
-                                <attribute name="AuthenticationMethod" type="anyURI"/>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="AttributeQuery" type="samlp:AttributeQueryType"/>
-        <complexType name="AttributeQueryType">
-                <complexContent>
-                        <extension base="samlp:SubjectQueryAbstractType">
-                                <sequence>
-                                        <element ref="saml:AttributeDesignator" minOccurs="0" maxOccurs="unbounded"/>
-                                </sequence>
-                                <attribute name="Resource" type="anyURI" use="optional"/>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="AuthorizationDecisionQuery" type="samlp:AuthorizationDecisionQueryType"/>
-        <complexType name="AuthorizationDecisionQueryType">
-                <complexContent>
-                        <extension base="samlp:SubjectQueryAbstractType">
-                                <sequence>
-                                        <element ref="saml:Action" maxOccurs="unbounded"/>
-                                        <element ref="saml:Evidence" minOccurs="0" maxOccurs="1"/>
-                                </sequence>
-                                <attribute name="Resource" type="anyURI" use="required"/>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <complexType name="ResponseAbstractType" abstract="true">
-                <sequence>
-                        <element ref="ds:Signature" minOccurs="0"/>
-                </sequence>
-                <attribute name="ResponseID" type="saml:IDType" use="required"/>
-                <attribute name="InResponseTo" type="saml:IDReferenceType" use="optional"/>
-                <attribute name="MajorVersion" type="integer" use="required"/>
-                <attribute name="MinorVersion" type="integer" use="required"/>
-                <attribute name="IssueInstant" type="dateTime" use="required"/>
-                <attribute name="Recipient" type="anyURI" use="optional"/>
-        </complexType>
-        <element name="Response" type="samlp:ResponseType"/>
-        <complexType name="ResponseType">
-                <complexContent>
-                        <extension base="samlp:ResponseAbstractType">
-                                <sequence>
-                                        <element ref="samlp:Status"/>
-                                        <element ref="saml:Assertion" minOccurs="0" maxOccurs="unbounded"/>
-                                </sequence>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="Status" type="samlp:StatusType"/>
-        <complexType name="StatusType">
-                <sequence>
-                        <element ref="samlp:StatusCode"/>
-                        <element ref="samlp:StatusMessage" minOccurs="0" maxOccurs="1"/>
-                        <element ref="samlp:StatusDetail" minOccurs="0"/>
-                </sequence>
-        </complexType>
-        <element name="StatusCode" type="samlp:StatusCodeType"/>
-        <complexType name="StatusCodeType">
-                <sequence>
-                        <element ref="samlp:StatusCode" minOccurs="0"/>
-                </sequence>
-                <attribute name="Value" type="QName" use="required"/>
-        </complexType>
-        <element name="StatusMessage" type="string"/>
-        <element name="StatusDetail" type="samlp:StatusDetailType"/>
-        <complexType name="StatusDetailType">
-                <sequence>
-                        <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-        </complexType>
-</schema>
diff --git a/schemas/cs-sstc-schema-protocol-1.1.xsd b/schemas/cs-sstc-schema-protocol-1.1.xsd
deleted file mode 100644 (file)
index e956251..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="urn:oasis:names:tc:SAML:1.0:protocol" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="unqualified" attributeFormDefault="unqualified" version="1.1">
-       <import namespace="urn:oasis:names:tc:SAML:1.0:assertion" schemaLocation="cs-sstc-schema-assertion-1.1.xsd"/>
-       <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
-       <annotation>
-               <documentation>
-                       Document identifier: sstc-saml-schema-protocol-1.1-draft-03
-                       Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security
-                       Revision history:
-                          draft-01 (Eve Maler):
-                               Note that V1.1 of this schema has the same namespace as V1.0.
-                               Minor cosmetic updates.
-                               Set version attribute on schema element to 1.1.
-                          draft-01 (Eve Maler):
-                               Fix document Identifier.
-                          draft-02 (Prateek Mishra, Rob Philpott):
-                               Added DoNotCacheCondition.
-                          draft-04 (Scott Cantor):
-                               Rebased ID content directly on XML Schema types
-               </documentation>
-       </annotation>
-       <complexType name="RequestAbstractType" abstract="true">
-               <sequence>
-                       <element ref="samlp:RespondWith" minOccurs="0" maxOccurs="unbounded"/>
-                       <element ref="ds:Signature" minOccurs="0"/>
-               </sequence>
-               <attribute name="RequestID" type="ID" use="required"/>
-               <attribute name="MajorVersion" type="integer" use="required"/>
-               <attribute name="MinorVersion" type="integer" use="required"/>
-               <attribute name="IssueInstant" type="dateTime" use="required"/>
-       </complexType>
-       <element name="RespondWith" type="QName"/>
-       <element name="Request" type="samlp:RequestType"/>
-       <complexType name="RequestType">
-               <complexContent>
-                       <extension base="samlp:RequestAbstractType">
-                               <choice>
-                                       <element ref="samlp:Query"/>
-                                       <element ref="samlp:SubjectQuery"/>
-                                       <element ref="samlp:AuthenticationQuery"/>
-                                       <element ref="samlp:AttributeQuery"/>
-                                       <element ref="samlp:AuthorizationDecisionQuery"/>
-                                       <element ref="saml:AssertionIDReference" maxOccurs="unbounded"/>
-                                       <element ref="samlp:AssertionArtifact" maxOccurs="unbounded"/>
-                               </choice>
-                       </extension>
-               </complexContent>
-       </complexType>
-       <element name="AssertionArtifact" type="string"/>
-       <element name="Query" type="samlp:QueryAbstractType"/>
-       <complexType name="QueryAbstractType" abstract="true"/>
-       <element name="SubjectQuery" type="samlp:SubjectQueryAbstractType"/>
-       <complexType name="SubjectQueryAbstractType" abstract="true">
-               <complexContent>
-                       <extension base="samlp:QueryAbstractType">
-                               <sequence>
-                                       <element ref="saml:Subject"/>
-                               </sequence>
-                       </extension>
-               </complexContent>
-       </complexType>
-       <element name="AuthenticationQuery" type="samlp:AuthenticationQueryType"/>
-       <complexType name="AuthenticationQueryType">
-               <complexContent>
-                       <extension base="samlp:SubjectQueryAbstractType">
-                               <attribute name="AuthenticationMethod" type="anyURI"/>
-                       </extension>
-               </complexContent>
-       </complexType>
-       <element name="AttributeQuery" type="samlp:AttributeQueryType"/>
-       <complexType name="AttributeQueryType">
-               <complexContent>
-                       <extension base="samlp:SubjectQueryAbstractType">
-                               <sequence>
-                                       <element ref="saml:AttributeDesignator" minOccurs="0" maxOccurs="unbounded"/>
-                               </sequence>
-                               <attribute name="Resource" type="anyURI" use="optional"/>
-                       </extension>
-               </complexContent>
-       </complexType>
-       <element name="AuthorizationDecisionQuery" type="samlp:AuthorizationDecisionQueryType"/>
-       <complexType name="AuthorizationDecisionQueryType">
-               <complexContent>
-                       <extension base="samlp:SubjectQueryAbstractType">
-                               <sequence>
-                                       <element ref="saml:Action" maxOccurs="unbounded"/>
-                                       <element ref="saml:Evidence" minOccurs="0"/>
-                               </sequence>
-                               <attribute name="Resource" type="anyURI" use="required"/>
-                       </extension>
-               </complexContent>
-       </complexType>
-       <complexType name="ResponseAbstractType" abstract="true">
-               <sequence>
-                       <element ref="ds:Signature" minOccurs="0"/>
-               </sequence>
-               <attribute name="ResponseID" type="ID" use="required"/>
-               <attribute name="InResponseTo" type="NCName" use="optional"/>
-               <attribute name="MajorVersion" type="integer" use="required"/>
-               <attribute name="MinorVersion" type="integer" use="required"/>
-               <attribute name="IssueInstant" type="dateTime" use="required"/>
-               <attribute name="Recipient" type="anyURI" use="optional"/>
-       </complexType>
-       <element name="Response" type="samlp:ResponseType"/>
-       <complexType name="ResponseType">
-               <complexContent>
-                       <extension base="samlp:ResponseAbstractType">
-                               <sequence>
-                                       <element ref="samlp:Status"/>
-                                       <element ref="saml:Assertion" minOccurs="0" maxOccurs="unbounded"/>
-                               </sequence>
-                       </extension>
-               </complexContent>
-       </complexType>
-       <element name="Status" type="samlp:StatusType"/>
-       <complexType name="StatusType">
-               <sequence>
-                       <element ref="samlp:StatusCode"/>
-                       <element ref="samlp:StatusMessage" minOccurs="0"/>
-                       <element ref="samlp:StatusDetail" minOccurs="0"/>
-               </sequence>
-       </complexType>
-       <element name="StatusCode" type="samlp:StatusCodeType"/>
-       <complexType name="StatusCodeType">
-               <sequence>
-                       <element ref="samlp:StatusCode" minOccurs="0"/>
-               </sequence>
-               <attribute name="Value" type="QName" use="required"/>
-       </complexType>
-       <element name="StatusMessage" type="string"/>
-       <element name="StatusDetail" type="samlp:StatusDetailType"/>
-       <complexType name="StatusDetailType">
-               <sequence>
-                       <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-               </sequence>
-       </complexType>
-</schema>
diff --git a/schemas/saml-schema-assertion-2.0.xsd b/schemas/saml-schema-assertion-2.0.xsd
deleted file mode 100644 (file)
index 09fd045..0000000
+++ /dev/null
@@ -1,281 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<schema
-    targetNamespace="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
-    elementFormDefault="unqualified"
-    attributeFormDefault="unqualified"
-    blockDefault="substitution"
-    version="2.0">
-    <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
-    <import namespace="http://www.w3.org/2001/04/xmlenc#" schemaLocation="xenc-schema.xsd"/>
-    <annotation>
-        <documentation>
-            Document identifier: saml-schema-assertion-2.0
-            Location: http://docs.oasis-open.org/security/saml/v2.0/
-            Revision history:
-            V1.0 (November, 2002):
-              Initial Standard Schema.
-            V1.1 (September, 2003):
-              Updates within the same V1.0 namespace.
-            V2.0 (March, 2005):
-              New assertion schema for SAML V2.0 namespace.
-        </documentation>
-    </annotation>
-    <attributeGroup name="IDNameQualifiers">
-        <attribute name="NameQualifier" type="string" use="optional"/>
-        <attribute name="SPNameQualifier" type="string" use="optional"/>
-    </attributeGroup>
-    <element name="BaseID" type="saml:BaseIDAbstractType"/>
-    <complexType name="BaseIDAbstractType" abstract="true">
-        <attributeGroup ref="saml:IDNameQualifiers"/>
-    </complexType>
-    <element name="NameID" type="saml:NameIDType"/>
-    <complexType name="NameIDType">
-        <simpleContent>
-            <extension base="string">
-                <attributeGroup ref="saml:IDNameQualifiers"/>
-                <attribute name="Format" type="anyURI" use="optional"/>
-                <attribute name="SPProvidedID" type="string" use="optional"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    <complexType name="EncryptedElementType">
-        <sequence>
-            <element ref="xenc:EncryptedData"/>
-            <element ref="xenc:EncryptedKey" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    <element name="EncryptedID" type="saml:EncryptedElementType"/>
-    <element name="Issuer" type="saml:NameIDType"/>
-    <element name="AssertionIDRef" type="NCName"/>
-    <element name="AssertionURIRef" type="anyURI"/>
-    <element name="Assertion" type="saml:AssertionType"/>
-    <complexType name="AssertionType">
-        <sequence>
-            <element ref="saml:Issuer"/>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="saml:Subject" minOccurs="0"/>
-            <element ref="saml:Conditions" minOccurs="0"/>
-            <element ref="saml:Advice" minOccurs="0"/>
-            <choice minOccurs="0" maxOccurs="unbounded">
-                <element ref="saml:Statement"/>
-                <element ref="saml:AuthnStatement"/>
-                <element ref="saml:AuthzDecisionStatement"/>
-                <element ref="saml:AttributeStatement"/>
-            </choice>
-        </sequence>
-        <attribute name="Version" type="string" use="required"/>
-        <attribute name="ID" type="ID" use="required"/>
-        <attribute name="IssueInstant" type="dateTime" use="required"/>
-    </complexType>
-    <element name="Subject" type="saml:SubjectType"/>
-    <complexType name="SubjectType">
-        <choice>
-            <sequence>
-                <choice>
-                    <element ref="saml:BaseID"/>
-                    <element ref="saml:NameID"/>
-                    <element ref="saml:EncryptedID"/>
-                </choice>
-                <element ref="saml:SubjectConfirmation" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-            <element ref="saml:SubjectConfirmation" maxOccurs="unbounded"/>
-        </choice>
-    </complexType>
-    <element name="SubjectConfirmation" type="saml:SubjectConfirmationType"/>
-    <complexType name="SubjectConfirmationType">
-        <sequence>
-            <choice minOccurs="0">
-                <element ref="saml:BaseID"/>
-                <element ref="saml:NameID"/>
-                <element ref="saml:EncryptedID"/>
-            </choice>
-            <element ref="saml:SubjectConfirmationData" minOccurs="0"/>
-        </sequence>
-        <attribute name="Method" type="anyURI" use="required"/>
-    </complexType>
-    <element name="SubjectConfirmationData" type="saml:SubjectConfirmationDataType"/>
-    <complexType name="SubjectConfirmationDataType" mixed="true">
-        <complexContent>
-            <restriction base="anyType">
-                <sequence>
-                    <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="NotBefore" type="dateTime" use="optional"/>
-                <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
-                <attribute name="Recipient" type="anyURI" use="optional"/>
-                <attribute name="InResponseTo" type="NCName" use="optional"/>
-                <attribute name="Address" type="string" use="optional"/>
-                <anyAttribute namespace="##other" processContents="lax"/>
-            </restriction>
-        </complexContent>
-    </complexType>
-    <complexType name="KeyInfoConfirmationDataType" mixed="false">
-        <complexContent>
-            <restriction base="saml:SubjectConfirmationDataType">
-                <sequence>
-                    <element ref="ds:KeyInfo" maxOccurs="unbounded"/>
-                </sequence>
-            </restriction>
-        </complexContent>
-    </complexType>
-    <element name="Conditions" type="saml:ConditionsType"/>
-    <complexType name="ConditionsType">
-        <choice minOccurs="0" maxOccurs="unbounded">
-            <element ref="saml:Condition"/>
-            <element ref="saml:AudienceRestriction"/>
-            <element ref="saml:OneTimeUse"/>
-            <element ref="saml:ProxyRestriction"/>
-        </choice>
-        <attribute name="NotBefore" type="dateTime" use="optional"/>
-        <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
-    </complexType>
-    <element name="Condition" type="saml:ConditionAbstractType"/>
-    <complexType name="ConditionAbstractType" abstract="true"/>
-    <element name="AudienceRestriction" type="saml:AudienceRestrictionType"/>
-    <complexType name="AudienceRestrictionType">
-        <complexContent>
-            <extension base="saml:ConditionAbstractType">
-                <sequence>
-                    <element ref="saml:Audience" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="Audience" type="anyURI"/>
-    <element name="OneTimeUse" type="saml:OneTimeUseType" />
-    <complexType name="OneTimeUseType">
-        <complexContent>
-            <extension base="saml:ConditionAbstractType"/>
-        </complexContent>
-    </complexType>
-    <element name="ProxyRestriction" type="saml:ProxyRestrictionType"/>
-    <complexType name="ProxyRestrictionType">
-    <complexContent>
-        <extension base="saml:ConditionAbstractType">
-            <sequence>
-                <element ref="saml:Audience" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="Count" type="nonNegativeInteger" use="optional"/>
-        </extension>
-       </complexContent>
-    </complexType>
-    <element name="Advice" type="saml:AdviceType"/>
-    <complexType name="AdviceType">
-        <choice minOccurs="0" maxOccurs="unbounded">
-            <element ref="saml:AssertionIDRef"/>
-            <element ref="saml:AssertionURIRef"/>
-            <element ref="saml:Assertion"/>
-            <element ref="saml:EncryptedAssertion"/>
-            <any namespace="##other" processContents="lax"/>
-        </choice>
-    </complexType>
-    <element name="EncryptedAssertion" type="saml:EncryptedElementType"/>
-    <element name="Statement" type="saml:StatementAbstractType"/>
-    <complexType name="StatementAbstractType" abstract="true"/>
-    <element name="AuthnStatement" type="saml:AuthnStatementType"/>
-    <complexType name="AuthnStatementType">
-        <complexContent>
-            <extension base="saml:StatementAbstractType">
-                <sequence>
-                    <element ref="saml:SubjectLocality" minOccurs="0"/>
-                    <element ref="saml:AuthnContext"/>
-                </sequence>
-                <attribute name="AuthnInstant" type="dateTime" use="required"/>
-                <attribute name="SessionIndex" type="string" use="optional"/>
-                <attribute name="SessionNotOnOrAfter" type="dateTime" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="SubjectLocality" type="saml:SubjectLocalityType"/>
-    <complexType name="SubjectLocalityType">
-        <attribute name="Address" type="string" use="optional"/>
-        <attribute name="DNSName" type="string" use="optional"/>
-    </complexType>
-    <element name="AuthnContext" type="saml:AuthnContextType"/>
-    <complexType name="AuthnContextType">
-        <sequence>
-            <choice>
-                <sequence>
-                    <element ref="saml:AuthnContextClassRef"/>
-                    <choice minOccurs="0">
-                        <element ref="saml:AuthnContextDecl"/>
-                        <element ref="saml:AuthnContextDeclRef"/>
-                    </choice>
-                </sequence>
-                <choice>
-                    <element ref="saml:AuthnContextDecl"/>
-                    <element ref="saml:AuthnContextDeclRef"/>
-                </choice>
-            </choice>
-            <element ref="saml:AuthenticatingAuthority" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    <element name="AuthnContextClassRef" type="anyURI"/>
-    <element name="AuthnContextDeclRef" type="anyURI"/>
-    <element name="AuthnContextDecl" type="anyType"/>
-    <element name="AuthenticatingAuthority" type="anyURI"/>
-    <element name="AuthzDecisionStatement" type="saml:AuthzDecisionStatementType"/>
-    <complexType name="AuthzDecisionStatementType">
-        <complexContent>
-            <extension base="saml:StatementAbstractType">
-                <sequence>
-                    <element ref="saml:Action" maxOccurs="unbounded"/>
-                    <element ref="saml:Evidence" minOccurs="0"/>
-                </sequence>
-                <attribute name="Resource" type="anyURI" use="required"/>
-                <attribute name="Decision" type="saml:DecisionType" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <simpleType name="DecisionType">
-        <restriction base="string">
-            <enumeration value="Permit"/>
-            <enumeration value="Deny"/>
-            <enumeration value="Indeterminate"/>
-        </restriction>
-    </simpleType>
-    <element name="Action" type="saml:ActionType"/>
-    <complexType name="ActionType">
-        <simpleContent>
-            <extension base="string">
-                <attribute name="Namespace" type="anyURI" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    <element name="Evidence" type="saml:EvidenceType"/>
-    <complexType name="EvidenceType">
-        <choice maxOccurs="unbounded">
-            <element ref="saml:AssertionIDRef"/>
-            <element ref="saml:AssertionURIRef"/>
-            <element ref="saml:Assertion"/>
-            <element ref="saml:EncryptedAssertion"/>
-        </choice>
-    </complexType>
-    <element name="AttributeStatement" type="saml:AttributeStatementType"/>
-    <complexType name="AttributeStatementType">
-        <complexContent>
-            <extension base="saml:StatementAbstractType">
-                <choice maxOccurs="unbounded">
-                    <element ref="saml:Attribute"/>
-                    <element ref="saml:EncryptedAttribute"/>
-                </choice>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="Attribute" type="saml:AttributeType"/>
-    <complexType name="AttributeType">
-        <sequence>
-            <element ref="saml:AttributeValue" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="Name" type="string" use="required"/>
-        <attribute name="NameFormat" type="anyURI" use="optional"/>
-        <attribute name="FriendlyName" type="string" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <element name="AttributeValue" type="anyType" nillable="true"/>
-    <element name="EncryptedAttribute" type="saml:EncryptedElementType"/>
-</schema>
diff --git a/schemas/saml-schema-metadata-2.0.xsd b/schemas/saml-schema-metadata-2.0.xsd
deleted file mode 100644 (file)
index fc8b206..0000000
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<schema
-    targetNamespace="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
-    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns="http://www.w3.org/2001/XMLSchema"
-    elementFormDefault="unqualified"
-    attributeFormDefault="unqualified"
-    blockDefault="substitution"
-    version="2.0">
-    <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
-    <import namespace="http://www.w3.org/2001/04/xmlenc#" schemaLocation="xenc-schema.xsd"/>
-    <import namespace="urn:oasis:names:tc:SAML:2.0:assertion" schemaLocation="saml-schema-assertion-2.0.xsd"/>
-    <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
-    <annotation>
-        <documentation>
-            Document identifier: saml-schema-metadata-2.0
-            Location: http://docs.oasis-open.org/security/saml/v2.0/
-            Revision history:
-              V2.0 (March, 2005):
-                Schema for SAML metadata, first published in SAML 2.0.
-        </documentation>
-    </annotation>
-
-    <simpleType name="entityIDType">
-        <restriction base="anyURI">
-            <maxLength value="1024"/>
-        </restriction>
-    </simpleType>
-    <complexType name="localizedNameType">
-        <simpleContent>
-            <extension base="string">
-                <attribute ref="xml:lang" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    <complexType name="localizedURIType">
-        <simpleContent>
-            <extension base="anyURI">
-                <attribute ref="xml:lang" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    
-    <element name="Extensions" type="md:ExtensionsType"/>
-    <complexType final="#all" name="ExtensionsType">
-        <sequence>
-            <any namespace="##other" processContents="lax" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    
-    <complexType name="EndpointType">
-        <sequence>
-            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="Binding" type="anyURI" use="required"/>
-        <attribute name="Location" type="anyURI" use="required"/>
-        <attribute name="ResponseLocation" type="anyURI" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    
-    <complexType name="IndexedEndpointType">
-        <complexContent>
-            <extension base="md:EndpointType">
-                <attribute name="index" type="unsignedShort" use="required"/>
-                <attribute name="isDefault" type="boolean" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <element name="EntitiesDescriptor" type="md:EntitiesDescriptorType"/>
-    <complexType name="EntitiesDescriptorType">
-        <sequence>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <choice minOccurs="1" maxOccurs="unbounded">
-                <element ref="md:EntityDescriptor"/>
-                <element ref="md:EntitiesDescriptor"/>
-            </choice>
-        </sequence>
-        <attribute name="validUntil" type="dateTime" use="optional"/>
-        <attribute name="cacheDuration" type="duration" use="optional"/>
-        <attribute name="ID" type="ID" use="optional"/>
-        <attribute name="Name" type="string" use="optional"/>
-    </complexType>
-
-    <element name="EntityDescriptor" type="md:EntityDescriptorType"/>
-    <complexType name="EntityDescriptorType">
-        <sequence>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <choice>
-                <choice maxOccurs="unbounded">
-                    <element ref="md:RoleDescriptor"/>
-                    <element ref="md:IDPSSODescriptor"/>
-                    <element ref="md:SPSSODescriptor"/>
-                    <element ref="md:AuthnAuthorityDescriptor"/>
-                    <element ref="md:AttributeAuthorityDescriptor"/>
-                    <element ref="md:PDPDescriptor"/>
-                </choice>
-                <element ref="md:AffiliationDescriptor"/>
-            </choice>
-            <element ref="md:Organization" minOccurs="0"/>
-            <element ref="md:ContactPerson" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="md:AdditionalMetadataLocation" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="entityID" type="md:entityIDType" use="required"/>
-        <attribute name="validUntil" type="dateTime" use="optional"/>
-        <attribute name="cacheDuration" type="duration" use="optional"/>
-        <attribute name="ID" type="ID" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    
-    <element name="Organization" type="md:OrganizationType"/>
-    <complexType name="OrganizationType">
-        <sequence>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <element ref="md:OrganizationName" maxOccurs="unbounded"/>
-            <element ref="md:OrganizationDisplayName" maxOccurs="unbounded"/>
-            <element ref="md:OrganizationURL" maxOccurs="unbounded"/>
-        </sequence>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <element name="OrganizationName" type="md:localizedNameType"/>
-    <element name="OrganizationDisplayName" type="md:localizedNameType"/>
-    <element name="OrganizationURL" type="md:localizedURIType"/>
-    <element name="ContactPerson" type="md:ContactType"/>
-    <complexType name="ContactType">
-        <sequence>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <element ref="md:Company" minOccurs="0"/>
-            <element ref="md:GivenName" minOccurs="0"/>
-            <element ref="md:SurName" minOccurs="0"/>
-            <element ref="md:EmailAddress" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="md:TelephoneNumber" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="contactType" type="md:ContactTypeType" use="required"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <element name="Company" type="string"/>
-    <element name="GivenName" type="string"/>
-    <element name="SurName" type="string"/>
-    <element name="EmailAddress" type="anyURI"/>
-    <element name="TelephoneNumber" type="string"/>
-    <simpleType name="ContactTypeType">
-        <restriction base="string">
-            <enumeration value="technical"/>
-            <enumeration value="support"/>
-            <enumeration value="administrative"/>
-            <enumeration value="billing"/>
-            <enumeration value="other"/>
-        </restriction>
-    </simpleType>
-
-    <element name="AdditionalMetadataLocation" type="md:AdditionalMetadataLocationType"/>
-    <complexType name="AdditionalMetadataLocationType">
-        <simpleContent>
-            <extension base="anyURI">
-                <attribute name="namespace" type="anyURI" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-
-    <element name="RoleDescriptor" type="md:RoleDescriptorType"/>
-    <complexType name="RoleDescriptorType" abstract="true">
-        <sequence>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <element ref="md:KeyDescriptor" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="md:Organization" minOccurs="0"/>
-            <element ref="md:ContactPerson" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="ID" type="ID" use="optional"/>
-        <attribute name="validUntil" type="dateTime" use="optional"/>
-        <attribute name="cacheDuration" type="duration" use="optional"/>
-        <attribute name="protocolSupportEnumeration" type="md:anyURIListType" use="required"/>
-        <attribute name="errorURL" type="anyURI" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <simpleType name="anyURIListType">
-        <list itemType="anyURI"/>
-    </simpleType>
-
-    <element name="KeyDescriptor" type="md:KeyDescriptorType"/>
-    <complexType name="KeyDescriptorType">
-        <sequence>
-            <element ref="ds:KeyInfo"/>
-            <element ref="md:EncryptionMethod" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="use" type="md:KeyTypes" use="optional"/>
-    </complexType>
-    <simpleType name="KeyTypes">
-        <restriction base="string">
-            <enumeration value="encryption"/>
-            <enumeration value="signing"/>
-        </restriction>
-    </simpleType>
-    <element name="EncryptionMethod" type="xenc:EncryptionMethodType"/>
-    
-    <complexType name="SSODescriptorType" abstract="true">
-        <complexContent>
-            <extension base="md:RoleDescriptorType">
-                <sequence>
-                    <element ref="md:ArtifactResolutionService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:SingleLogoutService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:ManageNameIDService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="ArtifactResolutionService" type="md:IndexedEndpointType"/>
-    <element name="SingleLogoutService" type="md:EndpointType"/>
-    <element name="ManageNameIDService" type="md:EndpointType"/>
-    <element name="NameIDFormat" type="anyURI"/>
-
-    <element name="IDPSSODescriptor" type="md:IDPSSODescriptorType"/>
-    <complexType name="IDPSSODescriptorType">
-        <complexContent>
-            <extension base="md:SSODescriptorType">
-                <sequence>
-                    <element ref="md:SingleSignOnService" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDMappingService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:AttributeProfile" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="saml:Attribute" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="WantAuthnRequestsSigned" type="boolean" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="SingleSignOnService" type="md:EndpointType"/>
-    <element name="NameIDMappingService" type="md:EndpointType"/>
-    <element name="AssertionIDRequestService" type="md:EndpointType"/>
-    <element name="AttributeProfile" type="anyURI"/>
-    
-    <element name="SPSSODescriptor" type="md:SPSSODescriptorType"/>
-    <complexType name="SPSSODescriptorType">
-        <complexContent>
-            <extension base="md:SSODescriptorType">
-                <sequence>
-                    <element ref="md:AssertionConsumerService" maxOccurs="unbounded"/>
-                    <element ref="md:AttributeConsumingService" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="AuthnRequestsSigned" type="boolean" use="optional"/>
-                <attribute name="WantAssertionsSigned" type="boolean" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AssertionConsumerService" type="md:IndexedEndpointType"/>
-    <element name="AttributeConsumingService" type="md:AttributeConsumingServiceType"/>
-    <complexType name="AttributeConsumingServiceType">
-        <sequence>
-            <element ref="md:ServiceName" maxOccurs="unbounded"/>
-            <element ref="md:ServiceDescription" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="md:RequestedAttribute" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="index" type="unsignedShort" use="required"/>
-        <attribute name="isDefault" type="boolean" use="optional"/>
-    </complexType>
-    <element name="ServiceName" type="md:localizedNameType"/>
-    <element name="ServiceDescription" type="md:localizedNameType"/>
-    <element name="RequestedAttribute" type="md:RequestedAttributeType"/>
-    <complexType name="RequestedAttributeType">
-        <complexContent>
-            <extension base="saml:AttributeType">
-                <attribute name="isRequired" type="boolean" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-  
-    <element name="AuthnAuthorityDescriptor" type="md:AuthnAuthorityDescriptorType"/>
-    <complexType name="AuthnAuthorityDescriptorType">
-        <complexContent>
-            <extension base="md:RoleDescriptorType">
-                <sequence>
-                    <element ref="md:AuthnQueryService" maxOccurs="unbounded"/>
-                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AuthnQueryService" type="md:EndpointType"/>
-
-    <element name="PDPDescriptor" type="md:PDPDescriptorType"/>
-    <complexType name="PDPDescriptorType">
-        <complexContent>
-            <extension base="md:RoleDescriptorType">
-                <sequence>
-                    <element ref="md:AuthzService" maxOccurs="unbounded"/>
-                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AuthzService" type="md:EndpointType"/>
-
-    <element name="AttributeAuthorityDescriptor" type="md:AttributeAuthorityDescriptorType"/>
-    <complexType name="AttributeAuthorityDescriptorType">
-        <complexContent>
-            <extension base="md:RoleDescriptorType">
-                <sequence>
-                    <element ref="md:AttributeService" maxOccurs="unbounded"/>
-                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:AttributeProfile" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="saml:Attribute" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AttributeService" type="md:EndpointType"/>
-   
-    <element name="AffiliationDescriptor" type="md:AffiliationDescriptorType"/>
-    <complexType name="AffiliationDescriptorType">
-        <sequence>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <element ref="md:AffiliateMember" maxOccurs="unbounded"/>
-            <element ref="md:KeyDescriptor" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="affiliationOwnerID" type="md:entityIDType" use="required"/>
-        <attribute name="validUntil" type="dateTime" use="optional"/>
-        <attribute name="cacheDuration" type="duration" use="optional"/>
-        <attribute name="ID" type="ID" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <element name="AffiliateMember" type="md:entityIDType"/>
-</schema>
diff --git a/schemas/shibboleth-spconfig-2.0.xsd b/schemas/shibboleth-spconfig-2.0.xsd
new file mode 100644 (file)
index 0000000..61d13f6
--- /dev/null
@@ -0,0 +1,479 @@
+<?xml version="1.0" encoding="US-ASCII"?>\r
+<schema targetNamespace="urn:mace:shibboleth:sp:config:2.0"\r
+       xmlns="http://www.w3.org/2001/XMLSchema"\r
+       xmlns:conf="urn:mace:shibboleth:sp:config:2.0"\r
+       xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"\r
+       xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"\r
+       elementFormDefault="qualified"\r
+       attributeFormDefault="unqualified"\r
+       blockDefault="substitution"\r
+       version="2.0">\r
+\r
+       <import namespace="urn:oasis:names:tc:SAML:2.0:assertion" schemaLocation="../../cpp-opensaml2/schemas/saml-schema-assertion-2.0.xsd"/>\r
+       <import namespace="urn:oasis:names:tc:SAML:2.0:metadata" schemaLocation="../../cpp-opensaml2/schemas/saml-schema-metadata-2.0.xsd"/>\r
+\r
+       <annotation>\r
+               <documentation>\r
+       2.0 schema for XML-based configuration of Shibboleth SP instances.\r
+       First appearing in Shibboleth 2.0 release.\r
+       </documentation>\r
+    </annotation>\r
+\r
+       <complexType name="PluggableType">\r
+               <sequence>\r
+                       <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+               </sequence>\r
+               <attribute name="type" type="string" use="required"/>\r
+               <anyAttribute namespace="##any" processContents="lax"/>\r
+       </complexType>\r
+\r
+       <element name="ShibbolethTargetConfig" type="conf:SPConfigType"/> <!-- deprecated -->\r
+       <element name="ShibbolethSPConfig" type="conf:SPConfigType"/>\r
+       <element name="SPConfig" type="conf:SPConfigType"/>\r
+       <complexType name="SPConfigType">\r
+               <annotation>\r
+                       <documentation>Root of configuration</documentation>\r
+               </annotation>\r
+               <sequence>\r
+                       <element ref="conf:Extensions" minOccurs="0"/>\r
+                       <choice minOccurs="0">\r
+                               <element name="OutOfProcess" type="conf:OutOfProcessType"/>\r
+                               <element name="Global" type="conf:OutOfProcessType"/> <!-- deprecated -->\r
+                       </choice>\r
+                       <choice minOccurs="0">\r
+                               <element name="InProcess" type="conf:InProcessType"/>\r
+                               <element name="Local" type="conf:InProcessType"/> <!-- deprecated -->\r
+                       </choice>\r
+                       <element ref="conf:Applications"/>\r
+                       <choice minOccurs="0">\r
+                               <element name="CredentialsProvider" type="conf:PluggableType"/> <!-- deprecated -->\r
+                               <element ref="conf:Credentials"/>\r
+                       </choice>\r
+               </sequence>\r
+               <attribute name="logger" type="anyURI" use="optional"/>\r
+               <attribute name="clockSkew" type="unsignedInt" use="optional"/>\r
+               <anyAttribute namespace="##other" processContents="lax"/>\r
+       </complexType>\r
+\r
+       <element name="Extensions">\r
+               <annotation>\r
+                       <documentation>Container for extension libraries and custom configuration</documentation>\r
+               </annotation>\r
+               <complexType>\r
+                       <sequence>\r
+                               <element name="Library" minOccurs="0" maxOccurs="unbounded">\r
+                                       <complexType>\r
+                                               <sequence>\r
+                                                       <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                                               </sequence>\r
+                                               <attribute name="path" type="anyURI" use="required"/>\r
+                                               <attribute name="fatal" type="boolean" use="optional"/>\r
+                                               <anyAttribute namespace="##any" processContents="lax"/>\r
+                                       </complexType>\r
+                               </element>\r
+                               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                       </sequence>\r
+               </complexType>\r
+       </element>\r
+\r
+       <element name="SessionCache">\r
+               <complexType>\r
+                       <complexContent>\r
+                               <restriction base="conf:PluggableType">\r
+                                       <sequence>\r
+                                               <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                                       </sequence>\r
+                                       <attribute name="cleanupInterval" type="unsignedInt" use="optional" default="900"/>\r
+                                       <attribute name="cacheTimeout" type="unsignedInt" use="optional" default="28800"/>\r
+                               </restriction>\r
+                       </complexContent>\r
+               </complexType>\r
+       </element>\r
+       \r
+       <element name="ReplayCache" type="conf:PluggableType"/>\r
+       \r
+       <complexType name="OutOfProcessType">\r
+               <annotation>\r
+                       <documentation>Container for shibd out-of-process configuration</documentation>\r
+               </annotation>\r
+               <sequence>\r
+                       <element ref="conf:Extensions" minOccurs="0"/>\r
+                       <choice>\r
+                               <element name="UnixListener">\r
+                                       <complexType>\r
+                                               <attribute name="address" type="string" use="required"/>\r
+                                       </complexType>\r
+                               </element>\r
+                               <element name="TCPListener">\r
+                                       <complexType>\r
+                                               <attribute name="address" type="string" use="required"/>\r
+                                               <attribute name="port" type="unsignedInt" use="required"/>\r
+                                               <attribute name="acl" use="optional" default="127.0.0.1">\r
+                                                       <simpleType>\r
+                                                               <list itemType="string"/>\r
+                                                       </simpleType>\r
+                                               </attribute>\r
+                                       </complexType>\r
+                               </element>\r
+                               <element name="Listener" type="conf:PluggableType"/>\r
+                       </choice>\r
+                       <element ref="conf:SessionCache" minOccurs="0"/>\r
+                       <element ref="conf:ReplayCache" minOccurs="0"/>\r
+                       <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+               </sequence>\r
+               <attribute name="logger" type="anyURI" use="optional"/>\r
+               <anyAttribute namespace="##other" processContents="lax"/>\r
+       </complexType>\r
+\r
+       <complexType name="InProcessType">\r
+               <annotation>\r
+                       <documentation>\r
+                       Container for configuration of locally integrated or platform-specific\r
+                       features (e.g. web server filters)\r
+                       </documentation>\r
+               </annotation>\r
+               <sequence>\r
+                       <element ref="conf:Extensions" minOccurs="0"/>\r
+                       <element ref="conf:SessionCache" minOccurs="0"/>\r
+                       <element ref="conf:ReplayCache" minOccurs="0"/>\r
+                       <element name="RequestMapProvider" type="conf:PluggableType" minOccurs="0"/>\r
+                       <element name="Implementation" minOccurs="0">\r
+                               <complexType>\r
+                                       <sequence>\r
+                                               <element ref="conf:ISAPI" minOccurs="0"/>\r
+                                               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                                       </sequence>\r
+                               </complexType>\r
+                       </element>\r
+                       <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+               </sequence>\r
+               <attribute name="logger" type="anyURI" use="optional"/>\r
+               <attribute name="localRelayState" type="boolean" use="optional" default="false"/>\r
+               <anyAttribute namespace="##other" processContents="lax"/>\r
+       </complexType>\r
+       \r
+       <element name="ISAPI">\r
+               <complexType>\r
+                       <sequence>\r
+                               <element name="Site" maxOccurs="unbounded">\r
+                                       <complexType>\r
+                                               <sequence>\r
+                                                       <element name="Alias" type="string" minOccurs="0" maxOccurs="unbounded"/>\r
+                                               </sequence>\r
+                                               <attribute name="id" type="unsignedInt" use="required"/>\r
+                                               <attribute name="name" type="string" use="required"/>\r
+                                               <attribute name="port" type="unsignedInt" use="optional"/>\r
+                                               <attribute name="sslport" type="unsignedInt" use="optional"/>\r
+                                               <attribute name="scheme" type="string" use="optional"/>\r
+                                       </complexType>\r
+                               </element>\r
+                               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                       </sequence>\r
+                       <attribute name="normalizeRequest" type="boolean" use="optional"/>\r
+                       <anyAttribute namespace="##other" processContents="lax"/>\r
+               </complexType>\r
+       </element>\r
+\r
+       <element name="AccessControl" type="conf:UniOperatorType">\r
+               <annotation>\r
+                       <documentation>\r
+                       A simple example access policy language extension that supersedes Apache .htaccess\r
+                       </documentation>\r
+               </annotation>\r
+       </element>\r
+       <element name="OR" type="conf:MultiOperatorType"/>\r
+       <element name="AND" type="conf:MultiOperatorType"/>\r
+       <element name="NOT" type="conf:UniOperatorType"/>\r
+       <complexType name="UniOperatorType">\r
+               <choice>\r
+                       <element ref="conf:AND"/>\r
+                       <element ref="conf:OR"/>\r
+                       <element ref="conf:NOT"/>\r
+                       <element ref="conf:Rule"/>\r
+               </choice>\r
+       </complexType>\r
+       <complexType name="MultiOperatorType">\r
+               <choice minOccurs="2" maxOccurs="unbounded">\r
+                       <element ref="conf:AND"/>\r
+                       <element ref="conf:OR"/>\r
+                       <element ref="conf:NOT"/>\r
+                       <element ref="conf:Rule"/>\r
+               </choice>\r
+       </complexType>\r
+       <element name="Rule">\r
+               <complexType>\r
+                       <simpleContent>\r
+                               <extension base="conf:listOfStrings">\r
+                                       <attribute name="require" type="string" use="required"/>\r
+                               </extension>\r
+                       </simpleContent>\r
+               </complexType>\r
+       </element>\r
+       <simpleType name="listOfStrings">\r
+               <list itemType="string"/>\r
+       </simpleType>\r
+       \r
+       <attributeGroup name="ContentSettings">\r
+               <attribute name="authType" type="string" use="optional"/>\r
+               <attribute name="requireSession" type="boolean" use="optional"/>\r
+               <attribute name="requireSessionWith" type="string" use="optional"/>\r
+               <attribute name="exportAssertion" type="boolean" use="optional"/>\r
+               <attribute name="redirectToSSL" type="unsignedInt" use="optional"/>\r
+               <anyAttribute namespace="##other" processContents="lax"/>\r
+       </attributeGroup>\r
+       <element name="AccessControlProvider" type="conf:PluggableType"/>\r
+       <element name="htaccess" type="conf:PluggableType"/>\r
+\r
+    <element name="RequestMap">\r
+               <annotation>\r
+                       <documentation>\r
+                       Built-in request mapping syntax, decomposes URLs into Host/Path/Path/...\r
+                       </documentation>\r
+               </annotation>\r
+        <complexType>\r
+            <sequence>\r
+               <choice minOccurs="0">\r
+                       <element ref="conf:htaccess"/>\r
+                                       <element ref="conf:AccessControl"/>\r
+                       <element ref="conf:AccessControlProvider"/>\r
+                   </choice>\r
+                <element ref="conf:Host" minOccurs="0" maxOccurs="unbounded"/>\r
+            </sequence>\r
+            <attribute name="applicationId" type="string" fixed="default"/>\r
+               <attributeGroup ref="conf:ContentSettings"/>\r
+        </complexType>\r
+    </element>\r
+\r
+    <element name="Host">\r
+       <complexType>\r
+               <sequence>\r
+               <choice minOccurs="0">\r
+                       <element ref="conf:htaccess"/>\r
+                                       <element ref="conf:AccessControl"/>\r
+                       <element ref="conf:AccessControlProvider"/>\r
+                   </choice>\r
+                       <element ref="conf:Path" minOccurs="0" maxOccurs="unbounded"/>\r
+               </sequence>\r
+               <attribute name="scheme" use="optional">\r
+                           <simpleType>\r
+                               <restriction base="string">\r
+                                   <enumeration value="http"/>\r
+                                   <enumeration value="https"/>\r
+                                   <enumeration value="ftp"/>\r
+                                   <enumeration value="ldap"/>\r
+                                   <enumeration value="ldaps"/>\r
+                               </restriction>\r
+                           </simpleType>\r
+               </attribute>\r
+               <attribute name="name" type="string" use="required"/>\r
+               <attribute name="port" type="unsignedInt" use="optional"/>\r
+               <attribute name="applicationId" type="string" use="optional"/>\r
+               <attributeGroup ref="conf:ContentSettings"/>\r
+       </complexType>\r
+    </element>\r
+\r
+    <element name="Path">\r
+        <complexType>\r
+               <sequence>\r
+               <choice minOccurs="0">\r
+                       <element ref="conf:htaccess"/>\r
+                                       <element ref="conf:AccessControl"/>\r
+                       <element ref="conf:AccessControlProvider"/>\r
+                   </choice>\r
+                       <element ref="conf:Path" minOccurs="0" maxOccurs="unbounded"/>\r
+               </sequence>\r
+               <attribute name="name" type="string" use="required"/>\r
+               <attribute name="applicationId" type="string" use="optional"/>\r
+               <attributeGroup ref="conf:ContentSettings"/>\r
+        </complexType>\r
+    </element>\r
+\r
+       <element name="Applications">\r
+               <annotation>\r
+                       <documentation>Container for global settings and application-specific overrides</documentation>\r
+               </annotation>\r
+               <complexType>\r
+                       <sequence>\r
+                               <element ref="conf:Sessions"/>\r
+                               <element ref="conf:Errors"/>\r
+                               <element ref="conf:CredentialUse" minOccurs="0"/>\r
+                               <choice minOccurs="0" maxOccurs="unbounded">\r
+                    <element ref="saml:Attribute"/>\r
+                    <element ref="saml:Audience"/>\r
+                    <element name="MetadataProvider" type="conf:PluggableType"/>\r
+                    <element name="TrustProvider" type="conf:PluggableType"/>\r
+                               </choice>\r
+                               <element ref="conf:Application" minOccurs="0" maxOccurs="unbounded"/>\r
+                       </sequence>\r
+                       <attribute name="id" type="string" fixed="default"/>\r
+                       <attribute name="providerId" type="anyURI" use="required"/>\r
+                       <attribute name="homeURL" type="anyURI" use="optional"/>\r
+               <anyAttribute namespace="##other" processContents="lax"/>\r
+               </complexType>\r
+       </element>\r
+       \r
+       <element name="Application">\r
+               <annotation>\r
+                       <documentation>Container for application-specific overrides</documentation>\r
+               </annotation>\r
+               <complexType>\r
+                       <sequence>\r
+                               <element ref="conf:Sessions" minOccurs="0"/>\r
+                               <element ref="conf:Errors" minOccurs="0"/>\r
+                               <element ref="conf:CredentialUse" minOccurs="0"/>\r
+                               <choice minOccurs="0" maxOccurs="unbounded">\r
+                    <element ref="saml:Attribute"/>\r
+                    <element ref="saml:Audience"/>\r
+                    <element name="MetadataProvider" type="conf:PluggableType"/>\r
+                    <element name="TrustProvider" type="conf:PluggableType"/>\r
+                               </choice>\r
+                       </sequence>\r
+                       <attribute name="id" type="string" use="required"/>\r
+                       <attribute name="providerId" type="anyURI" use="optional"/>\r
+                       <attribute name="homeURL" type="anyURI" use="optional"/>\r
+               <anyAttribute namespace="##other" processContents="lax"/>\r
+               </complexType>\r
+       </element>\r
+\r
+       <element name="Sessions">\r
+               <annotation>\r
+                       <documentation>Container for specifying protocol handlers and session policy</documentation>\r
+               </annotation>\r
+               <complexType>\r
+                       <choice maxOccurs="unbounded">\r
+                               <element ref="conf:SessionInitiator"/>\r
+                               <element ref="md:AssertionConsumerService"/>\r
+                               <element ref="md:SingleLogoutService"/>\r
+                               <element ref="md:ManageNameIDService"/>\r
+                               <element name="Handler">
+                                       <complexType>\r
+                                               <complexContent>\r
+                                                       <restriction base="conf:PluggableType">\r
+                                                               <sequence>\r
+                                                                       <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                                                               </sequence>\r
+                                                               <attribute name="Location" type="anyURI" use="required"/>\r
+                                                       </restriction>\r
+                                               </complexContent>\r
+                                       </complexType>\r
+                               </element>\r
+                       </choice>\r
+                       <attribute name="handlerURL" type="anyURI" use="optional"/>\r
+                       <attribute name="handlerSSL" type="boolean" use="optional" default="true"/>\r
+                       <attribute name="cookieName" type="string" use="optional"/>\r
+                       <attribute name="cookieProps" type="string" use="optional"/>\r
+                       <attribute name="idpHistory" type="boolean" use="optional" default="true"/>\r
+                       <attribute name="idpHistoryDays" type="unsignedInt" use="optional"/>\r
+                       <attribute name="lifetime" type="unsignedInt" use="optional"/>\r
+                       <attribute name="timeout" type="unsignedInt" use="optional"/>\r
+                       <attribute name="checkAddress" type="boolean" use="optional"/>\r
+                       <attribute name="consistentAddress" type="boolean" use="optional" default="true"/>\r
+                       <anyAttribute namespace="##other" processContents="lax"/>\r
+               </complexType>\r
+       </element>\r
+       <element name="SessionInitiator">\r
+               <annotation>\r
+                       <documentation>Used to specify handlers that can issue AuthnRequests</documentation>\r
+               </annotation>\r
+               <complexType>\r
+                       <sequence>\r
+                               <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                       </sequence>\r
+                       <attribute name="Location" type="anyURI" use="required"/>\r
+                       <attribute name="Binding" type="anyURI" use="required"/>\r
+                       <attribute name="wayfURL" type="anyURI" use="optional"/>\r
+                       <attribute name="wayfBinding" type="anyURI" use="optional"/>\r
+                       <attribute name="checkCDC" type="anyURI" use="optional"/>\r
+                       <attribute name="isDefault" type="boolean" use="optional"/>\r
+                       <attribute name="id" type="string" use="optional"/>\r
+                       <anyAttribute namespace="##any" processContents="lax"/>\r
+               </complexType>\r
+       </element>\r
+\r
+       <element name="Errors">\r
+               <annotation>\r
+                       <documentation>Container for error templates and associated details</documentation>\r
+               </annotation>\r
+               <complexType>\r
+                       <sequence>\r
+                               <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                       </sequence>\r
+                       <attribute name="session" type="anyURI" use="required"/>\r
+                       <attribute name="metadata" type="anyURI" use="optional"/>\r
+                       <attribute name="rm" type="anyURI" use="optional"/>\r
+                       <attribute name="access" type="anyURI" use="optional"/>\r
+                       <attribute name="ssl" type="anyURI" use="optional"/>\r
+                       <attribute name="supportContact" type="string" use="optional"/>\r
+                       <attribute name="logoLocation" type="anyURI" use="optional"/>\r
+                       <attribute name="styleSheet" type="anyURI" use="optional"/>\r
+                       <anyAttribute namespace="##any" processContents="lax"/>\r
+               </complexType>\r
+       </element>\r
+\r
+       <attributeGroup name="CredentialUseGroup">\r
+               <attribute name="TLS" type="string" use="optional"/>\r
+               <attribute name="Signing" type="string" use="optional"/>\r
+               <attribute name="signRequest" type="boolean" use="optional" default="false"/>\r
+               <attribute name="signatureAlg" type="anyURI" use="optional"/>\r
+               <attribute name="signedAssertions" type="boolean" use="optional" default="false"/>\r
+               <attribute name="authType" use="optional">\r
+                       <simpleType>\r
+                               <restriction base="string">\r
+                                       <enumeration value="basic"/>\r
+                                       <enumeration value="digest"/>\r
+                                       <enumeration value="ntlm"/>\r
+                                       <enumeration value="gss"/>\r
+                               </restriction>\r
+                       </simpleType>\r
+               </attribute>\r
+               <attribute name="authUsername" use="optional"/>\r
+               <attribute name="authPassword" use="optional"/>\r
+       </attributeGroup>\r
+\r
+       <element name="CredentialUse">\r
+               <annotation>\r
+                       <documentation>Container for specifying security methods to use with particular peers</documentation>\r
+               </annotation>\r
+               <complexType>\r
+                       <sequence>\r
+                               <element name="RelyingParty" minOccurs="0" maxOccurs="unbounded">\r
+                                       <complexType>\r
+                                               <sequence>\r
+                                                       <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                                               </sequence>\r
+                                               <attribute name="Name" type="string" use="required"/>\r
+                                               <attributeGroup ref="conf:CredentialUseGroup"/>\r
+                                               <anyAttribute namespace="##other" processContents="lax"/>\r
+                                       </complexType>\r
+                               </element>\r
+                               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>\r
+                       </sequence>\r
+                       <attributeGroup ref="conf:CredentialUseGroup"/>\r
+               <anyAttribute namespace="##other" processContents="lax"/>\r
+               </complexType>\r
+       </element>\r
+       \r
+       <element name="Credentials">
+               <annotation>\r
+                       <documentation>Container for specifying sources of credentials</documentation>\r
+               </annotation>\r
+               <complexType>\r
+                       <sequence>\r
+                               <element name="CredentialResolver" minOccurs="1" maxOccurs="unbounded">
+                                       <complexType>
+                                               <complexContent>
+                                                       <restriction base="conf:PluggableType">
+                                                               <sequence>
+                                                                       <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+                                                               </sequence>
+                                                               <attribute name="Id" type="string" use="required"/>
+                                                       </restriction>
+                                               </complexContent>
+                                       </complexType>
+                               </element>\r
+                       </sequence>
+               </complexType>
+       </element>\r
+       \r
+</schema>\r
+\r
index f05f7da..98e80bc 100644 (file)
@@ -85,7 +85,6 @@
                <attribute name="retryInterval" type="unsignedInt" use="optional" default="300"/>
                <attribute name="strictValidity" type="boolean" use="optional" default="true"/>
                <attribute name="propagateErrors" type="boolean" use="optional" default="false"/>
-               <attribute name="writeThrough" type="boolean" use="optional" default="false"/>
        </attributeGroup>
        
        <element name="MemorySessionCache">
                        <anyAttribute namespace="##other" processContents="lax"/>
                </complexType>
        </element>
-       <element name="ODBCSessionCache">
-               <complexType>
-                       <sequence>
-                               <element name="ConnectionString" type="string" minOccurs="0"/>
-                       </sequence>
-                       <attributeGroup ref="conf:SessionCacheProperties"/>
-                       <attribute name="odbcTimeout" type="unsignedInt" use="optional" default="14400"/>
-                       <attribute name="storeAttributes" type="boolean" use="optional" default="false"/>
-                       <anyAttribute namespace="##other" processContents="lax"/>
-               </complexType>
-       </element>
        <element name="MySQLSessionCache">
                <complexType>
                        <sequence>
                        </choice>
                        <choice>
                                <element ref="conf:MemorySessionCache"/>
-                               <element ref="conf:ODBCSessionCache"/>
                                <element ref="conf:MySQLSessionCache"/>
                                <element ref="conf:SessionCache"/>
                        </choice>
                        <choice minOccurs="0">
-                               <element name="ODBCReplayCache">
-                                       <complexType>
-                                               <sequence>
-                                                       <element name="ConnectionString" type="string" minOccurs="0"/>
-                                               </sequence>
-                                               <anyAttribute namespace="##other" processContents="lax"/>
-                                       </complexType>
-                               </element>
                                <element name="MySQLReplayCache">
                                        <complexType>
                                                <sequence>
                </sequence>
                <attribute name="logger" type="anyURI" use="optional"/>
                <attribute name="localRelayState" type="boolean" use="optional" default="false"/>
+               <attribute name="unsetHeaderValue" type="string" use="optional"/>
                <anyAttribute namespace="##other" processContents="lax"/>
        </complexType>
        
diff --git a/schemas/soap-envelope.xsd b/schemas/soap-envelope.xsd
deleted file mode 100644 (file)
index 7cf869d..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!-- Schema for the SOAP/1.1 envelope
-
-     This schema has been produced using W3C's SOAP Version 1.2 schema
-     found at:
-
-     http://www.w3.org/2001/06/soap-envelope
-
-     Copyright 2001 Martin Gudgin, Developmentor.
-
-     Changes made are the following:
-     - reverted namespace to http://schemas.xmlsoap.org/soap/envelope/
-     - reverted mustUnderstand to only allow 0 and 1 as lexical values
-        - made encodingStyle a global attribute 20020825
-
-        Further changes:
-
-        - removed default value from mustUnderstand attribute declaration - 20030314
-
-     Original copyright:
-     
-     Copyright 2001 W3C (Massachusetts Institute of Technology,
-     Institut National de Recherche en Informatique et en Automatique,
-     Keio University). All Rights Reserved.
-     http://www.w3.org/Consortium/Legal/
-
-     This document is governed by the W3C Software License [1] as
-     described in the FAQ [2].
-
-     [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
-     [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:tns="http://schemas.xmlsoap.org/soap/envelope/"
-           targetNamespace="http://schemas.xmlsoap.org/soap/envelope/" >
-
-     
-  <!-- Envelope, header and body -->
-  <xs:element name="Envelope" type="tns:Envelope" />
-  <xs:complexType name="Envelope" >
-    <xs:sequence>
-      <xs:element ref="tns:Header" minOccurs="0" />
-      <xs:element ref="tns:Body" minOccurs="1" />
-      <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##any" processContents="lax" />
-  </xs:complexType>
-
-  <xs:element name="Header" type="tns:Header" />
-  <xs:complexType name="Header" >
-    <xs:sequence>
-      <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##any" processContents="lax" />
-  </xs:complexType>
-  
-  <xs:element name="Body" type="tns:Body" />
-  <xs:complexType name="Body" >
-    <xs:sequence>
-      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##any" processContents="lax" >
-         <xs:annotation>
-           <xs:documentation>
-                 Prose in the spec does not specify that attributes are allowed on the Body element
-               </xs:documentation>
-         </xs:annotation>
-       </xs:anyAttribute>
-  </xs:complexType>
-
-       
-  <!-- Global Attributes.  The following attributes are intended to be usable via qualified attribute names on any complex type referencing them.  -->
-  <xs:attribute name="mustUnderstand" >        
-     <xs:simpleType>
-     <xs:restriction base='xs:boolean'>
-          <xs:pattern value='0|1' />
-        </xs:restriction>
-   </xs:simpleType>
-  </xs:attribute>
-  <xs:attribute name="actor" type="xs:anyURI" />
-
-  <xs:simpleType name="encodingStyle" >
-    <xs:annotation>
-         <xs:documentation>
-           'encodingStyle' indicates any canonicalization conventions followed in the contents of the containing element.  For example, the value 'http://schemas.xmlsoap.org/soap/encoding/' indicates the pattern described in SOAP specification
-         </xs:documentation>
-       </xs:annotation>
-    <xs:list itemType="xs:anyURI" />
-  </xs:simpleType>
-
-  <xs:attribute name="encodingStyle" type="tns:encodingStyle" />
-  <xs:attributeGroup name="encodingStyle" >
-    <xs:attribute ref="tns:encodingStyle" />
-  </xs:attributeGroup>
-
-  <xs:element name="Fault" type="tns:Fault" />
-  <xs:complexType name="Fault" final="extension" >
-    <xs:annotation>
-         <xs:documentation>
-           Fault reporting structure
-         </xs:documentation>
-       </xs:annotation>
-    <xs:sequence>
-      <xs:element name="faultcode" type="xs:QName" />
-      <xs:element name="faultstring" type="xs:string" />
-      <xs:element name="faultactor" type="xs:anyURI" minOccurs="0" />
-      <xs:element name="detail" type="tns:detail" minOccurs="0" />      
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="detail">
-    <xs:sequence>
-      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##any" processContents="lax" /> 
-  </xs:complexType>
-
-</xs:schema>
-
diff --git a/schemas/xenc-schema.xsd b/schemas/xenc-schema.xsd
deleted file mode 100644 (file)
index c902d4f..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<schema xmlns='http://www.w3.org/2001/XMLSchema' version='1.0'
-        xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'
-        xmlns:ds='http://www.w3.org/2000/09/xmldsig#'
-        targetNamespace='http://www.w3.org/2001/04/xmlenc#'
-        elementFormDefault='qualified'>
-
-  <import namespace='http://www.w3.org/2000/09/xmldsig#'
-          schemaLocation='xmldsig-core-schema.xsd'/>
-
-  <complexType name='EncryptedType' abstract='true'>
-    <sequence>
-      <element name='EncryptionMethod' type='xenc:EncryptionMethodType'
-       minOccurs='0'/>
-      <element ref='ds:KeyInfo' minOccurs='0'/>
-      <element ref='xenc:CipherData'/>
-      <element ref='xenc:EncryptionProperties' minOccurs='0'/>
-    </sequence>
-    <attribute name='Id' type='ID' use='optional'/>
-    <attribute name='Type' type='anyURI' use='optional'/>
-    <attribute name='MimeType' type='string' use='optional'/>
-    <attribute name='Encoding' type='anyURI' use='optional'/>
-  </complexType>
-  
-  <complexType name='EncryptionMethodType' mixed='true'>
-    <sequence>
-      <element name='KeySize' minOccurs='0' type='xenc:KeySizeType'/>
-      <element name='OAEPparams' minOccurs='0' type='base64Binary'/>
-      <any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
-    </sequence>
-    <attribute name='Algorithm' type='anyURI' use='required'/>
-  </complexType>
-
-    <simpleType name='KeySizeType'>
-      <restriction base="integer"/>
-    </simpleType>
-
-  <element name='CipherData' type='xenc:CipherDataType'/>
-  <complexType name='CipherDataType'>
-     <choice>
-       <element name='CipherValue' type='base64Binary'/>
-       <element ref='xenc:CipherReference'/>
-     </choice>
-    </complexType>
-
-   <element name='CipherReference' type='xenc:CipherReferenceType'/>
-   <complexType name='CipherReferenceType'>
-       <choice>
-         <element name='Transforms' type='xenc:TransformsType' minOccurs='0'/>
-       </choice>
-       <attribute name='URI' type='anyURI' use='required'/>
-   </complexType>
-
-     <complexType name='TransformsType'>
-       <sequence>
-         <element ref='ds:Transform' maxOccurs='unbounded'/>
-       </sequence>
-     </complexType>
-
-
-  <element name='EncryptedData' type='xenc:EncryptedDataType'/>
-  <complexType name='EncryptedDataType'>
-    <complexContent>
-      <extension base='xenc:EncryptedType'>
-       </extension>
-    </complexContent>
-  </complexType>
-
-  <!-- Children of ds:KeyInfo -->
-
-  <element name='EncryptedKey' type='xenc:EncryptedKeyType'/>
-  <complexType name='EncryptedKeyType'>
-    <complexContent>
-      <extension base='xenc:EncryptedType'>
-        <sequence>
-          <element ref='xenc:ReferenceList' minOccurs='0'/>
-          <element name='CarriedKeyName' type='string' minOccurs='0'/>
-        </sequence>
-        <attribute name='Recipient' type='string'
-         use='optional'/>
-      </extension>
-    </complexContent>
-  </complexType>
-
-    <element name="AgreementMethod" type="xenc:AgreementMethodType"/>
-    <complexType name="AgreementMethodType" mixed="true">
-      <sequence>
-        <element name="KA-Nonce" minOccurs="0" type="base64Binary"/>
-        <!-- <element ref="ds:DigestMethod" minOccurs="0"/> -->
-        <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-        <element name="OriginatorKeyInfo" minOccurs="0" type="ds:KeyInfoType"/>
-        <element name="RecipientKeyInfo" minOccurs="0" type="ds:KeyInfoType"/>
-      </sequence>
-      <attribute name="Algorithm" type="anyURI" use="required"/>
-    </complexType>
-
-  <!-- End Children of ds:KeyInfo -->
-
-  <element name='ReferenceList'>
-    <complexType>
-      <choice minOccurs='1' maxOccurs='unbounded'>
-        <element name='DataReference' type='xenc:ReferenceType'/>
-        <element name='KeyReference' type='xenc:ReferenceType'/>
-      </choice>
-    </complexType>
-  </element>
-
-  <complexType name='ReferenceType'>
-    <sequence>
-      <any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
-    </sequence>
-    <attribute name='URI' type='anyURI' use='required'/>
-  </complexType>
-
-
-  <element name='EncryptionProperties' type='xenc:EncryptionPropertiesType'/>
-  <complexType name='EncryptionPropertiesType'>
-    <sequence>
-      <element ref='xenc:EncryptionProperty' maxOccurs='unbounded'/>
-    </sequence>
-    <attribute name='Id' type='ID' use='optional'/>
-  </complexType>
-
-    <element name='EncryptionProperty' type='xenc:EncryptionPropertyType'/>
-    <complexType name='EncryptionPropertyType' mixed='true'>
-      <choice maxOccurs='unbounded'>
-        <any namespace='##other' processContents='lax'/>
-      </choice>
-      <attribute name='Target' type='anyURI' use='optional'/>
-      <attribute name='Id' type='ID' use='optional'/>
-      <anyAttribute namespace="http://www.w3.org/XML/1998/namespace"/>
-    </complexType>
-
-</schema>
-
diff --git a/schemas/xml.xsd b/schemas/xml.xsd
deleted file mode 100644 (file)
index 38bba34..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version='1.0'?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="en">
-
- <xs:annotation>
-  <xs:documentation>
-   See http://www.w3.org/XML/1998/namespace.html and
-   http://www.w3.org/TR/REC-xml for information about this namespace.
-  </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>This schema defines attributes and an attribute group
-        suitable for use by
-        schemas wishing to allow xml:base, xml:lang or xml:space attributes
-        on elements they define.
-
-        To enable this, such a schema must import this schema
-        for the XML namespace, e.g. as follows:
-        &lt;schema . . .>
-         . . .
-         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
-
-        Subsequently, qualified reference to any of the attributes
-        or the group defined below will have the desired effect, e.g.
-
-        &lt;type . . .>
-         . . .
-         &lt;attributeGroup ref="xml:specialAttrs"/>
-         will define a type which will schema-validate an instance
-         element with any of those attributes</xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>In keeping with the XML Schema WG's standard versioning
-   policy, this schema document will persist at
-   http://www.w3.org/2001/03/xml.xsd.
-   At the date of issue it can also be found at
-   http://www.w3.org/2001/xml.xsd.
-   The schema document at that URI may however change in the future,
-   in order to remain compatible with the latest version of XML Schema
-   itself.  In other words, if the XML Schema namespace changes, the version
-   of this document at
-   http://www.w3.org/2001/xml.xsd will change
-   accordingly; the version at
-   http://www.w3.org/2001/03/xml.xsd will not change.
-  </xs:documentation>
- </xs:annotation>
-
- <xs:attribute name="lang" type="xs:language">
-  <xs:annotation>
-   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
-         codes as the enumerated possible values . . .</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="space" default="preserve">
-  <xs:simpleType>
-   <xs:restriction base="xs:NCName">
-    <xs:enumeration value="default"/>
-    <xs:enumeration value="preserve"/>
-   </xs:restriction>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="base" type="xs:anyURI">
-  <xs:annotation>
-   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
-                     information about this attribute.</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
-  <xs:attribute ref="xml:base"/>
-  <xs:attribute ref="xml:lang"/>
-  <xs:attribute ref="xml:space"/>
- </xs:attributeGroup>
-
-</xs:schema>
diff --git a/schemas/xmldsig-core-schema.xsd b/schemas/xmldsig-core-schema.xsd
deleted file mode 100644 (file)
index f9bcf5a..0000000
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Schema for XML Signatures
-    http://www.w3.org/2000/09/xmldsig#
-    $Revision$ on $Date$ by $Author$
-
-    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
-    of Technology, Institut National de Recherche en Informatique et en
-    Automatique, Keio University). All Rights Reserved.
-    http://www.w3.org/Consortium/Legal/
-
-    This document is governed by the W3C Software License [1] as described
-    in the FAQ [2].
-
-    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
-    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
--->
-
-
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
-        version="0.1" elementFormDefault="qualified"> 
-
-<!-- Basic Types Defined for Signatures -->
-
-<simpleType name="CryptoBinary">
-  <restriction base="base64Binary">
-  </restriction>
-</simpleType>
-
-<!-- Start Signature -->
-
-<element name="Signature" type="ds:SignatureType"/>
-<complexType name="SignatureType">
-  <sequence> 
-    <element ref="ds:SignedInfo"/> 
-    <element ref="ds:SignatureValue"/> 
-    <element ref="ds:KeyInfo" minOccurs="0"/> 
-    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/> 
-  </sequence>  
-  <attribute name="Id" type="ID" use="optional"/>
-</complexType>
-
-  <element name="SignatureValue" type="ds:SignatureValueType"/> 
-  <complexType name="SignatureValueType">
-    <simpleContent>
-      <extension base="base64Binary">
-        <attribute name="Id" type="ID" use="optional"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-<!-- Start SignedInfo -->
-
-<element name="SignedInfo" type="ds:SignedInfoType"/>
-<complexType name="SignedInfoType">
-  <sequence> 
-    <element ref="ds:CanonicalizationMethod"/> 
-    <element ref="ds:SignatureMethod"/> 
-    <element ref="ds:Reference" maxOccurs="unbounded"/> 
-  </sequence>  
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/> 
-  <complexType name="CanonicalizationMethodType" mixed="true">
-    <sequence>
-      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
-      <!-- (0,unbounded) elements from (1,1) namespace -->
-    </sequence>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
-  <complexType name="SignatureMethodType" mixed="true">
-    <sequence>
-      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
-      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-      <!-- (0,unbounded) elements from (1,1) external namespace -->
-    </sequence>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-<!-- Start Reference -->
-
-<element name="Reference" type="ds:ReferenceType"/>
-<complexType name="ReferenceType">
-  <sequence> 
-    <element ref="ds:Transforms" minOccurs="0"/> 
-    <element ref="ds:DigestMethod"/> 
-    <element ref="ds:DigestValue"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-  <attribute name="URI" type="anyURI" use="optional"/> 
-  <attribute name="Type" type="anyURI" use="optional"/> 
-</complexType>
-
-  <element name="Transforms" type="ds:TransformsType"/>
-  <complexType name="TransformsType">
-    <sequence>
-      <element ref="ds:Transform" maxOccurs="unbounded"/>  
-    </sequence>
-  </complexType>
-
-  <element name="Transform" type="ds:TransformType"/>
-  <complexType name="TransformType" mixed="true">
-    <choice minOccurs="0" maxOccurs="unbounded"> 
-      <any namespace="##other" processContents="lax"/>
-      <!-- (1,1) elements from (0,unbounded) namespaces -->
-      <element name="XPath" type="string"/> 
-    </choice>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-<!-- End Reference -->
-
-<element name="DigestMethod" type="ds:DigestMethodType"/>
-<complexType name="DigestMethodType" mixed="true"> 
-  <sequence>
-    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-  </sequence>    
-  <attribute name="Algorithm" type="anyURI" use="required"/> 
-</complexType>
-
-<element name="DigestValue" type="ds:DigestValueType"/>
-<simpleType name="DigestValueType">
-  <restriction base="base64Binary"/>
-</simpleType>
-
-<!-- End SignedInfo -->
-
-<!-- Start KeyInfo -->
-
-<element name="KeyInfo" type="ds:KeyInfoType"/> 
-<complexType name="KeyInfoType" mixed="true">
-  <choice maxOccurs="unbounded">     
-    <element ref="ds:KeyName"/> 
-    <element ref="ds:KeyValue"/> 
-    <element ref="ds:RetrievalMethod"/> 
-    <element ref="ds:X509Data"/> 
-    <element ref="ds:PGPData"/> 
-    <element ref="ds:SPKIData"/>
-    <element ref="ds:MgmtData"/>
-    <any processContents="lax" namespace="##other"/>
-    <!-- (1,1) elements from (0,unbounded) namespaces -->
-  </choice>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-  <element name="KeyName" type="string"/>
-  <element name="MgmtData" type="string"/>
-
-  <element name="KeyValue" type="ds:KeyValueType"/> 
-  <complexType name="KeyValueType" mixed="true">
-   <choice>
-     <element ref="ds:DSAKeyValue"/>
-     <element ref="ds:RSAKeyValue"/>
-     <any namespace="##other" processContents="lax"/>
-   </choice>
-  </complexType>
-
-  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/> 
-  <complexType name="RetrievalMethodType">
-    <sequence>
-      <element ref="ds:Transforms" minOccurs="0"/> 
-    </sequence>  
-    <attribute name="URI" type="anyURI"/>
-    <attribute name="Type" type="anyURI" use="optional"/>
-  </complexType>
-
-<!-- Start X509Data -->
-
-<element name="X509Data" type="ds:X509DataType"/> 
-<complexType name="X509DataType">
-  <sequence maxOccurs="unbounded">
-    <choice>
-      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
-      <element name="X509SKI" type="base64Binary"/>
-      <element name="X509SubjectName" type="string"/>
-      <element name="X509Certificate" type="base64Binary"/>
-      <element name="X509CRL" type="base64Binary"/>
-      <any namespace="##other" processContents="lax"/>
-    </choice>
-  </sequence>
-</complexType>
-
-<complexType name="X509IssuerSerialType"> 
-  <sequence> 
-    <element name="X509IssuerName" type="string"/> 
-    <element name="X509SerialNumber" type="integer"/> 
-  </sequence>
-</complexType>
-
-<!-- End X509Data -->
-
-<!-- Begin PGPData -->
-
-<element name="PGPData" type="ds:PGPDataType"/> 
-<complexType name="PGPDataType"> 
-  <choice>
-    <sequence>
-      <element name="PGPKeyID" type="base64Binary"/> 
-      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/> 
-      <any namespace="##other" processContents="lax" minOccurs="0"
-       maxOccurs="unbounded"/>
-    </sequence>
-    <sequence>
-      <element name="PGPKeyPacket" type="base64Binary"/> 
-      <any namespace="##other" processContents="lax" minOccurs="0"
-       maxOccurs="unbounded"/>
-    </sequence>
-  </choice>
-</complexType>
-
-<!-- End PGPData -->
-
-<!-- Begin SPKIData -->
-
-<element name="SPKIData" type="ds:SPKIDataType"/> 
-<complexType name="SPKIDataType">
-  <sequence maxOccurs="unbounded">
-    <element name="SPKISexp" type="base64Binary"/>
-    <any namespace="##other" processContents="lax" minOccurs="0"/>
-  </sequence>
-</complexType> 
-
-<!-- End SPKIData -->
-
-<!-- End KeyInfo -->
-
-<!-- Start Object (Manifest, SignatureProperty) -->
-
-<element name="Object" type="ds:ObjectType"/> 
-<complexType name="ObjectType" mixed="true">
-  <sequence minOccurs="0" maxOccurs="unbounded">
-    <any namespace="##any" processContents="lax"/>
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
-  <attribute name="Encoding" type="anyURI" use="optional"/> 
-</complexType>
-
-<element name="Manifest" type="ds:ManifestType"/> 
-<complexType name="ManifestType">
-  <sequence>
-    <element ref="ds:Reference" maxOccurs="unbounded"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-<element name="SignatureProperties" type="ds:SignaturePropertiesType"/> 
-<complexType name="SignaturePropertiesType">
-  <sequence>
-    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-   <element name="SignatureProperty" type="ds:SignaturePropertyType"/> 
-   <complexType name="SignaturePropertyType" mixed="true">
-     <choice maxOccurs="unbounded">
-       <any namespace="##other" processContents="lax"/>
-       <!-- (1,1) elements from (1,unbounded) namespaces -->
-     </choice>
-     <attribute name="Target" type="anyURI" use="required"/> 
-     <attribute name="Id" type="ID" use="optional"/> 
-   </complexType>
-
-<!-- End Object (Manifest, SignatureProperty) -->
-
-<!-- Start Algorithm Parameters -->
-
-<simpleType name="HMACOutputLengthType">
-  <restriction base="integer"/>
-</simpleType>
-
-<!-- Start KeyValue Element-types -->
-
-<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
-<complexType name="DSAKeyValueType">
-  <sequence>
-    <sequence minOccurs="0">
-      <element name="P" type="ds:CryptoBinary"/>
-      <element name="Q" type="ds:CryptoBinary"/>
-    </sequence>
-    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
-    <element name="Y" type="ds:CryptoBinary"/>
-    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
-    <sequence minOccurs="0">
-      <element name="Seed" type="ds:CryptoBinary"/>
-      <element name="PgenCounter" type="ds:CryptoBinary"/>
-    </sequence>
-  </sequence>
-</complexType>
-
-<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
-<complexType name="RSAKeyValueType">
-  <sequence>
-    <element name="Modulus" type="ds:CryptoBinary"/> 
-    <element name="Exponent" type="ds:CryptoBinary"/> 
-  </sequence>
-</complexType> 
-
-<!-- End KeyValue Element-types -->
-
-<!-- End Signature -->
-
-</schema>
diff --git a/shar/shar.dsp b/shar/shar.dsp
deleted file mode 100644 (file)
index 6a4335f..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-# Microsoft Developer Studio Project File - Name="shar" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=shar - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "shar.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "shar.mak" CFG="shar - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "shar - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "shar - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "shar - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "..\..\..\opensaml\c" /I "..\oncrpc" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 wsock32.lib advapi32.lib log4cpp.lib saml_5.lib /nologo /subsystem:console /machine:I386 /out:"Release/shibd.exe" /libpath:"..\..\..\opensaml\c\saml\Release"
-
-!ELSEIF  "$(CFG)" == "shar - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "..\..\..\opensaml\c" /I "..\oncrpc" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wsock32.lib advapi32.lib log4cppD.lib saml_5D.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/shibd.exe" /pdbtype:sept /libpath:"..\..\..\opensaml\c\saml\Debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "shar - Win32 Release"
-# Name "shar - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=".\shar-utils.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE=".\shar-utils.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\shar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\shar.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\shar_win32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=".\shibrpc-server.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\shib-target\shibrpc-svc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\shib-target\shibrpc-xdr.c"
-# End Source File
-# End Target
-# End Project
diff --git a/shar/test-client.cpp b/shar/test-client.cpp
deleted file mode 100644 (file)
index 945b848..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Copyright 2001-2007 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifdef WIN32
-# define _CRT_NONSTDC_NO_DEPRECATE 1
-# define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-
-#include <shib-target/shib-target.h>
-#include <shibsp/SPConfig.h>
-#include <iostream>
-
-using namespace shibsp;
-using namespace shibtarget;
-using namespace saml;
-using namespace xmltooling;
-using namespace std;
-
-int main (int argc, char *argv[])
-{
-    if (argc<=1) {
-        cerr << "usage: testclient <integer>" << endl;
-        return -1;
-    }
-  const char* config=getenv("SHIBCONFIG");
-  if (!config)
-    config=SHIB_CONFIG;
-  const char* schemadir=getenv("SHIBSCHEMAS");
-  if (!schemadir)
-    schemadir=SHIB_SCHEMAS;
-
-  ShibTargetConfig& conf=ShibTargetConfig::getConfig();
-  SPConfig::getConfig().setFeatures(SPConfig::Listener | SPConfig::InProcess);
-  if (!conf.init(schemadir) || !conf.load(config))
-      return -10;
-
-  try {
-      DDF in("ping");
-      DDFJanitor injan(in);
-      in.integer(atol(argv[1]));
-
-      DDF out=SPConfig::getConfig().getServiceProvider()->getListenerService()->send(in);
-      DDFJanitor outjan(out);
-
-      cerr << argv[1] << " -> " << out.integer() << "\n";
-  }
-  catch (exception& e) {
-      cerr << "caught exception: " << e.what() << "\n";
-  }
-  
-  conf.shutdown();
-  return 0;
-}
diff --git a/shar/testclient.dsp b/shar/testclient.dsp
deleted file mode 100644 (file)
index bc66197..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testclient" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
-\r
-CFG=testclient - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "testclient.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "testclient.mak" CFG="testclient - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "testclient - Win32 Release" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "testclient - Win32 Debug" (based on "Win32 (x86) Console Application")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "testclient - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "testclient___Win32_Release"\r
-# PROP BASE Intermediate_Dir "testclient___Win32_Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "testclient___Win32_Release"\r
-# PROP Intermediate_Dir "testclient___Win32_Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "../oncrpc" /I "..\..\..\opensaml\c" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 wsock32.lib /nologo /subsystem:console /machine:I386\r
-\r
-!ELSEIF  "$(CFG)" == "testclient - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "testclient___Win32_Debug"\r
-# PROP BASE Intermediate_Dir "testclient___Win32_Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 2\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "testclient___Win32_Debug"\r
-# PROP Intermediate_Dir "testclient___Win32_Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "../oncrpc" /I "..\..\..\opensaml\c" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /YX /FD /GZ /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "testclient - Win32 Release"\r
-# Name "testclient - Win32 Debug"\r
-# Begin Source File\r
-\r
-SOURCE=".\test-client.cpp"\r
-# End Source File\r
-# End Target\r
-# End Project\r
diff --git a/shar/testclient.vcproj b/shar/testclient.vcproj
deleted file mode 100644 (file)
index 05463cd..0000000
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="testclient"
-       ProjectGUID="{B3F1E899-86F9-4D3A-8026-B57D1A5B90B1}"
-       Keyword="MFCProj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory=".\testclient___Win32_Release"
-                       IntermediateDirectory=".\testclient___Win32_Release"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TypeLibraryName=".\testclient___Win32_Release/testclient.tlb"
-                               HeaderFileName=""
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..;&quot;..\..\cpp-opensaml2&quot;;..\..\cpp-xmltooling;..\..\cpp-opensaml1"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=".\testclient___Win32_Release/testclient.pch"
-                               AssemblerListingLocation=".\testclient___Win32_Release/"
-                               ObjectFile=".\testclient___Win32_Release/"
-                               ProgramDataBaseFileName=".\testclient___Win32_Release/"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1033"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
-                               OutputFile=".\testclient___Win32_Release/testclient.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               ProgramDatabaseFile=".\testclient___Win32_Release/testclient.pdb"
-                               SubSystem="1"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory=".\testclient___Win32_Debug"
-                       IntermediateDirectory=".\testclient___Win32_Debug"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="2"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TypeLibraryName=".\testclient___Win32_Debug/testclient.tlb"
-                               HeaderFileName=""
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..;&quot;..\..\cpp-opensaml1&quot;;&quot;..\..\cpp-xmltooling&quot;;&quot;..\..\cpp-opensaml2&quot;"
-                               PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=".\testclient___Win32_Debug/testclient.pch"
-                               AssemblerListingLocation=".\testclient___Win32_Debug/"
-                               ObjectFile=".\testclient___Win32_Debug/"
-                               ProgramDataBaseFileName=".\testclient___Win32_Debug/"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="4"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1033"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
-                               OutputFile=".\testclient___Win32_Debug/testclient.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=""
-                               GenerateDebugInformation="true"
-                               SubSystem="1"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="test-client.cpp"
-                       >
-                       <FileConfiguration
-                               Name="Release|Win32"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="2"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions=""
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Debug|Win32"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="0"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG;_MBCS;$(NoInherit)"
-                                       BasicRuntimeChecks="3"
-                                       BrowseInformation="1"
-                               />
-                       </FileConfiguration>
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
index 8587d4f..7d3ea73 100644 (file)
@@ -62,10 +62,10 @@ namespace shibsp {
     void SHIBSP_API registerAccessControls();
 
     /** AccessControl based on rudimentary XML syntax. */
-    #define XML_ACCESS_CONTROL  "edu.internet2.middleware.shibboleth.sp.provider.XMLAccessControl"
+    #define XML_ACCESS_CONTROL  "XML"
 
     /** Reserved for Apache-style .htaccess support. */
-    #define HT_ACCESS_CONTROL   "edu.internet2.middleware.shibboleth.sp.apache.provider.htAccessControl"
+    #define HT_ACCESS_CONTROL   "htaccess"
 };
 
 #endif /* __shibsp_acl_h__ */
index b680e6b..e3bae59 100644 (file)
@@ -64,10 +64,10 @@ namespace shibsp {
     void SHIBSP_API registerRequestMappers();
 
     /** XML-based RequestMapper implementation. */
-    #define XML_REQUEST_MAPPER      "edu.internet2.middleware.shibboleth.sp.provider.XMLRequestMapProvider"
+    #define XML_REQUEST_MAPPER      "XML"
 
     /** Hybrid of XML and platform-specific configuration. */
-    #define NATIVE_REQUEST_MAPPER   "edu.internet2.middleware.shibboleth.sp.provider.NativeRequestMapProvider"
+    #define NATIVE_REQUEST_MAPPER   "Native"
 };
 
 #endif /* __shibsp_reqmap_h__ */
index cd4d3e1..e9ea103 100644 (file)
@@ -170,7 +170,7 @@ namespace shibsp {
     void SHIBSP_API registerServiceProviders();
 
     /** SP based on integrated XML and native server configuration. */
-    #define XML_SERVICE_PROVIDER "edu.internet2.middleware.shibboleth.sp.provider.XMLServiceProvider"
+    #define XML_SERVICE_PROVIDER "XML"
 };
 
 #endif /* __shibsp_sp_h__ */
index 46195d2..d350927 100644 (file)
@@ -223,10 +223,10 @@ namespace shibsp {
     };
 
     /** SessionCache implementation that delegates to a remoted version. */
-    #define REMOTED_SESSION_CACHE    "edu.internet2.middleware.shibboleth.sp.provider.RemotedSessionCache"
+    #define REMOTED_SESSION_CACHE    "Remoted"
 
     /** SessionCache implementation backed by a StorageService. */
-    #define STORAGESERVICE_SESSION_CACHE    "edu.internet2.middleware.shibboleth.sp.provider.StorageServiceSessionCache"
+    #define STORAGESERVICE_SESSION_CACHE    "StorageService"
 
     /**
      * Registers SessionCache classes into the runtime.
index 6058eff..68a9a1d 100644 (file)
@@ -117,7 +117,9 @@ namespace {
 \r
 void SHIBSP_API shibsp::registerAccessControls()\r
 {\r
-    SPConfig::getConfig().AccessControlManager.registerFactory(XML_ACCESS_CONTROL, XMLAccessControlFactory);\r
+    SPConfig& conf=SPConfig::getConfig();\r
+    conf.AccessControlManager.registerFactory(XML_ACCESS_CONTROL, XMLAccessControlFactory);\r
+    conf.AccessControlManager.registerFactory("edu.internet2.middleware.shibboleth.sp.provider.XMLAccessControl", XMLAccessControlFactory);\r
 }\r
 \r
 Rule::Rule(const DOMElement* e)\r
index d356923..772c51c 100644 (file)
@@ -154,7 +154,10 @@ void SHIBSP_API shibsp::registerRequestMappers()
 {\r
     SPConfig& conf=SPConfig::getConfig();\r
     conf.RequestMapperManager.registerFactory(XML_REQUEST_MAPPER, XMLRequestMapperFactory);\r
+    conf.RequestMapperManager.registerFactory("edu.internet2.middleware.shibboleth.sp.provider.XMLRequestMapProvider", XMLRequestMapperFactory);\r
+    conf.RequestMapperManager.registerFactory("edu.internet2.middleware.shibboleth.target.provider.XMLRequestMap", XMLRequestMapperFactory);\r
     conf.RequestMapperManager.registerFactory(NATIVE_REQUEST_MAPPER, XMLRequestMapperFactory);\r
+    conf.RequestMapperManager.registerFactory("edu.internet2.middleware.shibboleth.sp.provider.NativeRequestMapProvider", XMLRequestMapperFactory);\r
 }\r
 \r
 short Override::acceptNode(const DOMNode* node) const\r
index 4267ccd..b2b87fb 100644 (file)
@@ -343,17 +343,16 @@ XMLApplication::XMLApplication(
         bool hardACS=false, hardSessionInit=false;\r
         const DOMElement* child = XMLHelper::getFirstChildElement(propcheck->getElement());\r
         while (child) {\r
-            xmltooling::auto_ptr_char bindprop(child->getAttributeNS(NULL,EndpointType::BINDING_ATTRIB_NAME));\r
-            if (!bindprop.get() || !*(bindprop.get())) {\r
-                log.warn("md:AssertionConsumerService element has no Binding attribute, skipping it...");\r
-                child = XMLHelper::getNextSiblingElement(child);\r
-                continue;\r
-            }\r
-            \r
             try {\r
                 // A handler is based on the Binding property in conjunction with the element name.\r
                 // If it's an ACS or SI, also handle index/id mappings and defaulting.\r
                 if (XMLHelper::isNodeNamed(child,samlconstants::SAML20MD_NS,AssertionConsumerService::LOCAL_NAME)) {\r
+                    auto_ptr_char bindprop(child->getAttributeNS(NULL,EndpointType::BINDING_ATTRIB_NAME));\r
+                    if (!bindprop.get() || !*(bindprop.get())) {\r
+                        log.warn("md:AssertionConsumerService element has no Binding attribute, skipping it...");\r
+                        child = XMLHelper::getNextSiblingElement(child);\r
+                        continue;\r
+                    }\r
                     handler=conf.AssertionConsumerServiceManager.newPlugin(bindprop.get(),child);\r
                     // Map by binding (may be > 1 per binding, e.g. SAML 1.0 vs 1.1)\r
 #ifdef HAVE_GOOD_STL\r
@@ -376,6 +375,12 @@ XMLApplication::XMLApplication(
                     }\r
                 }\r
                 else if (XMLString::equals(child->getLocalName(),SessionInitiator)) {\r
+                    auto_ptr_char bindprop(child->getAttributeNS(NULL,EndpointType::BINDING_ATTRIB_NAME));\r
+                    if (!bindprop.get() || !*(bindprop.get())) {\r
+                        log.warn("SessionInitiator element has no Binding attribute, skipping it...");\r
+                        child = XMLHelper::getNextSiblingElement(child);\r
+                        continue;\r
+                    }\r
                     handler=conf.SessionInitiatorManager.newPlugin(bindprop.get(),child);\r
                     pair<bool,const char*> si_id=handler->getString("id");\r
                     if (si_id.first && si_id.second)\r
@@ -393,13 +398,31 @@ XMLApplication::XMLApplication(
                     }\r
                 }\r
                 else if (XMLHelper::isNodeNamed(child,samlconstants::SAML20MD_NS,SingleLogoutService::LOCAL_NAME)) {\r
+                    auto_ptr_char bindprop(child->getAttributeNS(NULL,EndpointType::BINDING_ATTRIB_NAME));\r
+                    if (!bindprop.get() || !*(bindprop.get())) {\r
+                        log.warn("md:SingleLogoutService element has no Binding attribute, skipping it...");\r
+                        child = XMLHelper::getNextSiblingElement(child);\r
+                        continue;\r
+                    }\r
                     handler=conf.SingleLogoutServiceManager.newPlugin(bindprop.get(),child);\r
                 }\r
                 else if (XMLHelper::isNodeNamed(child,samlconstants::SAML20MD_NS,ManageNameIDService::LOCAL_NAME)) {\r
+                    auto_ptr_char bindprop(child->getAttributeNS(NULL,EndpointType::BINDING_ATTRIB_NAME));\r
+                    if (!bindprop.get() || !*(bindprop.get())) {\r
+                        log.warn("md:ManageNameIDService element has no Binding attribute, skipping it...");\r
+                        child = XMLHelper::getNextSiblingElement(child);\r
+                        continue;\r
+                    }\r
                     handler=conf.ManageNameIDServiceManager.newPlugin(bindprop.get(),child);\r
                 }\r
                 else {\r
-                    handler=conf.HandlerManager.newPlugin(bindprop.get(),child);\r
+                    auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
+                    if (!type.get() || !*(type.get())) {\r
+                        log.warn("Handler element has no type attribute, skipping it...");\r
+                        child = XMLHelper::getNextSiblingElement(child);\r
+                        continue;\r
+                    }\r
+                    handler=conf.HandlerManager.newPlugin(type.get(),child);\r
                 }\r
 \r
                 // Save off the objects after giving the property set to the handler for its use.\r
@@ -463,7 +486,7 @@ XMLApplication::XMLApplication(
             vector<MetadataProvider*> os2providers;\r
             child = XMLHelper::getFirstChildElement(e,_MetadataProvider);\r
             while (child) {\r
-                xmltooling::auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
+                auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
                 log.info("building metadata provider of type %s...",type.get());\r
                 try {\r
                     auto_ptr<MetadataProvider> mp(samlConf.MetadataProviderManager.newPlugin(type.get(),child));\r
@@ -499,7 +522,7 @@ XMLApplication::XMLApplication(
             ChainingTrustEngine* chainTrust = NULL;\r
             child = XMLHelper::getFirstChildElement(e,TrustProvider);\r
             while (child) {\r
-                xmltooling::auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
+                auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
                 log.info("building trust provider of type %s...",type.get());\r
                 try {\r
                     if (!m_trust) {\r
@@ -725,7 +748,7 @@ const vector<const Handler*>& XMLApplication::getAssertionConsumerServicesByBind
 #ifdef HAVE_GOOD_STL\r
     ACSBindingMap::const_iterator i=m_acsBindingMap.find(binding);\r
 #else\r
-    xmltooling::auto_ptr_char temp(binding);\r
+    auto_ptr_char temp(binding);\r
     ACSBindingMap::const_iterator i=m_acsBindingMap.find(temp.get());\r
 #endif\r
     if (i!=m_acsBindingMap.end())\r
@@ -774,7 +797,7 @@ void XMLConfigImpl::doExtensions(const DOMElement* e, const char* label, Categor
     if (exts) {\r
         exts=XMLHelper::getFirstChildElement(exts,Library);\r
         while (exts) {\r
-            xmltooling::auto_ptr_char path(exts->getAttributeNS(NULL,_path));\r
+            auto_ptr_char path(exts->getAttributeNS(NULL,_path));\r
             try {\r
                 if (path.get()) {\r
                     XMLToolingConfig::getConfig().load_library(path.get(),(void*)exts);\r
@@ -823,7 +846,7 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o
             if (!logconf || !*logconf)\r
                 logconf=e->getAttributeNS(NULL,logger);\r
             if (logconf && *logconf) {\r
-                xmltooling::auto_ptr_char logpath(logconf);\r
+                auto_ptr_char logpath(logconf);\r
                 log.debug("loading new logging configuration from (%s), check log destination for status of configuration",logpath.get());\r
                 XMLToolingConfig::getConfig().log_config(logpath.get());\r
             }\r
@@ -872,7 +895,7 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o
                         else {\r
                             child=XMLHelper::getFirstChildElement(SHAR,Listener);\r
                             if (child) {\r
-                                xmltooling::auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
+                                auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
                                 if (type.get())\r
                                     plugtype=type.get();\r
                             }\r
@@ -898,8 +921,8 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o
                 string inmemID;\r
                 child=XMLHelper::getFirstChildElement(container,_StorageService);\r
                 while (child) {\r
-                    xmltooling::auto_ptr_char id(child->getAttributeNS(NULL,Id));\r
-                    xmltooling::auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
+                    auto_ptr_char id(child->getAttributeNS(NULL,Id));\r
+                    auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
                     if (id.get() && type.get()) {\r
                         try {\r
                             log.info("building StorageService (%s) of type %s...", id.get(), type.get());\r
@@ -916,7 +939,7 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o
                 \r
                 child=XMLHelper::getFirstChildElement(container,_SessionCache);\r
                 if (child) {\r
-                    xmltooling::auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
+                    auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
                     log.info("building Session Cache of type %s...",type.get());\r
                     m_outer->m_sessionCache=conf.SessionCacheManager.newPlugin(type.get(),child);\r
                 }\r
@@ -941,7 +964,7 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o
                 StorageService* replaySS=NULL;\r
                 child=XMLHelper::getFirstChildElement(container,_ReplayCache);\r
                 if (child) {\r
-                    xmltooling::auto_ptr_char ssid(child->getAttributeNS(NULL,_StorageService));\r
+                    auto_ptr_char ssid(child->getAttributeNS(NULL,_StorageService));\r
                     if (ssid.get() && *ssid.get()) {\r
                         replaySS = m_outer->m_storage[ssid.get()];\r
                         if (replaySS)\r
@@ -967,7 +990,7 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o
         if (conf.isEnabled(SPConfig::RequestMapping)) {\r
             child=XMLHelper::getFirstChildElement(SHIRE,RequestMapProvider);\r
             if (child) {\r
-                xmltooling::auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
+                auto_ptr_char type(child->getAttributeNS(NULL,_type));\r
                 log.info("building RequestMapper of type %s...",type.get());\r
                 m_requestMapper=conf.RequestMapperManager.newPlugin(type.get(),child);\r
             }\r
@@ -986,9 +1009,9 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o
                 // Step down and process resolvers.\r
                 child=XMLHelper::getFirstChildElement(child);\r
                 while (child) {\r
-                    xmltooling::auto_ptr_char id(child->getAttributeNS(NULL,Id));\r
+                    auto_ptr_char id(child->getAttributeNS(NULL,Id));\r
                     if (!id.get() || !*(id.get())) {\r
-                        log.warn("skipping CredentialsResolver with no Id attribute");\r
+                        log.warn("skipping CredentialResolver with no Id attribute");\r
                         child = XMLHelper::getNextSiblingElement(child);\r
                         continue;\r
                     }\r
@@ -996,7 +1019,7 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o
                     if (XMLString::equals(child->getLocalName(),FileResolver))\r
                         plugtype=FILESYSTEM_CREDENTIAL_RESOLVER;\r
                     else {\r
-                        xmltooling::auto_ptr_char c(child->getAttributeNS(NULL,_type));\r
+                        auto_ptr_char c(child->getAttributeNS(NULL,_type));\r
                         plugtype=c.get();\r
                     }\r
                     \r
index 931b2b1..f3cf95d 100644 (file)
@@ -138,13 +138,13 @@ namespace shibsp {
     void SHIBSP_API registerListenerServices();
 
     /** Listener based on in-memory simulated remoting. */
-    #define MEMORY_LISTENER_SERVICE "edu.internet2.middleware.shibboleth.sp.provider.MemoryListener"
+    #define MEMORY_LISTENER_SERVICE "MemoryListener"
 
     /** Listener based on TCP socket remoting. */
-    #define TCP_LISTENER_SERVICE "edu.internet2.middleware.shibboleth.sp.provider.TCPListener"
+    #define TCP_LISTENER_SERVICE "TCPListener"
 
     /** Listener based on UNIX domain socket remoting. */
-    #define UNIX_LISTENER_SERVICE "edu.internet2.middleware.shibboleth.sp.provider.UnixListener"
+    #define UNIX_LISTENER_SERVICE "UnixListener"
 };
 
 #endif /* __shibsp_listener_h__ */
diff --git a/siterefresh/siterefresh.dsp b/siterefresh/siterefresh.dsp
deleted file mode 100644 (file)
index aba1c74..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-# Microsoft Developer Studio Project File - Name="siterefresh" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=siterefresh - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "siterefresh.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "siterefresh.mak" CFG="siterefresh - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "siterefresh - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "siterefresh - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "siterefresh - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "..\..\..\opensaml\c" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 log4cpp.lib xerces-c_2.lib xsec_1_2.lib saml_5.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\opensaml\c\saml\Release"
-
-!ELSEIF  "$(CFG)" == "siterefresh - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "..\..\..\opensaml\c" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 log4cppD.lib xerces-c_2D.lib xsec_1_2D.lib saml_5D.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\opensaml\c\saml\Debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "siterefresh - Win32 Release"
-# Name "siterefresh - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\siterefresh.cpp
-# End Source File
-# End Target
-# End Project
index 373c82a..a5346a3 100644 (file)
@@ -2,14 +2,9 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-bin_PROGRAMS = shibtest posttest
+bin_PROGRAMS = shibtest
 
 shibtest_SOURCES = shibtest.cpp
 
-posttest_SOURCES = posttest.cpp
-
 shibtest_LDADD = $(top_builddir)/shib/libshib.la \
        $(top_builddir)/shib-target/libshib-target.la
-
-posttest_LDADD = $(top_builddir)/shib/libshib.la \
-       $(top_builddir)/shib-target/libshib-target.la
diff --git a/test/inittest.cpp b/test/inittest.cpp
deleted file mode 100644 (file)
index 1a86c10..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  Copyright 2001-2007 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "../shib-target/shib-target.h"
-#include "../shib-target/shib-paths.h"
-
-using namespace std;
-using namespace saml;
-using namespace shibboleth;
-using namespace shibtarget;
-
-ShibTargetConfig* g_Config = NULL;
-
-void shutdown(void)
-{
-  g_Config->shutdown();
-  g_Config = NULL;
-}
-
-void init(void)
-{
-  try {
-    g_Config=&ShibTargetConfig::getConfig();
-    g_Config->setFeatures(
-                         ShibTargetConfig::Listener |
-                         ShibTargetConfig::Metadata |
-                         ShibTargetConfig::AAP |
-                         ShibTargetConfig::RequestMapper |
-                         ShibTargetConfig::LocalExtensions
-                         );
-
-    if (!g_Config->init(SHIB_SCHEMAS) || !g_Config->load(SHIB_CONFIG)) {
-      cerr << "init() failed to initialize SHIB Target" << endl;
-      exit(1);
-    }
-  }
-  catch (...) {
-    cerr << "init() failed to initialize SHIB Target" << endl;
-    exit (1);
-  }
-}
-
-int main(int argc, char* argv[])
-{
-  cout << "Running init 1.." << endl;
-  init();
-  cout << "Running shutdown 1.." << endl;
-  shutdown();
-  cout << "Running init 2.." << endl;
-  init();
-  cout << "Running shutdown 2.." << endl;
-  shutdown();
-  cout << "Done." << endl;
-  exit(0);
-}
diff --git a/test/posttest.cpp b/test/posttest.cpp
deleted file mode 100644 (file)
index c295825..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  Copyright 2001-2007 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifdef WIN32
-# define _CRT_NONSTDC_NO_DEPRECATE 1
-# define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-
-#include <fstream>
-#include <shib-target/shib-target.h>
-
-#include <shibsp/exceptions.h>
-#include <shibsp/SPConfig.h>
-
-using namespace shibsp;
-using namespace shibtarget;
-using namespace shibboleth;
-using namespace saml;
-using namespace std;
-
-int main(int argc,char* argv[])
-{
-    char* a_param=NULL;
-    char* r_param=NULL;
-    char* f_param=NULL;
-    char* path=NULL;
-    char* config=NULL;
-
-    for (int i=1; i<argc; i++) {
-        if (!strcmp(argv[i],"-c") && i+1<argc)
-            config=argv[++i];
-        else if (!strcmp(argv[i],"-d") && i+1<argc)
-            path=argv[++i];
-        else if (!strcmp(argv[i],"-r") && i+1<argc)
-            r_param=argv[++i];
-        else if (!strcmp(argv[i],"-f") && i+1<argc)
-            f_param=argv[++i];
-        else if (!strcmp(argv[i],"-a") && i+1<argc)
-            a_param=argv[++i];
-    }
-
-    if (!r_param || !f_param) {
-        cerr << "usage: posttest -f <file> -r <recipient URL> [-a <application_id> -d <schema path> -c <config>]" << endl;
-        exit(0);
-    }
-    
-    if (!path)
-        path=getenv("SHIBSCHEMAS");
-    if (!path)
-        path=SHIB_SCHEMAS;
-    if (!config)
-        config=getenv("SHIBCONFIG");
-    if (!config)
-        config=SHIB_CONFIG;
-    if (!a_param)
-        a_param="default";
-
-    ShibTargetConfig& conf=ShibTargetConfig::getConfig();
-    SPConfig::getConfig().setFeatures(
-        SPConfig::Listener |
-        SPConfig::Metadata |
-        SPConfig::Trust |
-        SPConfig::OutOfProcess
-        );
-    if (!conf.init(path) || !conf.load(config))
-        return -10;
-
-    try {
-        string buf;
-        ifstream is(f_param);
-        char ch;
-        is >> ch;
-        while (!is.fail()) {
-            buf+=ch;
-            is >> ch;
-        }
-
-        auto_ptr_XMLCh recip(r_param);
-
-        ServiceProvider* sp=SPConfig::getConfig().getServiceProvider();
-        xmltooling::Locker locker(sp);
-
-        const IApplication* app=dynamic_cast<const IApplication*>(sp->getApplication(a_param));
-        if (!app) {
-            throw ConfigurationException("Unable to locate application for new session, deleted?");
-        }
-
-        SAMLBrowserProfile::BrowserProfileResponse bpr=
-            app->getBrowserProfile()->receive(buf.c_str(), recip.get(), NULL, 1);
-
-        cout << "Success!" << endl;
-        bpr.clear();
-    }
-    catch(exception& e) {
-        cerr << "caught an exception: " << e.what() << endl;
-    }
-
-    conf.shutdown();
-    return 0;
-}