X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=shibsp%2Fpaths.h.in;h=b72cdbdb07e5b5642d054b44928c271db2a155de;hb=9abb4b739f0e1f89bd569ed0ee3c261ecdf0f6fa;hp=abd4f71f15eba736e76bc82211d545217f6c1fec;hpb=9e7f48f80953e4a1a0462ebc88827946716bdec7;p=shibboleth%2Fcpp-sp.git

diff --git a/shibsp/paths.h.in b/shibsp/paths.h.in
index abd4f71..b72cdbd 100644
--- a/shibsp/paths.h.in
+++ b/shibsp/paths.h.in
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2009 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.
  */
 
 /**
@@ -24,30 +28,27 @@
 #define __shibsp_paths_h__
 
 /** Default schema catalogs. */
-#define SHIBSP_SCHEMAS "@-XMLTOOLINGXMLDIR-@/catalog.xml:@-OPENSAMLXMLDIR-@/saml20-catalog.xml:@-OPENSAMLXMLDIR-@/saml11-catalog.xml:@-PKGXMLDIR-@/catalog.xml"
-
-/** Default name of SP configuration file. */
-#define SHIBSP_CONFIG "shibboleth2.xml"
-
-/** Default name of SP console tool logging file. */
-#define SHIBSP_LOGGING "console.logger"
+#define SHIBSP_SCHEMAS  "@-XMLTOOLINGXMLDIR-@/catalog.xml:@-OPENSAMLXMLDIR-@/saml20-catalog.xml:@-OPENSAMLXMLDIR-@/saml11-catalog.xml:@-PKGXMLDIR-@/catalog.xml"
 
 /** Default prefix for installation (used to resolve relative paths). */
-#define SHIBSP_PREFIX  "@-PREFIX-@"
+#define SHIBSP_PREFIX   "@-PREFIX-@"
 
 /** Library directory for installation (used to resolve relative paths). */
-#define SHIBSP_LIBDIR  "@-LIBDIR-@"
+#define SHIBSP_LIBDIR   "@-LIBDIR-@"
 
 /** Log directory for installation (used to resolve relative paths). */
-#define SHIBSP_LOGDIR  "@-LOGDIR-@"
+#define SHIBSP_LOGDIR   "@-LOGDIR-@"
 
 /** Configuration directory for installation (used to resolve relative paths). */
-#define SHIBSP_CFGDIR  "@-SYSCONFDIR-@"
+#define SHIBSP_CFGDIR   "@-SYSCONFDIR-@"
 
 /** Runtime state directory for installation (used to resolve relative paths). */
-#define SHIBSP_RUNDIR  "@-RUNDIR-@"
+#define SHIBSP_RUNDIR   "@-RUNDIR-@"
+
+/** Cache directory for installation (used to resolve relative paths). */
+#define SHIBSP_CACHEDIR "@-CACHEDIR-@"
 
 /** XML directory for installation (used to resolve relative paths). */
-#define SHIBSP_XMLDIR  "@-XMLDIR-@"
+#define SHIBSP_XMLDIR   "@-XMLDIR-@"
 
 #endif /* __shibsp_paths_h__ */