Dale Worley wrote: > On Wed, 2009-04-29 at 16:30 -0400, Damian Krzeminski wrote: >> Looks to me like it can be safely removed from sipXconfig entirely. > > It sounds like a good idea to me, but I don't know how to go about it. > > Dale > >
I attached the patch. I ran the build and tests on sipXconfig and it worked OK. Just to make sure: we are talking mainline changes not 4.0 changes, right? Damian
>From 105d011045fb6e486a8b94cd6fcbd8a4d7d3d299 Mon Sep 17 00:00:00 2001 From: Damian Krzeminski <[email protected]> Date: Thu, 30 Apr 2009 10:12:11 -0400 Subject: [PATCH] Remove references to FREESWITCH_PREFIX --- sipXconfig/build.properties.in | 1 - sipXconfig/neoconf/build.xml | 1 - sipXconfig/neoconf/etc/sipxconfig.properties.in | 1 - sipXconfig/neoconf/etc/sipxconfig.properties.map | 1 + .../org/sipfoundry/sipxconfig/test/TestUtil.java | 1 - 5 files changed, 1 insertions(+), 4 deletions(-) diff --git a/sipXconfig/build.properties.in b/sipXconfig/build.properties.in index 34bebe0..f63259e 100644 --- a/sipXconfig/build.properties.in +++ b/sipXconfig/build.properties.in @@ -40,7 +40,6 @@ sipxconfig.upload.d...@sipx_vardir@/upload sipxconfig.phonebook.d...@sipx_vardir@/phonebook sipxvxml.data.d...@sipx_vxmldatadir@ www.d...@wwwdir@ -freeswitch.prefix.d...@freeswitch_prefix@ xargs.repla...@xargs_replace@ sipxpbx.libexec.d...@sipx_libexecdir@ diff --git a/sipXconfig/neoconf/build.xml b/sipXconfig/neoconf/build.xml index d02d86b..5fa00a7 100644 --- a/sipXconfig/neoconf/build.xml +++ b/sipXconfig/neoconf/build.xml @@ -123,7 +123,6 @@ <replacefilter token="@www.dir@" property="www.dir" /> <replacefilter token="@mrtg-enabled@" property="mrtg-enabled" /> <replacefilter token="@debug@" property="debug" /> - <replacefilter token="@freeswitch.prefix.dir@" property="freeswitch.prefix.dir" /> <replacefilter token="@sipxpbx.libexec.dir@" property="sipxpbx.libexec.dir" /> </replace> diff --git a/sipXconfig/neoconf/etc/sipxconfig.properties.in b/sipXconfig/neoconf/etc/sipxconfig.properties.in index 7d9ec47..645d563 100644 --- a/sipXconfig/neoconf/etc/sipxconfig.properties.in +++ b/sipXconfig/neoconf/etc/sipxconfig.properties.in @@ -66,7 +66,6 @@ sysdir.build_number=0000 sysdir.comment=opendev [email protected]@ [email protected]@/doc [email protected]@ [email protected]@/mailstore [email protected]@ [email protected]@/prompts diff --git a/sipXconfig/neoconf/etc/sipxconfig.properties.map b/sipXconfig/neoconf/etc/sipxconfig.properties.map index c2b0365..2d59275 100644 --- a/sipXconfig/neoconf/etc/sipxconfig.properties.map +++ b/sipXconfig/neoconf/etc/sipxconfig.properties.map @@ -67,3 +67,4 @@ sipImpl.port : sip.port - : conferenceConference.admissionScriptServer - : conferenceBridge.admissionServer - : polycom.defaultVersionId +- : sysdir.freeswitch diff --git a/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/test/TestUtil.java b/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/test/TestUtil.java index 726522d..2ea3ad4 100644 --- a/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/test/TestUtil.java +++ b/sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/test/TestUtil.java @@ -180,7 +180,6 @@ public final class TestUtil { sysProps.setProperty("sysdir.tmp", tmpDir); sysProps.setProperty("sysdir.log", outputDirectory); sysProps.setProperty("sysdir.doc", outputDirectory); - sysProps.setProperty("sysdir.freeswitch", outputDirectory + "/freeswitch"); sysProps.setProperty("sysdir.mailstore", mailstoreDir); sysProps.setProperty("sysdir.vxml", vxmlDir); sysProps.setProperty("sysdir.vxml.prompts", vxmlDir + "/prompts"); -- 1.6.0.6
_______________________________________________ sipx-dev mailing list [email protected] List Archive: http://list.sipfoundry.org/archive/sipx-dev Unsubscribe: http://list.sipfoundry.org/mailman/listinfo/sipx-dev
