trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geor...@apache.org
Subject svn commit: r906370 - in /incubator/trafficserver/traffic/branches/dev: ./ example/blacklist-1/ example/protocol/test/ example/remap/ example/thread-pool/ iocore/hostdb/ iocore/net/ libinktomi++/ proxy/ proxy/config/ proxy/logging/ proxy/mgmt2/ proxy/m...
Date Thu, 04 Feb 2010 05:32:33 GMT
Author: georgep
Date: Thu Feb  4 05:32:32 2010
New Revision: 906370

URL: http://svn.apache.org/viewvc?rev=906370&view=rev
Log:
Merge in changes from trunk(TS-118,TS-31)
Tested: ubuntu904

Modified:
    incubator/trafficserver/traffic/branches/dev/   (props changed)
    incubator/trafficserver/traffic/branches/dev/example/blacklist-1/blacklist.cgi
    incubator/trafficserver/traffic/branches/dev/example/protocol/test/ProtocolClientTest.java
    incubator/trafficserver/traffic/branches/dev/example/protocol/test/ProtocolServerTest.java
    incubator/trafficserver/traffic/branches/dev/example/remap/build.txt
    incubator/trafficserver/traffic/branches/dev/example/thread-pool/README.txt
    incubator/trafficserver/traffic/branches/dev/example/thread-pool/TESTPLAN.txt
    incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc
    incubator/trafficserver/traffic/branches/dev/iocore/net/NetConfig.cc
    incubator/trafficserver/traffic/branches/dev/iocore/net/SSLConfig.cc
    incubator/trafficserver/traffic/branches/dev/libinktomi++/SafeShell.cc
    incubator/trafficserver/traffic/branches/dev/proxy/Initialize.cc
    incubator/trafficserver/traffic/branches/dev/proxy/InkAPITest.cc
    incubator/trafficserver/traffic/branches/dev/proxy/Main.cc
    incubator/trafficserver/traffic/branches/dev/proxy/Main.h
    incubator/trafficserver/traffic/branches/dev/proxy/Raf.cc
    incubator/trafficserver/traffic/branches/dev/proxy/config/plugin.config
    incubator/trafficserver/traffic/branches/dev/proxy/config/records.config.in
    incubator/trafficserver/traffic/branches/dev/proxy/config/storage.config
    incubator/trafficserver/traffic/branches/dev/proxy/config/throttle_error.html.example
    incubator/trafficserver/traffic/branches/dev/proxy/logging/LogFile.cc
    incubator/trafficserver/traffic/branches/dev/proxy/logging/LogStandalone.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.h
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/ProcessManager.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/RecordsConfig.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/CoreAPI.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/INKMgmtAPI.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/MgmtPlugin.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/include/INKMgmtAPI.h
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/APITestCliRemote.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/RemoteTestOem.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CLI.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CLImonitor.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/clientCLI.h
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/CliMgmtUtils.h
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/cli_scriptpaths.h
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/cli_sethostname_solaris.tcl
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/script_configs.sh
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/script_configs.tcl
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cop/TrafficCop.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/agent-installer/installer.cgi
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/ConfigAPI.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/NetConfig.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/SysAPI.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/TimeConfig.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/MgmtRaf.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebHttp.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebHttpRender.cc
    incubator/trafficserver/traffic/branches/dev/proxy/regression.pl
    incubator/trafficserver/traffic/branches/dev/proxy/ts-instantiate.pl
    incubator/trafficserver/traffic/branches/dev/test/SDKtest/plugin-o-matic

Propchange: incubator/trafficserver/traffic/branches/dev/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  4 05:32:32 2010
@@ -1 +1 @@
-/incubator/trafficserver/traffic/trunk:891822-906323
+/incubator/trafficserver/traffic/trunk:891822-906368

Modified: incubator/trafficserver/traffic/branches/dev/example/blacklist-1/blacklist.cgi
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/blacklist-1/blacklist.cgi?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/blacklist-1/blacklist.cgi (original)
+++ incubator/trafficserver/traffic/branches/dev/example/blacklist-1/blacklist.cgi Thu Feb  4 05:32:32 2010
@@ -6,6 +6,21 @@
 # A perl script to generate the html form for adding to and removing
 # sites from the blacklist.
 #
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF 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
+#
+#  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.
 # 
 #
 ############################################################################
@@ -13,7 +28,7 @@
 # CHANGE: specify the installed directory of traffic server here
 $ts_dir = "/home/inktomi/ts-3.5";
 
-$blacklist_file = "$ts_dir/conf/yts/plugins/blacklist.txt";
+$blacklist_file = "$ts_dir/etc/trafficserver/plugins/blacklist.txt";
 
 sub parse_form {
   local($pairs, $buffer);

Modified: incubator/trafficserver/traffic/branches/dev/example/protocol/test/ProtocolClientTest.java
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/protocol/test/ProtocolClientTest.java?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/protocol/test/ProtocolClientTest.java (original)
+++ incubator/trafficserver/traffic/branches/dev/example/protocol/test/ProtocolClientTest.java Thu Feb  4 05:32:32 2010
@@ -1,3 +1,19 @@
+//  Licensed to the Apache Software Foundation (ASF) under one
+//  or more contributor license agreements.  See the NOTICE file
+//  distributed with this work for additional information
+//  regarding copyright ownership.  The ASF 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
+//
+//  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.
+
 import java.util.*;
 import java.io.*;
 import java.net.*;

Modified: incubator/trafficserver/traffic/branches/dev/example/protocol/test/ProtocolServerTest.java
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/protocol/test/ProtocolServerTest.java?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/protocol/test/ProtocolServerTest.java (original)
+++ incubator/trafficserver/traffic/branches/dev/example/protocol/test/ProtocolServerTest.java Thu Feb  4 05:32:32 2010
@@ -1,3 +1,19 @@
+//  Licensed to the Apache Software Foundation (ASF) under one
+//  or more contributor license agreements.  See the NOTICE file
+//  distributed with this work for additional information
+//  regarding copyright ownership.  The ASF 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
+//
+//  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.
+
 import java.io.*;
 import java.net.*;
 import java.util.*;

Modified: incubator/trafficserver/traffic/branches/dev/example/remap/build.txt
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/remap/build.txt?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/remap/build.txt (original)
+++ incubator/trafficserver/traffic/branches/dev/example/remap/build.txt Thu Feb  4 05:32:32 2010
@@ -1 +1,17 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF 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
+#
+#  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.
+
 g++ -D_FILE_OFFSET_BITS=64 -shared -I../../include -I../../.. -I./ -o remap.so remap.cc

Modified: incubator/trafficserver/traffic/branches/dev/example/thread-pool/README.txt
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/thread-pool/README.txt?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/thread-pool/README.txt (original)
+++ incubator/trafficserver/traffic/branches/dev/example/thread-pool/README.txt Thu Feb  4 05:32:32 2010
@@ -95,7 +95,7 @@
 
  The files to include must be located under the directory <plugin_path>/include
  <plugin_path> is the path where the psi.so library is located
- (by default $TS_HOME/conf/yts/plugins)
+ (by default $TS_HOME/etc/trafficserver/plugins)
 
  Start TS as usual. Now any HTTP response with the X-Psi headers will be processed
  by the PSI plugin.

Modified: incubator/trafficserver/traffic/branches/dev/example/thread-pool/TESTPLAN.txt
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/example/thread-pool/TESTPLAN.txt?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/example/thread-pool/TESTPLAN.txt (original)
+++ incubator/trafficserver/traffic/branches/dev/example/thread-pool/TESTPLAN.txt Thu Feb  4 05:32:32 2010
@@ -35,7 +35,7 @@
 ------------
  - Update plugin.config to add the psi plugin
  - Generate the include files using the gen_inc.sh tool in thread-pool/include
- - Copy the include files into $TS_HOME/conf/yts/plugins/include
+ - Copy the include files into $TS_HOME/etc/trafficserver/plugins/include
  - Start TS
  - Start SynTest
 
@@ -61,7 +61,7 @@
 TS setup:
  - Update plugin.config to add the psi plugin
  - Generate the include files using the gen_inc.sh tool in thread-pool/include
- - Copy the include files into $TS_HOME/conf/yts/plugins/include
+ - Copy the include files into $TS_HOME/etc/trafficserver/plugins/include
  - Start TS
 
 SDKTest setup (Refer to SDKTest manual for detailed instructions):

Modified: incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/hostdb/HostDB.cc Thu Feb  4 05:32:32 2010
@@ -26,7 +26,7 @@
 #include "P_HostDB.h"
 
 #ifndef NON_MODULAR
-//char system_config_directory[512] = "conf/yts";
+//char system_config_directory[512] = "etc/trafficserver";
 #else
 #include "Show.h"
 #endif
@@ -2370,7 +2370,7 @@
   IOCORE_RegisterConfigInteger(RECT_CONFIG, "proxy.config.hostdb.size", 200000, RECU_DYNAMIC, RECC_NULL, NULL);
 
   IOCORE_RegisterConfigString(RECT_CONFIG,
-                              "proxy.config.hostdb.storage_path", "conf/yts/internal", RECU_DYNAMIC, RECC_NULL, NULL);
+                              "proxy.config.hostdb.storage_path", "etc/trafficserver/internal", RECU_DYNAMIC, RECC_NULL, NULL);
 
   IOCORE_RegisterConfigInteger(RECT_CONFIG,
                                "proxy.config.hostdb.storage_size", 33554432, RECU_DYNAMIC, RECC_NULL, NULL);

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/NetConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/NetConfig.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/NetConfig.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/NetConfig.cc Thu Feb  4 05:32:32 2010
@@ -67,7 +67,7 @@
 
 //    # This is the path that will be used for both single and
 //    # multi cert systems.
