build fixes

Author: dhubler

.gitignore

@@ -0,0 +1,19 @@
+# git-ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+*~
+Makefile.in
+aclocal.m4
+config.h.in
+autom4te.cache
+config/compile
+config/config.guess
+config/config.sub
+config/depcomp
+config/install-sh
+config/ltmain.sh
+config/missing
+configure
+bin.eclipse

config-plugin/test/org/sipfoundry/sipxconfig/callqueue/CallQueueContextImplTestIntegration.java

@@ -9,20 +9,15 @@
 
 package org.sipfoundry.sipxconfig.callqueue;
 
-import java.util.Arrays;
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 
 import org.sipfoundry.sipxconfig.common.CoreContext;
-import org.sipfoundry.sipxconfig.common.User;
-import org.sipfoundry.sipxconfig.common.UserException;
 import org.sipfoundry.sipxconfig.setting.Setting;
 import org.sipfoundry.sipxconfig.test.IntegrationTestCase;
-import org.sipfoundry.sipxconfig.test.TestHelper;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 

etc/Makefile.am

@@ -1,14 +1,24 @@
 include $(top_srcdir)/config/utility.am
 
 confdir = $(SIPX_CONFDIR)/sipxcallqueue
+
+xml = \
+	sipxcallqueue/CallQueueAgent.xml \
+	sipxcallqueue/CallQueue.xml \
+	sipxcallqueue/CallQueueSettings.xml
+
 dist_conf_DATA = \
-	$(wilcard $(srcdir)/sipxcallqueue/*.*)
+	$(xml) \
+	sipxcallqueue/CallQueueAgent.properties \
+	sipxcallqueue/CallQueue.properties \
+	sipxcallqueue/CallQueueSettings.properties
+
 
 fsdir = $(SIPX_CONFDIR)/freeswitch
 dist_fs_DATA = \
-	$(wilcard $(srcdir)/freeswitch/*.*)
+	freeswitch/callcenter.conf.xml.vm
 
 precommit : validate-xml
 
-validate-xml : $(wilcard $(srcdir)/sipxcallqueue/*.xml)
+validate-xml : $(xml)
 	xmllint --noout $^