From 7969540ca066282c29a7ef5745f600f1f826a755 Mon Sep 17 00:00:00 2001 From: warlord Date: Tue, 18 Nov 2003 19:42:49 +0000 Subject: [PATCH] Remove the non-used eduperson module code git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@743 cb58f699-b61c-0410-a6fe-9272a202ed29 --- mod_eduPerson/Makefile.gcc | 79 ------------------- mod_eduPerson/Makefile.sun | 79 ------------------- mod_eduPerson/mod_eduPerson.cpp | 167 ---------------------------------------- mod_eduPerson/mod_eduPerson.dsp | 101 ------------------------ 4 files changed, 426 deletions(-) delete mode 100644 mod_eduPerson/Makefile.gcc delete mode 100644 mod_eduPerson/Makefile.sun delete mode 100644 mod_eduPerson/mod_eduPerson.cpp delete mode 100644 mod_eduPerson/mod_eduPerson.dsp diff --git a/mod_eduPerson/Makefile.gcc b/mod_eduPerson/Makefile.gcc deleted file mode 100644 index d4b307a..0000000 --- a/mod_eduPerson/Makefile.gcc +++ /dev/null @@ -1,79 +0,0 @@ -## -## Makefile -- Build procedure for fast3lpoad Apache module -## -## This is a C++ module so things have to be handled a little differently. - -# the used tools -CC=g++3 -SAMLRT=../../../opensaml/c -APXS=/usr/sbin/apxs -APACHECTL=/usr/sbin/apachectl -SHIB_CFLAGS=-g -I$(SAMLRT)/include -I/usr/local/include -I../include -SHIB_LDFLAGS=-L$(SAMLRT)/lib -L../lib -SHIB_LIBS=-lsaml -lshib -leduPerson -lxerces-c1_7_0 - - -# Get all of apxs's internal values. -APXS_CC=`$(APXS) -q CC` -APXS_TARGET=`$(APXS) -q TARGET` -APXS_CFLAGS=`$(APXS) -q CFLAGS` -APXS_SBINDIR=`$(APXS) -q SBINDIR` -APXS_CFLAGS_SHLIB=`$(APXS) -q CFLAGS_SHLIB` -APXS_INCLUDEDIR=`$(APXS) -q INCLUDEDIR` -APXS_LD_SHLIB=`$(APXS) -q LD_SHLIB` -APXS_LIBEXECDIR=`$(APXS) -q LIBEXECDIR` -APXS_LDFLAGS_SHLIB=`$(APXS) -q LDFLAGS_SHLIB` -APXS_SYSCONFDIR=`$(APXS) -q SYSCONFDIR` -APXS_LIBS_SHLIB=`$(APXS) -q LIBS_SHLIB` - - -# the default target -all: mod_eduPerson.so - -# compile the shared object file. use g++ instead of letting apxs call -# ld so we end up with the right c++ stuff. We do this in two steps, -# compile and link. - -# compile -mod_eduPerson.o: mod_eduPerson.cpp - $(CC) -fpic $(SHIB_CFLAGS) -I$(APXS_INCLUDEDIR) -I$(APXS_CFLAGS) $(APXS_CFLAGS_SHLIB) -c -o $@ $< - -# link -mod_eduPerson.so: mod_eduPerson.o - $(CC) -fpic -shared $(SHIB_LDFLAGS) $(SHIB_LIBS) -o $@ $< $(APXS_LIBS_SHLIB) - -# install the shared object file into Apache -install: all - $(APXS) -i -n 'eduPerson_module' mod_eduPerson.so - -# display the apxs variables -check_apxs_vars: - @echo APXS_CC $(APXS_CC);\ - echo APXS_TARGET $(APXS_TARGET);\ - echo APXS_CFLAGS $(APXS_CFLAGS);\ - echo APXS_SBINDIR $(APXS_SBINDIR);\ - echo APXS_CFLAGS_SHLIB $(APXS_CFLAGS_SHLIB);\ - echo APXS_INCLUDEDIR $(APXS_INCLUDEDIR);\ - echo APXS_LD_SHLIB $(APXS_LD_SHLIB);\ - echo APXS_LIBEXECDIR $(APXS_LIBEXECDIR);\ - echo APXS_LDFLAGS_SHLIB $(APXS_LDFLAGS_SHLIB);\ - echo APXS_SYSCONFDIR $(APXS_SYSCONFDIR);\ - echo APXS_LIBS_SHLIB $(APXS_LIBS_SHLIB) - -# cleanup -clean: - -rm -f *.so *.o *~ - -# install and activate shared object by reloading Apache to -# force a reload of the shared object file -reload: install restart - -# the general Apache start/restart/stop -# procedures -start: - $(APACHECTL) start -restart: - $(APACHECTL) restart -stop: - $(APACHECTL) stop - diff --git a/mod_eduPerson/Makefile.sun b/mod_eduPerson/Makefile.sun deleted file mode 100644 index 0c79bc1..0000000 --- a/mod_eduPerson/Makefile.sun +++ /dev/null @@ -1,79 +0,0 @@ -## -## Makefile -- Build procedure for fast3lpoad Apache module -## -## This is a C++ module so things have to be handled a little differently. - -# the used tools -CC=CC -SAMLRT=../../../opensaml/c -APXS=/usr/sbin/apxs -APACHECTL=/usr/sbin/apachectl -SHIB_CFLAGS=-DSOLARIS -mt -fast -Kpic -I$(SAMLRT)/include -I/usr/local/include -I../include -SHIB_LDFLAGS=-L$(SAMLRT)/lib -L../lib -SHIB_LIBS=-lCrun -lCstd -lsaml -lshib -leduPerson -lxerces-c1_7_0 - - -# Get all of apxs's internal values. -APXS_CC=`$(APXS) -q CC` -APXS_TARGET=`$(APXS) -q TARGET` -APXS_CFLAGS=`$(APXS) -q CFLAGS` -APXS_SBINDIR=`$(APXS) -q SBINDIR` -APXS_CFLAGS_SHLIB=`$(APXS) -q CFLAGS_SHLIB` -APXS_INCLUDEDIR=`$(APXS) -q INCLUDEDIR` -APXS_LD_SHLIB=`$(APXS) -q LD_SHLIB` -APXS_LIBEXECDIR=`$(APXS) -q LIBEXECDIR` -APXS_LDFLAGS_SHLIB=`$(APXS) -q LDFLAGS_SHLIB` -APXS_SYSCONFDIR=`$(APXS) -q SYSCONFDIR` -APXS_LIBS_SHLIB=`$(APXS) -q LIBS_SHLIB` - - -# the default target -all: mod_eduPerson.so - -# compile the shared object file. use g++ instead of letting apxs call -# ld so we end up with the right c++ stuff. We do this in two steps, -# compile and link. - -# compile -mod_eduPerson.o: mod_eduPerson.cpp - $(CC) $(SHIB_CFLAGS) -I$(APXS_INCLUDEDIR) -I$(APXS_CFLAGS) $(APXS_CFLAGS_SHLIB) -c -o $@ $< - -# link -mod_eduPerson.so: mod_eduPerson.o - $(CC) -G $(SHIB_LDFLAGS) $(SHIB_LIBS) -o $@ $< $(APXS_LIBS_SHLIB) - -# install the shared object file into Apache -install: all - $(APXS) -i -n 'eduPerson_module' mod_eduPerson.so - -# display the apxs variables -check_apxs_vars: - @echo APXS_CC $(APXS_CC);\ - echo APXS_TARGET $(APXS_TARGET);\ - echo APXS_CFLAGS $(APXS_CFLAGS);\ - echo APXS_SBINDIR $(APXS_SBINDIR);\ - echo APXS_CFLAGS_SHLIB $(APXS_CFLAGS_SHLIB);\ - echo APXS_INCLUDEDIR $(APXS_INCLUDEDIR);\ - echo APXS_LD_SHLIB $(APXS_LD_SHLIB);\ - echo APXS_LIBEXECDIR $(APXS_LIBEXECDIR);\ - echo APXS_LDFLAGS_SHLIB $(APXS_LDFLAGS_SHLIB);\ - echo APXS_SYSCONFDIR $(APXS_SYSCONFDIR);\ - echo APXS_LIBS_SHLIB $(APXS_LIBS_SHLIB) - -# cleanup -clean: - -rm -f *.so *.o *~ - -# install and activate shared object by reloading Apache to -# force a reload of the shared object file -reload: install restart - -# the general Apache start/restart/stop -# procedures -start: - $(APACHECTL) start -restart: - $(APACHECTL) restart -stop: - $(APACHECTL) stop - diff --git a/mod_eduPerson/mod_eduPerson.cpp b/mod_eduPerson/mod_eduPerson.cpp deleted file mode 100644 index eb3887f..0000000 --- a/mod_eduPerson/mod_eduPerson.cpp +++ /dev/null @@ -1,167 +0,0 @@ -/* - * The Shibboleth License, Version 1. - * Copyright (c) 2002 - * University Corporation for Advanced Internet Development, Inc. - * All rights reserved - * - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution, if any, must include - * the following acknowledgment: "This product includes software developed by - * the University Corporation for Advanced Internet Development - * Internet2 Project. Alternately, this acknowledegement - * may appear in the software itself, if and wherever such third-party - * acknowledgments normally appear. - * - * Neither the name of Shibboleth nor the names of its contributors, nor - * Internet2, nor the University Corporation for Advanced Internet Development, - * Inc., nor UCAID may be used to endorse or promote products derived from this - * software without specific prior written permission. For written permission, - * please contact shibboleth@shibboleth.org - * - * Products derived from this software may not be called Shibboleth, Internet2, - * UCAID, or the University Corporation for Advanced Internet Development, nor - * may Shibboleth appear in their name, without prior written permission of the - * University Corporation for Advanced Internet Development. - * - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND WITH ALL FAULTS. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE, AND NON-INFRINGEMENT ARE DISCLAIMED AND THE ENTIRE RISK - * OF SATISFACTORY QUALITY, PERFORMANCE, ACCURACY, AND EFFORT IS WITH LICENSEE. - * IN NO EVENT SHALL THE COPYRIGHT OWNER, CONTRIBUTORS OR THE UNIVERSITY - * CORPORATION FOR ADVANCED INTERNET DEVELOPMENT, INC. BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - -/* - * mod_eduPerson.cpp - * Apache module to implement eduPerson Shibboleth attributes - */ - -// Apache specific header files -#include "httpd.h" -#include "http_config.h" -#include "http_protocol.h" -#include "http_main.h" -#include "http_core.h" -#include "http_log.h" - -#ifdef WIN32 -# undef strtoul -#endif - -// SAML Runtime -#include -#include -#include - -using namespace std; -using namespace saml; -using namespace shibboleth; -using namespace eduPerson; - -// per-process configuration -extern "C" module MODULE_VAR_EXPORT eduPerson_module; - -extern "C" SAMLAttribute* EPPNFactory(IDOM_Element* e) -{ - return new EPPNAttribute(e); -} - -extern "C" SAMLAttribute* AffiliationFactory(IDOM_Element* e) -{ - return new AffiliationAttribute(e); -} - -extern "C" SAMLAttribute* PrimaryAffiliationFactory(IDOM_Element* e) -{ - return new PrimaryAffiliationAttribute(e); -} - -extern "C" SAMLAttribute* EntitlementFactory(IDOM_Element* e) -{ - return new EntitlementAttribute(e); -} - -/* - * eduPerson_child_init() - * Things to do when the child process is initialized. - */ -extern "C" void eduPerson_child_init(server_rec* s, pool* p) -{ - // Register extension schema and attribute factories. - saml::XML::registerSchema(eduPerson::XML::EDUPERSON_NS,eduPerson::XML::EDUPERSON_SCHEMA_ID); - - SAMLAttribute::regFactory(eduPerson::Constants::EDUPERSON_PRINCIPAL_NAME, - shibboleth::Constants::SHIB_ATTRIBUTE_NAMESPACE_URI, - &EPPNFactory); - SAMLAttribute::regFactory(eduPerson::Constants::EDUPERSON_AFFILIATION, - shibboleth::Constants::SHIB_ATTRIBUTE_NAMESPACE_URI, - &AffiliationFactory); - SAMLAttribute::regFactory(eduPerson::Constants::EDUPERSON_PRIMARY_AFFILIATION, - shibboleth::Constants::SHIB_ATTRIBUTE_NAMESPACE_URI, - &PrimaryAffiliationFactory); - SAMLAttribute::regFactory(eduPerson::Constants::EDUPERSON_ENTITLEMENT, - shibboleth::Constants::SHIB_ATTRIBUTE_NAMESPACE_URI, - &EntitlementFactory); - - ap_log_error(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,s,"eduPerson_child_init() done"); -} - - -/* - * eduPerson_child_exit() - * Cleanup. - */ -extern "C" void eduPerson_child_exit(server_rec* s, pool* p) -{ - SAMLAttribute::unregFactory(eduPerson::Constants::EDUPERSON_PRINCIPAL_NAME, - shibboleth::Constants::SHIB_ATTRIBUTE_NAMESPACE_URI); - SAMLAttribute::unregFactory(eduPerson::Constants::EDUPERSON_AFFILIATION, - shibboleth::Constants::SHIB_ATTRIBUTE_NAMESPACE_URI); - SAMLAttribute::unregFactory(eduPerson::Constants::EDUPERSON_PRIMARY_AFFILIATION, - shibboleth::Constants::SHIB_ATTRIBUTE_NAMESPACE_URI); - SAMLAttribute::unregFactory(eduPerson::Constants::EDUPERSON_ENTITLEMENT, - shibboleth::Constants::SHIB_ATTRIBUTE_NAMESPACE_URI); - - ap_log_error(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,s,"eduPerson_child_exit() done"); -} - -extern "C"{ -module MODULE_VAR_EXPORT eduPerson_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ - NULL, /* dir config creater */ - NULL, /* dir merger --- default is to override */ - NULL, /* server config */ - NULL, /* merge server config */ - NULL, /* command table */ - NULL, /* handlers */ - NULL, /* filename translation */ - NULL, /* check_user_id */ - NULL, /* check auth */ - NULL, /* check access */ - NULL, /* type_checker */ - NULL, /* fixups */ - NULL, /* logger */ - NULL, /* header parser */ - eduPerson_child_init, /* child_init */ - eduPerson_child_exit, /* child_exit */ - NULL /* post read-request */ -}; -} diff --git a/mod_eduPerson/mod_eduPerson.dsp b/mod_eduPerson/mod_eduPerson.dsp deleted file mode 100644 index 67f9867..0000000 --- a/mod_eduPerson/mod_eduPerson.dsp +++ /dev/null @@ -1,101 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mod_eduPerson" - 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_eduPerson - 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_eduPerson.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_eduPerson.mak" CFG="mod_eduPerson - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_eduPerson - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_eduPerson - 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_eduPerson - 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 Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_EDUPERSON_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_EDUPERSON_EXPORTS" /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 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 - -!ELSEIF "$(CFG)" == "mod_eduPerson - 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 Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_EDUPERSON_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_EDUPERSON_EXPORTS" /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 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 - -!ENDIF - -# Begin Target - -# Name "mod_eduPerson - Win32 Release" -# Name "mod_eduPerson - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project -- 2.1.4