-char *net_config_serverCertRelativePath = "/conf/yts";
+char *net_config_serverCertRelativePath = "etc/trafficserver";
 
 //    # Fill in private key file and path only if the server's
 //    # private key is not contained in the server certificate file.
@@ -89,7 +89,7 @@
 
 int net_config_clientVerify = 0;
 char *net_config_ssl_client_cert_filename = NULL;
-char *net_config_ssl_client_cert_path = "/conf/yts";
+char *net_config_ssl_client_cert_path = "etc/trafficserver";
 
 //    # Fill in private key file and path only if the client's
 //    # private key is not contained in the client certificate file.

Modified: incubator/trafficserver/traffic/branches/dev/iocore/net/SSLConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/iocore/net/SSLConfig.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/iocore/net/SSLConfig.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/iocore/net/SSLConfig.cc Thu Feb  4 05:32:32 2010
@@ -41,11 +41,6 @@
 SslConfig
   sslTerminationConfig;
 
-#ifdef NET_FIXME
-#define system_base_install "."
-#define system_config_directory "conf/yts"
-#endif
-
 #ifndef USE_CONFIG_PROCESSOR
 SslConfigParams *
   SslConfig::ssl_config_params;
@@ -162,7 +157,7 @@
   char *clientCACertRelativePath = NULL;
   char *multicert_config_file = NULL;
 
-  int system_base_install_len = strlen(system_base_install) + 1;
+  int system_root_dir_len = strlen(system_root_dir) + 1;
   int system_config_directory_len = strlen(system_config_directory) + 1;
   int ssl_mode = SSL_TERM_MODE_NONE;
   int ret_val = 0;
