X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=shibsp%2Fbase.h;h=0b2c52158ee117ce8435704ebfb8bf75e35d3fa2;hb=9abb4b739f0e1f89bd569ed0ee3c261ecdf0f6fa;hp=95ee5bcf5774af852017ba5e129a80805f6df8d4;hpb=899278abaff1e70892031fd897924038d09a7b32;p=shibboleth%2Fcpp-sp.git

diff --git a/shibsp/base.h b/shibsp/base.h
index 95ee5bc..0b2c521 100644
--- a/shibsp/base.h
+++ b/shibsp/base.h
@@ -1,22 +1,26 @@
-/*
- *  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
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you 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
+ * 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.
+ * 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.
  */
 
 /**
  * @file shibsp/base.h
- * 
+ *
  * Base header file definitions
  * Must be included prior to including any other header
  */
@@ -24,7 +28,18 @@
 #ifndef __shibsp_base_h__
 #define __shibsp_base_h__
 
-#include <saml/base.h>
+#ifdef SHIBSP_LITE
+# define XMLTOOLING_LITE
+# include <xmltooling/base.h>
+#else
+# include <saml/base.h>
+#endif
+
+#if defined (_MSC_VER) || defined(__BORLANDC__)
+  #include <shibsp/config_pub_win32.h>
+#else
+  #include <shibsp/config_pub.h>
+#endif
 
 // Windows and GCC4 Symbol Visibility Macros
 #ifdef WIN32
@@ -61,36 +76,64 @@
   #define SHIBSP_EXCEPTIONAPI(api)
 #endif
 
-#ifdef WIN32
-
 /**
- * Default catalog path on Windows.
+ * Controls default logging level of console tools and other situations
+ * where fully-configured logging isn't used.
  */
-# define SHIBSP_SCHEMAS "c:\\opt\\shibboleth-sp\\share\\xml\\xmltooling\\catalog.xml;c:\\opt\\shibboleth-sp\\share\\xml\\opensaml\\saml20-catalog.xml;c:\\opt\\shibboleth-sp\\share\\xml\\opensaml\\saml11-catalog.xml;c:\\opt\\shibboleth-sp\\share\\xml\\shibboleth\\catalog.xml"
+#define SHIBSP_LOGGING  "console.logger"
 
-/**
- * Default path to configuration file on Windows.
- */
-# define SHIBSP_CONFIG "c:\\opt\\shibboleth-sp\\etc\\shibboleth\\shibboleth.xml"
+/** Default name of SP in-process logging config file. */
+#define SHIBSP_INPROC_LOGGING "native.logger"
+
+/** Default name of SP out-of-process logging config file. */
+#define SHIBSP_OUTOFPROC_LOGGING "shibd.logger"
+
+/** Logging category for Service Provider functions. */
+#define SHIBSP_LOGCAT "Shibboleth"
+
+/** Logging category for Service Provider auditing. */
+#define SHIBSP_TX_LOGCAT "Shibboleth-TRANSACTION"
+
+/** Default name of configuration file. */
+# define SHIBSP_CONFIG  "shibboleth2.xml"
+
+#ifdef WIN32
+
+/** Default catalog path on Windows. */
+# define SHIBSP_SCHEMAS "%PROGRAMDATA%/Shibboleth/SP/xml/xmltooling/catalog.xml;%PROGRAMDATA%/Shibboleth/SP/xml/opensaml/saml20-catalog.xml;%PROGRAMDATA%/Shibboleth/SP/xml/opensaml/saml11-catalog.xml;%PROGRAMDATA%/Shibboleth/SP/xml/shibboleth/catalog.xml"
+
+/** Default prefix for installation (used to resolve relative paths). */
+#define SHIBSP_PREFIX   "c:/opt/shibboleth-sp"
+
+#ifdef _WIN64
+
+/** Library directory for installation (used to resolve relative paths). */
+#define SHIBSP_LIBDIR   "lib64"
 
 #else
-# include <shibsp/paths.h>
+
+/** Library directory for installation (used to resolve relative paths). */
+#define SHIBSP_LIBDIR   "lib"
+
 #endif
 
-/**
- * Logging category for Service Provider functions.
- */
-#define SHIBSP_LOGCAT "Shibboleth.SP"
+/** Log directory for installation (used to resolve relative paths). */
+#define SHIBSP_LOGDIR   "var/log"
 
-/**
- * Logging category for Service Provider auditing.
- */
-#define SHIBSP_TX_LOGCAT "Shibboleth-TRANSACTION"
+/** Configuration directory for installation (used to resolve relative paths). */
+#define SHIBSP_CFGDIR   "etc"
 
-/**
- * Controls default logging level of console tools and other situations
- * where fully-configured logging isn't used.
- */
-#define SHIBSP_LOGGING "WARN"
+/** Runtime state directory for installation (used to resolve relative paths). */
+#define SHIBSP_RUNDIR   "var/run"
+
+/** Cache directory for installation (used to resolve relative paths). */
+#define SHIBSP_CACHEDIR "var/cache"
+
+/** XML directory for installation (used to resolve relative paths). */
+#define SHIBSP_XMLDIR   "share/xml"
+
+#else
+# include <shibsp/paths.h>
+#endif
 
 #endif /* __shibsp_base_h__ */