Create merge branch for merging user_dworley_redirectors into main.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7876 a612230a-c5fa-0310-af8b-88eea846685b
Initialized merge tracking via svnmerge with revisions 1-7875 from
https://scm.sipfoundry.org/rep/sipX/main


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7877 a612230a-c5fa-0310-af8b-88eea846685b
Initialized merge tracking via svnmerge with revisions 1-7203 from
https://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7879 a612230a-c5fa-0310-af8b-88eea846685b
Mark as merged revisions that set up the properties on user_dworley_redirectors.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7880 a612230a-c5fa-0310-af8b-88eea846685b
mergefrom user_dworley_redirectors2main 7345

Remove "config" externals, in preparation for merging with the latest
main, which has the new build system, and replaces these
subdirectories with symbolic links.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7882 a612230a-c5fa-0310-af8b-88eea846685b
mergefrom user_dworley_redirectors2main 7348

Fix bollixed merge properties.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7883 a612230a-c5fa-0310-af8b-88eea846685b
mergefrom user_dworley_redirectors2main 7350

Test checking of added link.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7884 a612230a-c5fa-0310-af8b-88eea846685b
svnmerge never -r 7361,7362 -L user_dworley_redirectors2main

These changes have already been incorporated:
Remove ./build.
Copy ./build from Main.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7885 a612230a-c5fa-0310-af8b-88eea846685b
mergefrom user_dworley_redirectors2main 7444

Clean up properties.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7886 a612230a-c5fa-0310-af8b-88eea846685b
mergefrom user_dworley_redirectors2main 7445
(This merge compiles, but a number of things have not been resolved:
SipRedirectorAuthRouter and merging changes of files that have been
superseded.)

First compilable version of implementing the redirectors via Plugin.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7888 a612230a-c5fa-0310-af8b-88eea846685b
Porting changes to sipXregistry on sipx-main into the merge branch.

The files that were moved in the redirector branch, and thus copied
into the merge branch, are:

r7445 | dworley | 2006-09-11 00:44:47 -0400 (Mon, 11 Sep 2006) | 2 lines
Changed paths:
   A /branches/user_dworley_redirectors/sipXregistry/include/registry/RedirectPlugin.h (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirector.h:7443)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins (from /branches/user_dworley_redirectors/sipXregistry/lib/plugin:7443)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins/SipRedirectorRegDB.cpp (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectorRegDB.cpp:7443)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins/SipRedirectorRegDB.h (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectorRegDB.h:7443)
   A /branches/user_dworley_redirectors/sipXregistry/lib/register_plugins (from /branches/user_dworley_redirectors/sipXregistry/lib/plugin:7443)
   A /branches/user_dworley_redirectors/sipXregistry/src/RedirectPlugin.cpp (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirector.cpp:7443)

The merge operations to bring forward changes from sipx-main are:

svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/lib/plugin sipXregistry/lib/register_plugins
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirector.h sipXregistry/include/registry/RedirectPlugin.h 
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorRegDB.cpp sipXregistry/lib/redirect_plugins/SipRedirectorRegDB.cpp 
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorRegDB.h sipXregistry/lib/redirect_plugins/SipRedirectorRegDB.h
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorRegDB.x sipXregistry/lib/redirect_plugins/SipRedirectorRegDB.h
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirector.cpp sipXregistry/lib/redirect_plugins/RedirectPlugin.cpp
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirector.cpp sipXregistry/src/RedirectPlugin.cpp 


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7889 a612230a-c5fa-0310-af8b-88eea846685b
mergefrom user_dworley_redirectors2main 7458

Copy Apache modules into an architecture-dependent directory.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7890 a612230a-c5fa-0310-af8b-88eea846685b
mergefrom user_dworley_redirectors2main 7459

Convert the redirector modules into real Plugins.

Carry forward changes on these files:

r7459 | dworley | 2006-09-11 23:58:45 -0400 (Mon, 11 Sep 2006) | 2 lines
Changed paths:
   A /branches/user_dworley_redirectors/sipXregistry/include/registry/RedirectSuspend.h (from /branches/user_dworley_redirectors/sipXregistry/src/RedirectSuspend.h:7445)
   A /branches/user_dworley_redirectors/sipXregistry/include/registry/SipRedirectServer.h (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectServer.h:7445)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins/SipRedirectorAliasDB.cpp (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectorAliasDB.cpp:7443)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins/SipRedirectorAliasDB.h (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectorAliasDB.h:7443)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins/SipRedirectorHunt.cpp (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectorHunt.cpp:7443)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins/SipRedirectorHunt.h (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectorHunt.h:7443)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins/SipRedirectorMPT.cpp (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectorMPT.cpp:7443)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins/SipRedirectorMPT.h (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectorMPT.h:7443)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins/SipRedirectorMapping.cpp (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectorMapping.cpp:7443)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins/SipRedirectorMapping.h (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectorMapping.h:7443)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins/SipRedirectorPickUp.cpp (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectorPickUp.cpp:7445)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins/SipRedirectorPickUp.h (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectorPickUp.h:7443)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins/SipRedirectorSubscribe.cpp (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectorSubscribe.cpp:7443)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins/SipRedirectorSubscribe.h (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectorSubscribe.h:7443)

svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/RedirectSuspend.h sipXregistry/include/registry/RedirectSuspend.h 
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectServer.h sipXregistry/include/registry/SipRedirectServer.h 
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorAliasDB.cpp sipXregistry/lib/redirect_plugins/SipRedirectorAliasDB.cpp 
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorAliasDB.h sipXregistry/lib/redirect_plugins/SipRedirectorAliasDB.h 
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorHunt.cpp sipXregistry/lib/redirect_plugins/SipRedirectorHunt.cpp
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorHunt.h sipXregistry/lib/redirect_plugins/SipRedirectorHunt.h
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorMPT.cpp sipXregistry/lib/redirect_plugins/SipRedirectorMPT.cpp
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorMPT.h sipXregistry/lib/redirect_plugins/SipRedirectorMPT.h
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorMapping.cpp sipXregistry/lib/redirect_plugins/SipRedirectorMapping.cpp
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorMapping.h sipXregistry/lib/redirect_plugins/SipRedirectorMapping.h
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorPickUp.cpp sipXregistry/lib/redirect_plugins/SipRedirectorPickUp.cpp
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorPickUp.h sipXregistry/lib/redirect_plugins/SipRedirectorPickUp.h
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorSubscribe.cpp sipXregistry/lib/redirect_plugins/SipRedirectorSubscribe.cpp
svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorSubscribe.h sipXregistry/lib/redirect_plugins/SipRedirectorSubscribe.h


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7891 a612230a-c5fa-0310-af8b-88eea846685b
mergefrom user_dworley_redirectors2main 7470

Turn SipRedirectorCallerAlias into a Plugin, including relocating
SipRegistrar.h to include/registry, so it can be used by Plugins.

Including bringing forward changes for:

r7470 | dworley | 2006-09-12 23:41:53 -0400 (Tue, 12 Sep 2006) | 3 lines
Changed paths:
   A /branches/user_dworley_redirectors/sipXregistry/include/registry/SipRegistrar.h (from /branches/user_dworley_redirectors/sipXregistry/src/SipRegistrar.h:7468)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins/SipRedirectorCallerAlias.cpp (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectorCallerAlias.cpp:7468)
   A /branches/user_dworley_redirectors/sipXregistry/lib/redirect_plugins/SipRedirectorCallerAlias.h (from /branches/user_dworley_redirectors/sipXregistry/src/SipRedirectorCallerAlias.h:7468)

svn merge -r 7203:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRegistrar.h sipXregistry/include/registry/SipRegistrar.h 
svn merge -r 7455:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorCallerAlias.cpp sipXregistry/lib/redirect_plugins/SipRedirectorCallerAlias.cpp 
svn merge -r 7455:7876 https://scm.sipfoundry.org/rep/sipX/main/sipXregistry/src/SipRedirectorCallerAlias.h sipXregistry/lib/redirect_plugins/SipRedirectorCallerAlias.h


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7892 a612230a-c5fa-0310-af8b-88eea846685b
mergefrom user_dworley_redirectors2main 7522

Add ISN dialing redirector.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7893 a612230a-c5fa-0310-af8b-88eea846685b
mergefrom user_dworley_redirectors2main 7591

Add reference to OsDefs.h to support strcasecmp.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7894 a612230a-c5fa-0310-af8b-88eea846685b
mergefrom user_dworley_redirectors2main 7646,7651,7652-7654,7669

Tidy up the ISN redirector, including allowing for a dialing prefix.
Finish tidying up the ISN redirector.
Build it by default.
Fix code bugs.
Adjust default registrar-config.in to match the new property names.
Make sure that all the necessary code sees -DRES_PARSE_NAPTR.
Minor update in GRUU processing.
Use CpCallManager::getNewCallId to generate call-ID, rather than going
to a lot of effort.
Update registrar-config.in to use sequence numbers 110, 120, etc.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7895 a612230a-c5fa-0310-af8b-88eea846685b
mergefrom user_dworley_redirectors2main 7670,7671,7690

Relocate test redirector to redirect_plugins, in preparation for
making it into a plugin.
Revise SipRedirectorTest to work as a plugin.
Add join redirector.  (Actually, join redirector was added in rev
7682, this rev modifies it and several other files.)


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7896 a612230a-c5fa-0310-af8b-88eea846685b
Parts of user_dworley_redirectors2main 7682 and 7690.

Get SipRedirectorJoin.{h,cpp} installed.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7897 a612230a-c5fa-0310-af8b-88eea846685b
mergefrom user_dworley_redirectors2main 7692,7738,7741,7744,7747,7748,7751-7756,7766

Merge a large number of small changes.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/user_dworley_redirectors_merge@7902 a612230a-c5fa-0310-af8b-88eea846685b