@@ -186,8 +181,8 @@
   /* if ssl is enabled and we require an accelerator */
   if ((termMode & SSL_TERM_MODE_BOTH) && (ssl_accelerator_required & SSL_ACCELERATOR_REQ_BOTH)) {
     if (system(NULL)) {
-      ret_val = system("/home/trafficserver/bin/openssl_accelerated >/dev/null 2>&1");
-      Debug("ssl_accelerator_required", "/home/trafficserver/bin/openssl_accelerated returned %d|%d|(%d)", ret_val,
+      ret_val = system("bin/openssl_accelerated >/dev/null 2>&1");
+      Debug("ssl_accelerator_required", "bin/openssl_accelerated returned %d|%d|(%d)", ret_val,
             WIFEXITED(ret_val), WEXITSTATUS(ret_val));
       if (WEXITSTATUS(ret_val) != 1) {
         if (ssl_accelerator_required & SSL_ACCELERATOR_REQ_MEAN) {
@@ -196,7 +191,7 @@
           exit(-1);
         } else {
           Error
-            ("You asked to have ssl acceleration only if you have an accelerator card present, but you don't appear to have one [what does /home/trafficserver/bin/openssl_accelerated return?]");
+            ("You asked to have ssl acceleration only if you have an accelerator card present, but you don't appear to have one [what does bin/openssl_accelerated return?]");
           ssl_mode = 0;
           termMode = (SSL_TERMINATION_MODE) ssl_mode;
         }
@@ -269,17 +264,16 @@
   IOCORE_ReadConfigString(serverCertRelativePath, "proxy.config.ssl.server.cert.path", PATH_NAME_MAX);
 
   const size_t serverCertPathSize =
-    system_base_install_len + strlen(serverCertRelativePath) + strlen(serverCertFilename) + 1;
+    system_root_dir_len + strlen(serverCertRelativePath) + strlen(serverCertFilename) + 2;
   serverCertPath = (char *) xmalloc(serverCertPathSize);
 
-  const size_t serverCertPathOnlySize = system_base_install_len + strlen(serverCertRelativePath) + 5;
+  const size_t serverCertPathOnlySize = system_root_dir_len + strlen(serverCertRelativePath) + 5;
   serverCertPathOnly = (char *) xmalloc(serverCertPathOnlySize);
 
-  ink_strncpy(serverCertPath, system_base_install, serverCertPathSize);
-  strncat(serverCertPath, serverCertRelativePath, (serverCertPathSize - strlen(serverCertPath) - 1));
-  strncat(serverCertPath, "/", (serverCertPathSize - strlen(serverCertPath) - 1));
-  ink_strncpy(serverCertPathOnly, (const char *) serverCertPath, serverCertPathOnlySize);
-  strncat(serverCertPath, serverCertFilename, (serverCertPathSize - strlen(serverCertPath) - 1));
+  snprintf(serverCertPathOnly, serverCertPathOnlySize, "%s%s%s%s",
+	   system_root_dir, DIR_SEP,serverCertRelativePath,DIR_SEP);
+  snprintf(serverCertPath, serverCertPathSize, 
+	   "%s%s",serverCertPathOnly, serverCertFilename);
 
 #ifdef _WIN32
   i = 0;
@@ -346,10 +340,10 @@
 
   if (ssl_server_private_key_filename != NULL) {
     const size_t serverKeyPathSize =
-      system_base_install_len + strlen(ssl_server_private_key_path) + strlen(ssl_server_private_key_filename) + 1;
+      system_root_dir_len + strlen(ssl_server_private_key_path) + strlen(ssl_server_private_key_filename) + 1;
     serverKeyPath = (char *) xmalloc(serverKeyPathSize);
 
-    ink_strncpy(serverKeyPath, system_base_install, serverKeyPathSize);
+    ink_strncpy(serverKeyPath, system_root_dir, serverKeyPathSize);
     strncat(serverKeyPath, ssl_server_private_key_path, (serverKeyPathSize - strlen(serverKeyPath) - 1));
     strncat(serverKeyPath, "/", (serverKeyPathSize - strlen(serverKeyPath) - 1));
     strncat(serverKeyPath, ssl_server_private_key_filename, (serverKeyPathSize - strlen(serverKeyPath) - 1));
@@ -366,10 +360,10 @@
   }
 
   if (ssl_server_private_key_path != NULL) {
-    const size_t serverKeyPathOnlySize = system_base_install_len + strlen(ssl_server_private_key_path) + 1;
+    const size_t serverKeyPathOnlySize = system_root_dir_len + strlen(ssl_server_private_key_path) + 1;
     serverKeyPathOnly = (char *) xmalloc(serverKeyPathOnlySize);
 
-    ink_strncpy(serverKeyPathOnly, system_base_install, serverKeyPathOnlySize);
+    ink_strncpy(serverKeyPathOnly, system_root_dir, serverKeyPathOnlySize);
     strncat(serverKeyPathOnly, ssl_server_private_key_path, (serverKeyPathOnlySize - strlen(serverKeyPathOnly) - 1));
     strncat(serverKeyPathOnly, "/", (serverKeyPathOnlySize - strlen(serverKeyPathOnly) - 1));
     xfree(ssl_server_private_key_path);
@@ -386,10 +380,10 @@
   IOCORE_ReadConfigStringAlloc(CACertRelativePath, "proxy.config.ssl.CA.cert.pathname");
 
   if (CACertRelativePath != NULL) {
-    const size_t CACertPathSize = system_base_install_len + strlen(CACertRelativePath) + 1;
+    const size_t CACertPathSize = system_root_dir_len + strlen(CACertRelativePath) + 1;
     CACertPath = (char *) xmalloc(CACertPathSize);
 
-    ink_strncpy(CACertPath, system_base_install, CACertPathSize);
+    ink_strncpy(CACertPath, system_root_dir, CACertPathSize);
     strncat(CACertPath, CACertRelativePath, (CACertPathSize - strlen(CACertPath) - 1));
 #ifdef _WIN32
     i = 0;
@@ -412,10 +406,10 @@
 
   if (ssl_client_cert_filename != NULL) {
     const size_t clientCertPathSize =
-      system_base_install_len + strlen(ssl_client_cert_path) + strlen(ssl_client_cert_filename) + 1;
+      system_root_dir_len + strlen(ssl_client_cert_path) + strlen(ssl_client_cert_filename) + 1;
     clientCertPath = (char *) xmalloc(clientCertPathSize);
 
-    ink_strncpy(clientCertPath, system_base_install, clientCertPathSize);
+    ink_strncpy(clientCertPath, system_root_dir, clientCertPathSize);
     strncat(clientCertPath, ssl_client_cert_path, (clientCertPathSize - strlen(clientCertPath) - 1));
     strncat(clientCertPath, "/", (clientCertPathSize - strlen(clientCertPath) - 1));
     strncat(clientCertPath, ssl_client_cert_filename, (clientCertPathSize - strlen(clientCertPath) - 1));
@@ -443,10 +437,10 @@
 
   if (ssl_client_private_key_filename != NULL) {
     const size_t clientKeyPathSize =
-      system_base_install_len + strlen(ssl_client_private_key_path) + strlen(ssl_client_private_key_filename) + 1;
+      system_root_dir_len + strlen(ssl_client_private_key_path) + strlen(ssl_client_private_key_filename) + 1;
     clientKeyPath = (char *) xmalloc(clientKeyPathSize);
 
-    ink_strncpy(clientKeyPath, system_base_install, clientKeyPathSize);
+    ink_strncpy(clientKeyPath, system_root_dir, clientKeyPathSize);
     strncat(clientKeyPath, ssl_client_private_key_path, (clientKeyPathSize - strlen(clientKeyPath) - 1));
     strncat(clientKeyPath, "/", (clientKeyPathSize - strlen(clientKeyPath) - 1));
     strncat(clientKeyPath, ssl_client_private_key_filename, (clientKeyPathSize - strlen(clientKeyPath) - 1));
@@ -479,8 +473,8 @@
 // Notice that we don't put the filename at the
 // end of this path.  Its a quirk of the SSL lib interface.
   if (clientCACertRelativePath != NULL) {
-    clientCACertPath = (char *) xmalloc(system_base_install_len + strlen(clientCACertRelativePath) + 1);
-    strcpy(clientCACertPath, system_base_install);
+    clientCACertPath = (char *) xmalloc(system_root_dir_len + strlen(clientCACertRelativePath) + 1);
+    strcpy(clientCACertPath, system_root_dir);
     strcat(clientCACertPath, clientCACertRelativePath);
 #ifdef _WIN32
     i = 0;
@@ -537,7 +531,7 @@
 
   IOCORE_RegisterConfigString(RECT_CONFIG,
                               "proxy.config.ssl.server.cert.path",
-                              "/conf/yts", RECU_DYNAMIC, RECC_STR, "^[^[:space:]]+$");
+                              "etc/trafficserver", RECU_DYNAMIC, RECC_STR, "^[^[:space:]]+$");
 
   IOCORE_RegisterConfigString(RECT_CONFIG,
                               "proxy.config.ssl.server.cert_chain.filename", NULL, RECU_DYNAMIC, RECC_STR, NULL);
@@ -565,7 +559,7 @@
                               "proxy.config.ssl.client.cert.filename", NULL, RECU_DYNAMIC, RECC_STR, "^[^[:space:]]*$");
 
   IOCORE_RegisterConfigString(RECT_CONFIG,
-                              "proxy.config.ssl.client.cert.path", "/conf/yts", RECU_DYNAMIC, RECC_NULL, NULL);
+                              "proxy.config.ssl.client.cert.path", "etc/trafficserver", RECU_DYNAMIC, RECC_NULL, NULL);
 
   IOCORE_RegisterConfigString(RECT_CONFIG,
                               "proxy.config.ssl.client.private_key.filename",

Modified: incubator/trafficserver/traffic/branches/dev/libinktomi++/SafeShell.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/libinktomi%2B%2B/SafeShell.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/libinktomi++/SafeShell.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/libinktomi++/SafeShell.cc Thu Feb  4 05:32:32 2010
@@ -143,7 +143,7 @@
 }
 
 
-#define SAFESHELL_CONFIG_FILE "/export/home/inktomi/rubicon/conf/yts/.sfshrc"
+#define SAFESHELL_CONFIG_FILE "etc/trafficserver/.sfshrc"
 
 // The main driver for the SafeShell program. It reads in a config dil
 int

Modified: incubator/trafficserver/traffic/branches/dev/proxy/Initialize.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Initialize.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Initialize.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Initialize.cc Thu Feb  4 05:32:32 2010
@@ -50,8 +50,8 @@
 #define DEFAULT_NUMBER_OF_THREADS         sysconf(_SC_NPROCESSORS_ONLN) // number of Net threads
 #endif
 #define DEFAULT_REMOTE_MANAGEMENT_FLAG    0
-#define DEFAULT_SYSTEM_CONFIG_DIRECTORY   "conf/yts"
-#define DEFAULT_MANAGEMENT_DIRECTORY      "conf/yts"
+#define DEFAULT_SYSTEM_CONFIG_DIRECTORY   "etc/trafficserver"
+#define DEFAULT_MANAGEMENT_DIRECTORY      "etc/trafficserver"
 
 
 char error_tags[1024] = "";

Modified: incubator/trafficserver/traffic/branches/dev/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/InkAPITest.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/InkAPITest.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/InkAPITest.cc Thu Feb  4 05:32:32 2010
@@ -177,7 +177,7 @@
     return;
   }
 
-  if (strstr(plugin_dir, "conf/yts/plugin") == NULL) {
+  if (strstr(plugin_dir, "etc/trafficserver/plugin") == NULL) {
     SDK_RPRINT(test, "INKPluginDirGet", "TestCase2", TC_FAIL, "plugin dir is incorrect");
     *pstatus = REGRESSION_TEST_FAILED;
     return;
@@ -893,8 +893,8 @@
     *pstatus = REGRESSION_TEST_FAILED;
     return;
   }
-  // Add "conf/yts" to point to config directory
-  snprintf(input_file_full_path, sizeof(input_file_full_path), "%s%s%s%s", install_dir, DIR_SEP, "conf/yts", DIR_SEP);
+  // Add "etc/trafficserver" to point to config directory
+  snprintf(input_file_full_path, sizeof(input_file_full_path), "%s%s%s%s", install_dir, DIR_SEP, "etc/trafficserver", DIR_SEP);
 
   strncat(input_file_full_path, INPUT_TEXT_FILE, sizeof(INPUT_TEXT_FILE));
 

Modified: incubator/trafficserver/traffic/branches/dev/proxy/Main.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Main.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Main.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Main.cc Thu Feb  4 05:32:32 2010
@@ -529,7 +529,6 @@
 
   pmgmt->reconfigure();
 
-  //TS_ReadConfigString(system_config_directory, "proxy.config.config_dir", PATH_NAME_MAX);
   init_dirs();// setup directories
 
   //

Modified: incubator/trafficserver/traffic/branches/dev/proxy/Main.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Main.h?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Main.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Main.h Thu Feb  4 05:32:32 2010
@@ -48,9 +48,9 @@
 
 // TODO: consolidate location of these defaults
 #define DEFAULT_ROOT_DIRECTORY            PREFIX
-#define DEFAULT_LOCAL_STATE_DIRECTORY     "./var/trafficserver"
-#define DEFAULT_SYSTEM_CONFIG_DIRECTORY   "./etc/trafficserver"
-#define DEFAULT_LOG_DIRECTORY             "./var/log/trafficserver"
+#define DEFAULT_LOCAL_STATE_DIRECTORY     "var/trafficserver"
+#define DEFAULT_SYSTEM_CONFIG_DIRECTORY   "etc/trafficserver"
+#define DEFAULT_LOG_DIRECTORY             "var/log/trafficserver"
 #define DEFAULT_TS_DIRECTORY_FILE         PREFIX "/etc/traffic_server"
 
 //

Modified: incubator/trafficserver/traffic/branches/dev/proxy/Raf.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Raf.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Raf.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Raf.cc Thu Feb  4 05:32:32 2010
@@ -575,7 +575,7 @@
 {
 
   const char stats[] = "/stats/";
-  const char config[] = "/conf/yts/";
+  const char config[] = "/etc/trafficserver/";
 
 
   int qstring_index = 2;
@@ -594,7 +594,7 @@
 
   if (strcmp(argv[qstring_index], "/*") == 0) {
     output_resp_hdr(argv[0], 0);
-    output_raf_msg(" /stats {} /conf/yts {}");
+    output_raf_msg(" /stats {} /etc/trafficserver {}");
   } else if (strcmp(argv[qstring_index], "deadhosts") == 0) {
     process_query_deadhosts(argv[0]);
     // return 0;

Modified: incubator/trafficserver/traffic/branches/dev/proxy/config/plugin.config
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/config/plugin.config?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/config/plugin.config (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/config/plugin.config Thu Feb  4 05:32:32 2010
@@ -7,5 +7,5 @@
 # On WIN NT/2000
 # test-plugin.dll arg1 arg2 arg3
 #inktomi/iwx/iwx.so
-#inktomi/abuse/abuse.so conf/yts/abuse.config
-#inktomi/icx/icx.so conf/yts/icx.config
+#inktomi/abuse/abuse.so etc/trafficserver/abuse.config
+#inktomi/icx/icx.so etc/trafficserver/icx.config

Modified: incubator/trafficserver/traffic/branches/dev/proxy/config/records.config.in
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/config/records.config.in?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/config/records.config.in (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/config/records.config.in Thu Feb  4 05:32:32 2010
@@ -27,7 +27,7 @@
 CONFIG proxy.config.cli_binary STRING traffic_line
 CONFIG proxy.config.watch_script STRING traffic_cop
 CONFIG proxy.config.env_prep STRING example_prep.sh
-CONFIG proxy.config.config_dir STRING @prefix@/etc/@PACKAGE@
+CONFIG proxy.config.config_dir STRING etc/@PACKAGE@
 CONFIG proxy.config.temp_dir STRING /tmp
 CONFIG proxy.config.alarm_email STRING @pkgsysuser@
 CONFIG proxy.config.syslog_facility STRING LOG_DAEMON
@@ -340,7 +340,7 @@
    # 2 - enable language-targeted user response pages
 CONFIG proxy.config.body_factory.enable_customizations INT 0
 CONFIG proxy.config.body_factory.enable_logging INT 0
-CONFIG proxy.config.body_factory.template_sets_dir STRING @prefix@/etc/@PACKAGE@/body_factory
+CONFIG proxy.config.body_factory.template_sets_dir STRING etc/@PACKAGE@/body_factory
    # 0 - never suppress generated responses
    # 1 - always suppress generated responses
    # 2 - suppress responses for intercepted traffic
@@ -501,7 +501,7 @@
 CONFIG proxy.config.log2.max_space_mb_for_orphan_logs INT 25
 CONFIG proxy.config.log2.max_space_mb_headroom INT 3000
 CONFIG proxy.config.log2.hostname STRING localhost
-CONFIG proxy.config.log2.logfile_dir STRING @prefix@/var/log/@PACKAGE@
+CONFIG proxy.config.log2.logfile_dir STRING var/log/@PACKAGE@
 CONFIG proxy.config.log2.logfile_perm STRING rw-r--r--
 CONFIG proxy.config.log2.custom_logs_enabled INT 0
 # 0: old log format, 1: new xml log format (default)
@@ -665,7 +665,7 @@
 CONFIG proxy.config.ssl.server.cert_chain.filename STRING NULL
    # This is the path that will be used for both single and
    # multi cert systems.
-CONFIG proxy.config.ssl.server.cert.path STRING @prefix@/etc/@PACKAGE@
+CONFIG proxy.config.ssl.server.cert.path STRING etc/@PACKAGE@
    # Fill in private key file and path only if the server's 
    # private key is not contained in the server certificate file.
    # For multiple cert systems, if any private key is not contained
@@ -682,7 +682,7 @@
    ################################
 CONFIG proxy.config.ssl.client.verify.server INT 0
 CONFIG proxy.config.ssl.client.cert.filename STRING NULL
-CONFIG proxy.config.ssl.client.cert.path STRING @prefix@/etc/@PACKAGE@
+CONFIG proxy.config.ssl.client.cert.path STRING etc/@PACKAGE@
    # Fill in private key file and path only if the client's 
    # private key is not contained in the client certificate file.
 CONFIG proxy.config.ssl.client.private_key.filename STRING NULL
@@ -730,7 +730,7 @@
 #
 ##############################################################################
    # Directory in which to find plugins
-CONFIG proxy.config.plugin.plugin_dir STRING @prefix@/libexec/@PACKAGE@
+CONFIG proxy.config.plugin.plugin_dir STRING libexec/@PACKAGE@
 ##############################################################################
 #
 # Remote Access Framework

Modified: incubator/trafficserver/traffic/branches/dev/proxy/config/storage.config
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/config/storage.config?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/config/storage.config (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/config/storage.config Thu Feb  4 05:32:32 2010
@@ -15,10 +15,12 @@
 # the cache-file to live and 'size' is size in bytes
 #
 # Example: 128MB cache file(/usr/local/trafficserver/cache/cache.db)
-#
 # /usr/local/trafficserver/cache 134217728
+#
+# Example: 512MB cache file(/usr/local/var/trafficserver/cache.db) 
+#          assuming prefix of '/usr/local'
+#./var/trafficserver 536870912
 ./var/trafficserver 134217728
-#. 536870912
 #
 #
 #############################################################

Modified: incubator/trafficserver/traffic/branches/dev/proxy/config/throttle_error.html.example
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/config/throttle_error.html.example?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/config/throttle_error.html.example (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/config/throttle_error.html.example Thu Feb  4 05:32:32 2010
@@ -3,6 +3,24 @@
       users when the Traffic Server is overloaded.
       Modify and copy/move this file to throttle_error.html. -->
 
+<!-------------------------------------------------------------------------
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF 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
+
+  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.
+  ------------------------------------------------------------------------->
+
 <html>
 <head>
 <title>Server Overloaded</title>

Modified: incubator/trafficserver/traffic/branches/dev/proxy/logging/LogFile.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/logging/LogFile.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/logging/LogFile.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/logging/LogFile.cc Thu Feb  4 05:32:32 2010
@@ -475,7 +475,7 @@
   ink_assert(found);
 #endif
 */
-  sprintf(file_name, "%s%s%s%s%s", "../conf/yts", DIR_SEP, "internal", DIR_SEP, "ftp_logging.config");
+  sprintf(file_name, "%s%s%s%s%s", "../etc/trafficserver", DIR_SEP, "internal", DIR_SEP, "ftp_logging.config");
 
   if (access(file_name, F_OK) != 0)
     return 1;

Modified: incubator/trafficserver/traffic/branches/dev/proxy/logging/LogStandalone.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/logging/LogStandalone.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/logging/LogStandalone.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/logging/LogStandalone.cc Thu Feb  4 05:32:32 2010
@@ -43,9 +43,9 @@
 
 // TODO: consolidate location of these defaults
 #define DEFAULT_ROOT_DIRECTORY            PREFIX
-#define DEFAULT_LOCAL_STATE_DIRECTORY     "./var/trafficserver"
-#define DEFAULT_SYSTEM_CONFIG_DIRECTORY   "./etc/trafficserver"
-#define DEFAULT_LOG_DIRECTORY             "./var/log/trafficserver"
+#define DEFAULT_LOCAL_STATE_DIRECTORY     "var/trafficserver"
+#define DEFAULT_SYSTEM_CONFIG_DIRECTORY   "etc/trafficserver"
+#define DEFAULT_LOG_DIRECTORY             "var/log/trafficserver"
 #define DEFAULT_TS_DIRECTORY_FILE         PREFIX "/etc/traffic_server"
 
 #define LOG_ReadConfigString REC_ReadConfigString

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.cc Thu Feb  4 05:32:32 2010
@@ -931,12 +931,12 @@
   //For OEM releases we check here whether a floppy with the correct config file exists
   //if it does, we first configure the network, then we continue
   char floppyLockFile[256];
-  ink_snprintf(floppyLockFile, sizeof(floppyLockFile), "./conf/yts/internal/floppy.dat");
+  ink_snprintf(floppyLockFile, sizeof(floppyLockFile), "./etc/trafficserver/internal/floppy.dat");
   struct stat lockFileStat;
   FILE *floppy_lock_fd;
   bool floppyRestore = true;
 
-  // Check for the presence of floppy.dat lock file in the conf/yts/internal directory
+  // Check for the presence of floppy.dat lock file in the etc/trafficserver/internal directory
   // If the lock is found, check if it is more than 120 seconds old.
   // If the lock file is missing or if it is more than 120 seconds old, create a new lock file
   // and restore network settings.

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.h?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/Main.h Thu Feb  4 05:32:32 2010
@@ -37,9 +37,9 @@
 
 // TODO: consolidate location of these defaults
 #define DEFAULT_ROOT_DIRECTORY            PREFIX
-#define DEFAULT_LOCAL_STATE_DIRECTORY     "./var/trafficserver"
-#define DEFAULT_SYSTEM_CONFIG_DIRECTORY   "./etc/trafficserver"
-#define DEFAULT_LOG_DIRECTORY             "./var/log/trafficserver"
+#define DEFAULT_LOCAL_STATE_DIRECTORY     "var/trafficserver"
+#define DEFAULT_SYSTEM_CONFIG_DIRECTORY   "etc/trafficserver"
+#define DEFAULT_LOG_DIRECTORY             "var/log/trafficserver"
 #define DEFAULT_TS_DIRECTORY_FILE         PREFIX "/etc/traffic_server"
 
 void MgmtShutdown(int status);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/ProcessManager.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/ProcessManager.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/ProcessManager.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/ProcessManager.cc Thu Feb  4 05:32:32 2010
@@ -44,7 +44,7 @@
 #include "MgmtSocket.h"
 
 #ifndef DEFAULT_LOCAL_STATE_DIRECTORY // FIXME: consolidate defines
-#define DEFAULT_LOCAL_STATE_DIRECTORY     "./var/trafficserver"
+#define DEFAULT_LOCAL_STATE_DIRECTORY     "var/trafficserver"
 #endif
 
 /*

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/RecordsConfig.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/RecordsConfig.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/RecordsConfig.cc Thu Feb  4 05:32:32 2010
@@ -59,7 +59,7 @@
 
   {CONFIG, "proxy.config.proxy_name", "", INK_STRING, "<proxy_name>", RU_REREAD, RR_REQUIRED, RC_STR, ".+", RA_NULL}
   ,
-  {CONFIG, "proxy.config.bin_path", "", INK_STRING, "./bin", RU_NULL, RR_REQUIRED, RC_NULL, NULL, RA_NULL}
+  {CONFIG, "proxy.config.bin_path", "", INK_STRING, "bin", RU_NULL, RR_REQUIRED, RC_NULL, NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.proxy_binary", "", INK_STRING, "traffic_server", RU_NULL, RR_REQUIRED, RC_NULL, NULL, RA_NULL}
   ,
@@ -76,10 +76,10 @@
   ,
   {CONFIG, "proxy.config.env_prep", "", INK_STRING, "example_prep.sh", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.config_dir", "", INK_STRING, PKGSYSCONFDIR, RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
+  {CONFIG, "proxy.config.config_dir", "", INK_STRING, "etc/trafficserver", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
   // Jira TS-21
-  {CONFIG, "proxy.config.local_state_dir", "", INK_STRING, PKGLOCALSTATEDIR, RU_RESTART_TS, RR_NULL, RC_NULL, NULL, RA_NULL}
+  {CONFIG, "proxy.config.local_state_dir", "", INK_STRING, "var/trafficserver", RU_RESTART_TS, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.temp_dir", "", INK_STRING, "/tmp", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
@@ -370,7 +370,7 @@
   ,
   {CONFIG, "proxy.config.admin.cli_enabled", "", INK_INT, "1", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.admin.cli_path", "", INK_STRING, DEFAULT_LOCAL_STATE_DIRECTORY "/cli", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
+  {CONFIG, "proxy.config.admin.cli_path", "", INK_STRING, "var/trafficserver/cli", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.admin.cli_port", "", INK_INT, "9000", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
@@ -560,7 +560,7 @@
    "authcache.db", RU_RESTART_TS, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.auth.cache.path", "", INK_STRING,
-   DEFAULT_LOCAL_STATE_DIRECTORY, RU_RESTART_TS, RR_NULL, RC_NULL, NULL, RA_NULL}
+   "/var/trafficserver", RU_RESTART_TS, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.auth.cache.size", "", INK_INT, "5000",
    RU_RESTART_TS, RR_NULL, RC_NULL, NULL, RA_NULL}
@@ -587,7 +587,7 @@
   {CONFIG, "proxy.config.auth.convert_bin", "", INK_STRING, "filter_to_policy", RU_REREAD, RR_NULL, RC_STR, ".*",
    RA_NULL}
   ,
-  {CONFIG, "proxy.config.auth.password_file_path", "", INK_STRING, DEFAULT_LOCAL_STATE_DIRECTORY, RU_REREAD, RR_NULL, RC_NULL,
+  {CONFIG, "proxy.config.auth.password_file_path", "", INK_STRING, "var/trafficserver", RU_REREAD, RR_NULL, RC_NULL,
    ".*", RA_NULL}
   ,
   //##############################################################################x
@@ -601,7 +601,7 @@
   ,
   {CONFIG, "proxy.config.ldap.cache.size", "", INK_INT, "5000", RU_RESTART_TS, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.ldap.cache.storage_path", "", INK_STRING, DEFAULT_LOCAL_STATE_DIRECTORY, RU_RESTART_TS, RR_NULL, RC_NULL,
+  {CONFIG, "proxy.config.ldap.cache.storage_path", "", INK_STRING, "var/trafficserver", RU_RESTART_TS, RR_NULL, RC_NULL,
    NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.ldap.cache.storage_size", "", INK_INT, "15728640", RU_RESTART_TS, RR_NULL, RC_NULL, NULL,
@@ -722,7 +722,7 @@
   ,
   {CONFIG, "proxy.config.ntlm.cache.size", "", INK_INT, "5000", RU_RESTART_TS, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.ntlm.cache.storage_path", "", INK_STRING, DEFAULT_LOCAL_STATE_DIRECTORY, RU_RESTART_TS, RR_NULL, RC_NULL,
+  {CONFIG, "proxy.config.ntlm.cache.storage_path", "", INK_STRING, "var/trafficserver", RU_RESTART_TS, RR_NULL, RC_NULL,
    NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.ntlm.cache.storage_size", "", INK_INT, "15728640", RU_RESTART_TS, RR_NULL, RC_NULL, NULL,
@@ -809,7 +809,7 @@
   ,
   {CONFIG, "proxy.config.username.cache.size", "", INK_INT, "5000", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.username.cache.storage_path", "", INK_STRING, DEFAULT_LOCAL_STATE_DIRECTORY, RU_NULL, RR_NULL, RC_NULL,
+  {CONFIG, "proxy.config.username.cache.storage_path", "", INK_STRING, "var/trafficserver", RU_NULL, RR_NULL, RC_NULL,
    NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.username.cache.storage_size", "", INK_INT, "15728640", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
@@ -1283,7 +1283,7 @@
   {CONFIG, "proxy.config.body_factory.enable_logging", "", INK_INT, "1", RU_RESTART_TS, RR_NULL, RC_INT, "[0-1]",
    RA_NULL}
   ,
-  {CONFIG, "proxy.config.body_factory.template_sets_dir", "", INK_STRING, DEFAULT_SYSTEM_CONFIG_DIRECTORY "/body_factory", RU_RESTART_TS,
+  {CONFIG, "proxy.config.body_factory.template_sets_dir", "", INK_STRING, "etc/trafficserver/body_factory", RU_RESTART_TS,
    RR_NULL, RC_STR, "^[^[:space:]]+$", RA_NULL}
   ,
   //# 0 - never suppress generated responses
@@ -2626,7 +2626,7 @@
   //       # in entries, may not be changed while running
   {CONFIG, "proxy.config.hostdb.size", "", INK_INT, "200000", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.hostdb.storage_path", "", INK_STRING, DEFAULT_LOCAL_STATE_DIRECTORY, RU_REREAD, RR_NULL, RC_NULL, NULL,
+  {CONFIG, "proxy.config.hostdb.storage_path", "", INK_STRING, "/var/trafficserver", RU_REREAD, RR_NULL, RC_NULL, NULL,
    RA_NULL}
   ,
   {CONFIG, "proxy.config.hostdb.storage_size", "", INK_INT, "33554432", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
@@ -2729,7 +2729,7 @@
   ,
   {CONFIG, "proxy.config.log2.hostname", "", INK_STRING, "localhost", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.log2.logfile_dir", "", INK_STRING, DEFAULT_LOG_DIRECTORY, RU_REREAD, RR_NULL, RC_STR, "^[^[:space:]]+$",
+  {CONFIG, "proxy.config.log2.logfile_dir", "", INK_STRING, "var/log/trafficserver", RU_REREAD, RR_NULL, RC_STR, "^[^[:space:]]+$",
    RA_NULL}
   ,
   {CONFIG, "proxy.config.log2.logfile_perm", "", INK_STRING, "rw-r--r--", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
@@ -3337,10 +3337,10 @@
   ,
   {CONFIG, "proxy.config.aaa.radius.min_timeout", "", INK_INT, "10", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.aaa.radius.database_path", "", INK_STRING, DEFAULT_SYSTEM_CONFIG_DIRECTORY "/plugins/aaa/raddb", RU_NULL, RR_NULL,
+  {CONFIG, "proxy.config.aaa.radius.database_path", "", INK_STRING, "etc/trafficserver/plugins/aaa/raddb", RU_NULL, RR_NULL,
    RC_NULL, NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.aaa.radius.log_path", "", INK_STRING, DEFAULT_LOG_DIRECTORY, RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
+  {CONFIG, "proxy.config.aaa.radius.log_path", "", INK_STRING, "var/log/trafficserver", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
 
   //##############################################################################
@@ -3424,7 +3424,7 @@
   {CONFIG, "proxy.config.ssl.server.cert.filename", "", INK_STRING, "server.pem", RU_RESTART_TS, RR_NULL, RC_STR,
    "^[^[:space:]]+$", RA_NULL}
   ,
-  {CONFIG, "proxy.config.ssl.server.cert.path", "", INK_STRING, DEFAULT_SYSTEM_CONFIG_DIRECTORY, RU_RESTART_TS, RR_NULL, RC_NULL, NULL,
+  {CONFIG, "proxy.config.ssl.server.cert.path", "", INK_STRING, "etc/trafficserver", RU_RESTART_TS, RR_NULL, RC_NULL, NULL,
    RA_NULL}
   ,
   {CONFIG, "proxy.config.ssl.server.cert_chain.filename", "", INK_STRING, NULL, RU_RESTART_TS, RR_NULL, RC_STR, NULL,
@@ -3449,7 +3449,7 @@
   {CONFIG, "proxy.config.ssl.client.cert.filename", "", INK_STRING, NULL, RU_RESTART_TS, RR_NULL, RC_STR,
    "^[^[:space:]]*$", RA_NULL}
   ,
-  {CONFIG, "proxy.config.ssl.client.cert.path", "", INK_STRING, DEFAULT_SYSTEM_CONFIG_DIRECTORY, RU_RESTART_TS, RR_NULL, RC_NULL, NULL,
+  {CONFIG, "proxy.config.ssl.client.cert.path", "", INK_STRING, "etc/trafficserver", RU_RESTART_TS, RR_NULL, RC_NULL, NULL,
    RA_NULL}
   ,
   {CONFIG, "proxy.config.ssl.client.private_key.filename", "", INK_STRING, NULL, RU_RESTART_TS, RR_NULL, RC_STR,
@@ -3600,13 +3600,13 @@
   //# Plug-in Configuration
   //##############################################################################
   //# Directory in which to find plugins
-  {CONFIG, "proxy.config.plugin.plugin_dir", "", INK_STRING, PKGLIBEXECDIR, RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
+  {CONFIG, "proxy.config.plugin.plugin_dir", "", INK_STRING, "libexec/trafficserver", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.plugin.plugin_mgmt_dir", "", INK_STRING, DEFAULT_SYSTEM_CONFIG_DIRECTORY "/plugins_mgmt", RU_NULL, RR_NULL, RC_NULL,
+  {CONFIG, "proxy.config.plugin.plugin_mgmt_dir", "", INK_STRING, "etc/trafficserver/plugins_mgmt", RU_NULL, RR_NULL, RC_NULL,
    NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.plugin.extensions_dir", "", INK_STRING,
-   DEFAULT_LOCAL_STATE_DIRECTORY, RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
+   "var/trafficserver", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
 
   //##############################################################################

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/CoreAPI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/CoreAPI.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/CoreAPI.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/CoreAPI.cc Thu Feb  4 05:32:32 2010
@@ -1150,7 +1150,7 @@
     }
   }
 
-  sprintf(rec_config, "%s/conf/yts/records.config", ts_base_dir);
+  sprintf(rec_config, "%s/etc/trafficserver/records.config", ts_base_dir);
 
   if ((rec_file = fopen(rec_config, "r")) == NULL) {
     fprintf(stderr, "Error: unable to open %s.\n", rec_config);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/INKMgmtAPI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/INKMgmtAPI.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/INKMgmtAPI.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/INKMgmtAPI.cc Thu Feb  4 05:32:32 2010
@@ -3161,7 +3161,7 @@
     }
   }
 
-  snprintf(rec_config, sizeof(rec_config), "%s/conf/yts/records.config", ts_base_dir);
+  snprintf(rec_config, sizeof(rec_config), "%s/etc/trafficserver/records.config", ts_base_dir);
 
   if ((rec_file = fopen(rec_config, "r")) == NULL) {
     //fprintf(stderr, "Error: unable to open %s.\n", rec_config);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/MgmtPlugin.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/MgmtPlugin.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/MgmtPlugin.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/MgmtPlugin.cc Thu Feb  4 05:32:32 2010
@@ -56,7 +56,7 @@
 #endif
 
 static char *plugin_dir = ".";
-static char *config_dir = "../conf/yts";
+static char *config_dir = "../etc/trafficserver";
 
 typedef void (*init_func_t) (int argc, char *argv[]);
 typedef void (*init_func_w_handle_t) (void *handle, int argc, char *argv[]);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/include/INKMgmtAPI.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/include/INKMgmtAPI.h?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/include/INKMgmtAPI.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/include/INKMgmtAPI.h Thu Feb  4 05:32:32 2010
@@ -1207,7 +1207,7 @@
 /* INKInit: initializations required for API clients
  * Input: socket_path - not applicable for local clients
  *                      for remote users, the path to the config directory
- *         (eg. run from bin, socket_path = "../conf/yts/")
+ *         (eg. run from bin, socket_path = "../etc/trafficserver")
  * Output: INK_ERR_xx 
  * Note: If remote client successfully connects, returns INK_ERR_OKAY; but
  *       even if not successful connection (eg. client program is started
@@ -1232,7 +1232,7 @@
  *       mgmt plugins should be specified in the records.config variable 
  *       "proxy.config.plugin.plugin_mgmt_dir" (if this directory is a relative
  *       pathname then, it is assumed that it is relative to the root directory
- *       stored in DEFAULT_TS_DIRECTORY_FILE). The default value is "conf/yts/plugins_mgmt",
+ *       stored in DEFAULT_TS_DIRECTORY_FILE). The default value is "etc/trafficserver/plugins_mgmt",
  *       which tells Traffic Manager to use the directory plugins_mgmt located in the
  *       same directory as records.config. You should place your shared library (*.so)
  *       into the directory you have specified. 

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/APITestCliRemote.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/APITestCliRemote.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/APITestCliRemote.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/APITestCliRemote.cc Thu Feb  4 05:32:32 2010
@@ -80,7 +80,7 @@
  * take_snap:<snap_name> - takes the snapshot snap_name
  * restore_snap:<snap_name> restores the snapshot snap_name
  * remove_snap:<snap_name> - removes the snapshot snap_name
- * snapshots - lists all snapshots in conf/yts/snapshot directory
+ * snapshots - lists all snapshots in etc/trafficserver/snapshot directory
  *
  * Diags
  * ----
@@ -2706,7 +2706,7 @@
 void
 test_encrypt_password(char *pwd)
 {
-  if (INKEncryptToFile(pwd, "/export/workareas/lant/tsunami/traffic/sun_dbg/conf/yts/LAN_pwd") != INK_ERR_OKAY)
+  if (INKEncryptToFile(pwd, "/export/workareas/lant/tsunami/traffic/sun_dbg/etc/trafficserver/LAN_pwd") != INK_ERR_OKAY)
     printf("[INKEncryptToFile] could not encrypt %s", pwd);
 }
 
@@ -2840,9 +2840,9 @@
 
   // initialize 
 #if INSTALL_TEST
-  if ((ret = INKInit("../conf/yts/")) != INK_ERR_OKAY)
+  if ((ret = INKInit("../etc/trafficserver/")) != INK_ERR_OKAY)
 #else
-  if ((ret = INKInit("../../../../conf/yts/")) != INK_ERR_OKAY)
+  if ((ret = INKInit("../../../../etc/trafficserver/")) != INK_ERR_OKAY)
 #endif
   {
     print_err("main", ret);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/RemoteTestOem.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/RemoteTestOem.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/RemoteTestOem.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/RemoteTestOem.cc Thu Feb  4 05:32:32 2010
@@ -153,7 +153,7 @@
   printf("START REMOTE API TEST\n");
 
   // initialize 
-  if (INKInit("../../../../conf/yts/mgmtapisocket") != INK_ERR_OKAY) {
+  if (INKInit("../../../../etc/trafficserver/mgmtapisocket") != INK_ERR_OKAY) {
     printf("INKInit failed!\n");
     return -1;
   }

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CLI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CLI.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CLI.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CLI.cc Thu Feb  4 05:32:32 2010
@@ -1129,7 +1129,7 @@
     "    proxy.node.cache.contents.bytes_free = \"56616048\"",
     "    Ok",
     "",
-    "  Variable lists are conf/yts/stats records, separated by commas",
+    "  Variable lists are etc/trafficserver/stats records, separated by commas",
     "",
     NULL
   };

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CLImonitor.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CLImonitor.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CLImonitor.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/CLImonitor.cc Thu Feb  4 05:32:32 2010
@@ -48,7 +48,7 @@
 
 // Table of Variable/Descriptions for the monitor section
 //
-// The variables come from 'proxy/conf/yts/records.conf' and
+// The variables come from 'proxy/etc/trafficserver/records.conf' and
 // the Descriptions from 'proxy/mgmt/html/protocols.stats.ink'
 // It would be nice to cosolidate these so that both
 // the ASCII and HTML output could use the same info.

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/clientCLI.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/clientCLI.h?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/clientCLI.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/clientCLI.h Thu Feb  4 05:32:32 2010
@@ -37,9 +37,9 @@
 
 // TODO: consolidate location of these defaults
 #define DEFAULT_ROOT_DIRECTORY            PREFIX
-#define DEFAULT_LOCAL_STATE_DIRECTORY     "./var/trafficserver"
-#define DEFAULT_SYSTEM_CONFIG_DIRECTORY   "./etc/trafficserver"
-#define DEFAULT_LOG_DIRECTORY             "./var/log/trafficserver"
+#define DEFAULT_LOCAL_STATE_DIRECTORY     "var/trafficserver"
+#define DEFAULT_SYSTEM_CONFIG_DIRECTORY   "etc/trafficserver"
+#define DEFAULT_LOG_DIRECTORY             "var/log/trafficserver"
 #define DEFAULT_TS_DIRECTORY_FILE         PREFIX "/etc/traffic_server"
 
 class textBuffer;

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/CliMgmtUtils.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/CliMgmtUtils.h?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/CliMgmtUtils.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/CliMgmtUtils.h Thu Feb  4 05:32:32 2010
@@ -37,9 +37,9 @@
 
 // TODO: consolidate location of these defaults
 #define DEFAULT_ROOT_DIRECTORY            PREFIX
-#define DEFAULT_LOCAL_STATE_DIRECTORY     "./var/trafficserver"
-#define DEFAULT_SYSTEM_CONFIG_DIRECTORY   "./etc/trafficserver"
-#define DEFAULT_LOG_DIRECTORY             "./var/log/trafficserver"
+#define DEFAULT_LOCAL_STATE_DIRECTORY     "var/trafficserver"
+#define DEFAULT_SYSTEM_CONFIG_DIRECTORY   "etc/trafficserver"
+#define DEFAULT_LOG_DIRECTORY             "var/log/trafficserver"
 #define DEFAULT_TS_DIRECTORY_FILE         PREFIX "/etc/traffic_server"
 
 #define RECORD_GET 0

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/cli_scriptpaths.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/cli_scriptpaths.h?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/cli_scriptpaths.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/cli_scriptpaths.h Thu Feb  4 05:32:32 2010
@@ -99,7 +99,7 @@
 #define SPI_TRAFFIC_LINE  "spi_traffic_line.sh"
 #define SPI_TRAFFIC_LINE_ARGS  "1>/usr/tmp/spi_traffic_line.log 2>&1"
 
-#define RECORDS_CONFIG_FILE  INKTOMI_HOME "/rubicon/conf/yts/records.config"
+#define RECORDS_CONFIG_FILE  INKTOMI_HOME "/rubicon/etc/trafficserver/records.config"
 
 
 

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/cli_sethostname_solaris.tcl
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/cli_sethostname_solaris.tcl?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/cli_sethostname_solaris.tcl (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/cli_sethostname_solaris.tcl Thu Feb  4 05:32:32 2010
@@ -76,7 +76,7 @@
 #it has the ip address stored where it will translate stuff
 
 #Remove the existing file
-IPNAT_CONF=/export/home/inktomi/rubicon/conf/yts/ipnat.conf
+IPNAT_CONF=/export/home/inktomi/rubicon/etc/trafficserver/ipnat.conf
 if [ -f $IPNAT_CONF -a -r $IPNAT_CONF ]; then
   rm -f $IPNAT_CONF
   cat >> $IPNAT_CONF << EOF
@@ -88,8 +88,8 @@
 fi
 
 #Change records.config to reflect new hostname
-RECORDS_CONFIG=/export/home/inktomi/rubicon/conf/yts/records.config
-RECORDS_CONFIG_NEW=/export/home/inktomi/rubicon/conf/yts/records.config_new
+RECORDS_CONFIG=/export/home/inktomi/rubicon/etc/trafficserver/records.config
+RECORDS_CONFIG_NEW=/export/home/inktomi/rubicon/etc/trafficserver/records.config_new
 if [ -f $RECORDS_CONFIG ]; then
  /bin/rm -f $RECORDS_CONFIG_NEW
  sed "s!proxy.config.proxy_name.*!proxy.config.proxy_name STRING $name!" $RE
@@ -101,7 +101,7 @@
 
 #We need to restart TrafficManager and Server again
 TRAFFIC_LINE=/export/home/inktomi/rubicon/bin/traffic_line
-TF=/export/home/inktomi/rubicon/conf/yts/cli
+TF=/export/home/inktomi/rubicon/etc/trafficserver/cli
 if [ -x $TRAFFIC_LINE ]; then
   $TRAFFIC_LINE -p $TF -L
 fi

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/script_configs.sh
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/script_configs.sh?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/script_configs.sh (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/script_configs.sh Thu Feb  4 05:32:32 2010
@@ -33,7 +33,7 @@
 export TS_INSTALL_PATH="${INKTOMI_HOME}/${VERS_SYMLINK}"
 export TS_BINARIES_PATH="${TS_INSTALL_PATH}/bin"
 export SPI_BINARIES_PATH="${TS_BINARIES_PATH}"
-export CONFIG_DIR="${TS_INSTALL_PATH}/conf/yts"
+export CONFIG_DIR="${TS_INSTALL_PATH}/etc/trafficserver"
 export INTERNAL_CONFIG_DIR="${CONFIG_DIR}/internal"
 export MAIN_CONFIG_FILE="records.config"
 export PATCHES_DIR="/home/patches"

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/script_configs.tcl
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/script_configs.tcl?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/script_configs.tcl (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/script_configs.tcl Thu Feb  4 05:32:32 2010
@@ -33,7 +33,7 @@
 export TS_INSTALL_PATH="${INKTOMI_HOME}/${VERS_SYMLINK}"
 export TS_BINARIES_PATH="${TS_INSTALL_PATH}/bin"
 export SPI_BINARIES_PATH="${TS_BINARIES_PATH}"
-export CONFIG_DIR="${TS_INSTALL_PATH}/conf/yts"
+export CONFIG_DIR="${TS_INSTALL_PATH}/etc/trafficserver"
 export INTERNAL_CONFIG_DIR="${CONFIG_DIR}/internal"
 export MAIN_CONFIG_FILE="records.config"
 export PATCHES_DIR="/home/patches"

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cop/TrafficCop.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cop/TrafficCop.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cop/TrafficCop.cc Thu Feb  4 05:32:32 2010
@@ -56,9 +56,9 @@
 
 // TODO: consolidate location of these defaults
 #define DEFAULT_ROOT_DIRECTORY            PREFIX
-#define DEFAULT_LOCAL_STATE_DIRECTORY     "./var/trafficserver"
-#define DEFAULT_SYSTEM_CONFIG_DIRECTORY   "./etc/trafficserver"
-#define DEFAULT_LOG_DIRECTORY             "./var/log/trafficserver"
+#define DEFAULT_LOCAL_STATE_DIRECTORY     "var/trafficserver"
+#define DEFAULT_SYSTEM_CONFIG_DIRECTORY   "etc/trafficserver"
+#define DEFAULT_LOG_DIRECTORY             "var/log/trafficserver"
 #define DEFAULT_TS_DIRECTORY_FILE         PREFIX "/etc/traffic_server"
 
 static char root_dir[PATH_MAX];
@@ -2204,7 +2204,7 @@
   // 
   // The traffic_cop binary should be run from either the TS root
   // directory or the bin/ directory. In either case, there should
-  // always be a conf/yts/ directory there.
+  // always be a etc/trafficserver directory there.
   //
   // If there is no DEFAULT_TS_DIRECTORY_FILE file to be found, we will
   // assume there is one in the current working directory.

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/agent-installer/installer.cgi
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/agent-installer/installer.cgi?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/agent-installer/installer.cgi (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/agent-installer/installer.cgi Thu Feb  4 05:32:32 2010
@@ -20,14 +20,14 @@
 echo "<HTML>"
 echo "<H3>Agent Installer Results</H3><P>"
 
-if [ -r conf/yts/records.config.shadow ]
+if [ -r etc/trafficserver/records.config.shadow ]
 then
-    HTMLDIR=`grep "proxy\.config\.admin\.html_doc_root " conf/yts/records.config.shadow | awk '{print $4}'`
-    SERVERPORT=`grep "proxy\.config\.http\.server_port " conf/yts/records.config.shadow | awk '{print $4}'`
+    HTMLDIR=`grep "proxy\.config\.admin\.html_doc_root " etc/trafficserver/records.config.shadow | awk '{print $4}'`
+    SERVERPORT=`grep "proxy\.config\.http\.server_port " etc/trafficserver/records.config.shadow | awk '{print $4}'`
 elif [ -r conf/yts/records.config ]
 then
-    HTMLDIR=`grep "proxy\.config\.admin\.html_doc_root " conf/yts/records.config | awk '{print $4}'`
-    SERVERPORT=`grep "proxy\.config\.http\.server_port " conf/yts/records.config | awk '{print $4}'`
+    HTMLDIR=`grep "proxy\.config\.admin\.html_doc_root " etc/trafficserver/records.config | awk '{print $4}'`
+    SERVERPORT=`grep "proxy\.config\.http\.server_port " etc/trafficserver/records.config | awk '{print $4}'`
 else
     HTMLDIR="../ui"
     SERVERPORT=8080

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/ConfigAPI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/ConfigAPI.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/ConfigAPI.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/ConfigAPI.cc Thu Feb  4 05:32:32 2010
@@ -1510,7 +1510,7 @@
     bool restoreConfig = true;
     int oldModTime;
     if(!stat(floppy_config_file, &floppyNetConfig)) {
-      FILE *floppyLockFile = fopen("/home/inktomi/5.2.12/conf/yts/internal/floppy.dat", "r+");
+      FILE *floppyLockFile = fopen("/home/inktomi/5.2.12/etc/trafficserver/internal/floppy.dat", "r+");
       if(floppyLockFile != NULL) {
         fscanf(floppyLockFile, "%d", &oldModTime);
         if(oldModTime == floppyNetConfig.st_mtime)

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/NetConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/NetConfig.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/NetConfig.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/NetConfig.cc Thu Feb  4 05:32:32 2010
@@ -1677,7 +1677,7 @@
     }
   }
 
-  snprintf(rec_config, sizeof(rec_config), "%s/conf/yts/records.config", ts_base_dir);
+  snprintf(rec_config, sizeof(rec_config), "%s/etc/trafficserver/records.config", ts_base_dir);
 
   if ((rec_file = fopen(rec_config, "r")) == NULL) {
     //fprintf(stderr, "Error: unable to open %s.\n", rec_config);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/SysAPI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/SysAPI.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/SysAPI.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/SysAPI.cc Thu Feb  4 05:32:32 2010
@@ -1449,7 +1449,7 @@
     }
   }
 
-  snprintf(ts_snmp_path, sizeof(ts_snmp_path), "%s/conf/yts/%s", ts_base_dir, TS_SNMP_PATH);
+  snprintf(ts_snmp_path, sizeof(ts_snmp_path), "%s/etc/trafficserver/%s", ts_base_dir, TS_SNMP_PATH);
   if ((fp_ts = fopen(ts_snmp_path, "r")) == NULL && (fp_ts = fopen(ts_snmp_path, "a+")) == NULL) {
     DPRINTF(("[SysAPI] failed to open ts snmp configuration file\n"));
     fclose(fp);
@@ -1798,7 +1798,7 @@
     return -1;
   }
 
-  snprintf(snmp_config, sizeof(snmp_config), "%s/conf/yts/snmpd.cnf", ts_path);
+  snprintf(snmp_config, sizeof(snmp_config), "%s/etc/trafficserver/snmpd.cnf", ts_path);
   if ((fp = fopen(snmp_config, "r")) == NULL && (fp = fopen(snmp_config, "a+")) == NULL) {
     DPRINTF(("[SysAPI] failed to open ts snmp script file\n"));
     return 1;

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/TimeConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/TimeConfig.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/TimeConfig.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/TimeConfig.cc Thu Feb  4 05:32:32 2010
@@ -98,7 +98,7 @@
   strncat(start_traffic_server, "/bin/start_traffic_server",
           sizeof(start_traffic_server) - 1 - strlen(start_traffic_server));
   strncpy(no_cop_path, buffer, sizeof(no_cop_path) - 1);
-  strncat(no_cop_path, "/conf/yts/internal/no_cop", sizeof(no_cop_path) - 1 - strlen(no_cop_path));
+  strncat(no_cop_path, "/etc/trafficserver/internal/no_cop", sizeof(no_cop_path) - 1 - strlen(no_cop_path));
   strncpy(zonepath, "/usr/share/zoneinfo/", sizeof(zonepath) - 1);
 
 //  while(access(no_cop_path, F_OK) == -1);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/MgmtRaf.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/MgmtRaf.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/MgmtRaf.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/MgmtRaf.cc Thu Feb  4 05:32:32 2010
@@ -298,7 +298,7 @@
 
   const char stats[] = "/stats/";
   // This doesn't seem to be used.
-  //const char config[] = "/conf/yts/";
+  //const char config[] = "/etc/trafficserver/";
 
   int qstring_index = 2;
   while (qstring_index < argc) {
@@ -317,7 +317,7 @@
   }
 
   if (strcmp(argv[qstring_index], "/*") == 0) {
-    char msg[] = " /stats {} /conf/yts {}";
+    char msg[] = " /stats {} /etc/trafficserver {}";
     RafOutputHeader(resp, argv[0], "0");
     RafOutputArg(resp, msg);
   } else {

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebHttp.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebHttp.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebHttp.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebHttp.cc Thu Feb  4 05:32:32 2010
@@ -5610,7 +5610,7 @@
   // first, try to open factory default file
   if (getTSdirectory(ts_path, sizeof(ts_path)) != 0)
     goto Lunable_to_submit;
-  ink_snprintf(command_path, sizeof(command_path), "%s/conf/yts/plugins/extensions.config.factory.default", ts_path);
+  ink_snprintf(command_path, sizeof(command_path), "%s/etc/trafficserver/plugins/extensions.config.factory.default", ts_path);
   fd = fopen(command_path, "r");
   if (fd == NULL)
     goto FILE_MISSING;
@@ -6184,7 +6184,7 @@
   } else {
     // don't serve file types that we don't know about; helps to lock
     // down the webserver.  for example, when serving files out the
-    // conf/yts/plugins directory, we don't want to allow the users to
+    // etc/trafficserver/plugins directory, we don't want to allow the users to
     // access the .so/.dll plugin files.
     response_hdr->setStatus(STATUS_NOT_FOUND);
     WebHttpSetErrorResponse(whc, STATUS_NOT_FOUND);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebHttpRender.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebHttpRender.cc?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebHttpRender.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebHttpRender.cc Thu Feb  4 05:32:32 2010
@@ -2623,19 +2623,19 @@
   }
 
   if (strcmp(arg, "ftp_logging_enable") == 0) {
-    if (access("conf/yts/internal/ftp_logging.config", F_OK) == 0) {
+    if (access("etc/trafficserver/internal/ftp_logging.config", F_OK) == 0) {
       ink_strncpy(value, "checked", sizeof(value));
     } else {
       ink_strncpy(value, "", sizeof(value));
     }
   } else if (strcmp(arg, "ftp_logging_disable") == 0) {
-    if (access("conf/yts/internal/ftp_logging.config", F_OK) != 0) {
+    if (access("etc/trafficserver/internal/ftp_logging.config", F_OK) != 0) {
       ink_strncpy(value, "checked", sizeof(value));
     } else {
       ink_strncpy(value, "", sizeof(value));
     }
   } else if (strcmp(arg, "FTPServerName") == 0) {
-    f = fopen("conf/yts/internal/ftp_logging.config", "r");
+    f = fopen("etc/trafficserver/internal/ftp_logging.config", "r");
     if (f != NULL) {
       fgets(buffer, 1024, f);
       sscanf(buffer, "%s\n", value);
@@ -2644,7 +2644,7 @@
       ink_strncpy(value, "", sizeof(value));
     }
   } else if (strcmp(arg, "FTPUserName") == 0) {
-    f = fopen("conf/yts/internal/ftp_logging.config", "r");
+    f = fopen("etc/trafficserver/internal/ftp_logging.config", "r");
     if (f != NULL) {
       fgets(buffer, 1024, f);
       fgets(buffer, 1024, f);
@@ -2654,7 +2654,7 @@
       ink_strncpy(value, "", sizeof(value));
     }
   } else if (strcmp(arg, "FTPRemoteDir") == 0) {
-    f = fopen("conf/yts/internal/ftp_logging.config", "r");
+    f = fopen("etc/trafficserver/internal/ftp_logging.config", "r");
     if (f != NULL) {
       fgets(buffer, 1024, f);
       fgets(buffer, 1024, f);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/regression.pl
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/regression.pl?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/regression.pl (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/regression.pl Thu Feb  4 05:32:32 2010
@@ -95,10 +95,10 @@
 }
 
 if (!defined($myport)) {
-    if (! (-e "conf/yts/records.config.shadow") && ! ( -e "conf/yts/records.config")) {
-	die "This must be run from traffic/proxy, and you must have conf/yts/records.config.shadow set up.";
+    if (! (-e "etc/trafficserver/records.config.shadow") && ! ( -e "etc/trafficserver/records.config")) {
+	die "This must be run from traffic/proxy, and you must have etc/trafficserver/records.config.shadow set up.";
     }
-    open(S,"<conf/yts/records.config.shadow") || open(S,"<conf/yts/records.config");
+    open(S,"<etc/trafficserver/records.config.shadow") || open(S,"<etc/trafficserver/records.config");
     while (<S>) {
 	if (/proxy.config.http.server_port\s/) {
 	    ($x,$y,$z,$myport) = split(/\s+/);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/ts-instantiate.pl
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/ts-instantiate.pl?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/ts-instantiate.pl (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/ts-instantiate.pl Thu Feb  4 05:32:32 2010
@@ -307,7 +307,7 @@
 
 sub process_other_file_blob {
     my ($file_name) = @_;
-    my $file_path = $run_dir . "/conf/yts/" . $file_name;
+    my $file_path = $run_dir . "/etc/trafficserver/" . $file_name;
     
     open(OTHER_FILE, "> $file_path") || die "Failed to write file $file_name: $!\n";
 
@@ -445,7 +445,7 @@
 }
 
 sub output_remap_config {
-    my $remap_file = $run_dir . "/conf/yts/remap.config";
+    my $remap_file = $run_dir . "/etc/trafficserver/remap.config";
     
     open(REMAP_FILE, "> $remap_file") || die "Failed to write file $remap_file: $!\n";
 
@@ -477,7 +477,7 @@
 }
 
 sub output_ftp_remap_config {
-    my $ftp_remap_file = $run_dir . "/conf/yts/ftp_remap.config";
+    my $ftp_remap_file = $run_dir . "/etc/trafficserver/ftp_remap.config";
     
     open(REMAP_FILE, "> $ftp_remap_file") || die "Failed to write file $ftp_remap_file: $!\n";
 
@@ -509,7 +509,7 @@
 }
 
 sub output_ipnat_conf {
-    my $ipnat_file = $run_dir . "/conf/yts/ipnat.conf";
+    my $ipnat_file = $run_dir . "/etc/trafficserver/ipnat.conf";
     
     open(IPNAT_FILE, "> $ipnat_file") || die "Failed to write file $ipnat_file: $!\n";
 
@@ -542,7 +542,7 @@
 
 
 sub output_filter_config {
-    my $filter_file = $run_dir . "/conf/yts/filter.config";
+    my $filter_file = $run_dir . "/etc/trafficserver/filter.config";
     
     open(FILTER_FILE, "> $filter_file") || die "Failed to write file $filter_file: $!\n";
 
@@ -608,7 +608,7 @@
  "f_pkg/lib"
  );
  
-our @populate_dirs = ( "bin", "conf/yts", "conf/yts/internal", "logs");
+our @populate_dirs = ( "bin", "etc/trafficserver", "etc/trafficserver/internal", "logs");
 
 our %populate_symlinks =
 ( "bin/traffic_server" => "bin/traffic_server",
@@ -618,8 +618,8 @@
   "bin/start_traffic_server" => "bin/start_traffic_server",
   "bin/stop_traffic_server" => "bin/stop_traffic_server",
   "bin/filter_to_policy" => "bin/filter_to_policy",
-  "conf/yts/body_factory" => "conf/yts/body_factory",
-  "conf/yts/plugins" => "conf/yts/plugins",
+  "etc/trafficserver/body_factory" => "etc/trafficserver/body_factory",
+  "etc/trafficserver/plugins" => "etc/trafficserver/plugins",
   "lib" => "lib",
   "ui" => "ui"
 );
@@ -672,8 +672,8 @@
 	}
     }
 
-    my $config_dir_source = $bin_dir . "/conf/yts";
-    my $config_dir_target = $run_dir . "/conf/yts";
+    my $config_dir_source = $bin_dir . "/etc/trafficserver";
+    my $config_dir_target = $run_dir . "/etc/trafficserver";
 
     opendir(CONFIG_SOURCE_DIR, $config_dir_source) ||
 	die "Couldn't open config src dir: $!\n";
@@ -706,7 +706,7 @@
 $bin_dir = $input_args{"bin_dir"};
 
 if ($bin_dir) {
-    $records_config_in = $bin_dir . "/conf/yts/records.config";
+    $records_config_in = $bin_dir . "/etc/trafficserver/records.config";
 } else {
     warn("bin_dir not sent\n");
     exit(1);
@@ -717,10 +717,10 @@
 
 my $records_config_out;
 if ($no_run_dir) {
-    $records_config_out = $bin_dir . "/conf/yts/records.config.shadow";
+    $records_config_out = $bin_dir . "/etc/trafficserver/records.config.shadow";
     $run_dir = $bin_dir;
 } else {
-    $records_config_out = $run_dir . "/conf/yts/records.config";
+    $records_config_out = $run_dir . "/etc/trafficserver/records.config";
 }
 
 if (!$run_dir) {

Modified: incubator/trafficserver/traffic/branches/dev/test/SDKtest/plugin-o-matic
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/SDKtest/plugin-o-matic?rev=906370&r1=906369&r2=906370&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/SDKtest/plugin-o-matic (original)
+++ incubator/trafficserver/traffic/branches/dev/test/SDKtest/plugin-o-matic Thu Feb  4 05:32:32 2010
@@ -97,7 +97,7 @@
   echo "Starting Traffic Server without plugin"
   echo "" > $temp_config_file
   traffic_server_dir=`$rsh cat /etc/traffic_server`
-  config_file="$rhost$traffic_server_dir/conf/yts/plugin.config"
+  config_file="$rhost$traffic_server_dir/etc/trafficserver/plugin.config"
   $rcp $temp_config_file $config_file &
 
   # clear cache



Mime
View raw message