aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2006-09-26 19:54:46 +0000
committerDamian Minkov <damencho@jitsi.org>2006-09-26 19:54:46 +0000
commit7635897527bc370db8eac40fa4b005db70926c37 (patch)
tree0e1a5df4404f9edb3aa4e3f737733f4b779c79bf /lib
parent6dfb7e27c1234252efaa18f4b061def0a71ba141 (diff)
downloadjitsi-7635897527bc370db8eac40fa4b005db70926c37.zip
jitsi-7635897527bc370db8eac40fa4b005db70926c37.tar.gz
jitsi-7635897527bc370db8eac40fa4b005db70926c37.tar.bz2
fix some commits by mistake
Diffstat (limited to 'lib')
-rw-r--r--lib/accounts.properties.template8
-rw-r--r--lib/logging.properties1
-rw-r--r--lib/testing.properties24
3 files changed, 16 insertions, 17 deletions
diff --git a/lib/accounts.properties.template b/lib/accounts.properties.template
index 11be24b..7005191 100644
--- a/lib/accounts.properties.template
+++ b/lib/accounts.properties.template
@@ -105,15 +105,19 @@ accounts.jabber.account1.USER_ID=
accounts.jabber.account1.PASSWORD=
# The server to be used from account 1
accounts.jabber.account1.SERVER_ADDRESS=
+# The server port to be used from account 1
+accounts.jabber.account1.SERVER_PORT=
# The address of the second tested account
accounts.jabber.account2.USER_ID=
# The password of the second tested account
accounts.jabber.account2.PASSWORD=
# The server to be used from account 2
accounts.jabber.account2.SERVER_ADDRESS=
+# The server port to be used from account 2
+accounts.jabber.account2.SERVER_PORT=
# The contact list that will be created and will be tested is it created OK.
# The value of the CONTACT_LIST property
# must be a space separated string containing elements each of which is in the
# format: GroupName.ADDRESS
-accounts.jabber.CONTACT_LIST=test-group.damencho@gmail.com test-group.damenchodev2@gmail.com
-accounts.reporting.JABBER_REPORT_LIST=damencho@gmail.com
+accounts.jabber.CONTACT_LIST=
+accounts.reporting.JABBER_REPORT_LIST=
diff --git a/lib/logging.properties b/lib/logging.properties
index d4d2d17..79ebd89 100644
--- a/lib/logging.properties
+++ b/lib/logging.properties
@@ -52,7 +52,6 @@ java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLo
# We don't want trace logs from joscar and joustsim
net.kano.level = INFO
# But we want everything coming from the sip-comm
-net.java.sip.communicator.impl.level = FINEST
net.java.sip.communicator.impl.contactlist.level = FINEST
net.java.sip.communicator.slick.level = FINEST
diff --git a/lib/testing.properties b/lib/testing.properties
index 52e2e02..74a0b96 100644
--- a/lib/testing.properties
+++ b/lib/testing.properties
@@ -2,20 +2,16 @@
# environment when running automated testing.
# A list of all tests that should be run by the test target of the project.
-#test.list=ConfigurationServiceLick \
-# MediaServiceLick \
-# NetworkAddressManagerServiceLick \
-# FileAccessServiceLick \
-# HistoryServiceLick \
-# SlicklessTests \
-# MetaContactListServiceLick \
-# IcqProtocolProviderSlick \
-# SipProtocolProviderServiceLick \
-# MsgHistoryServiceLick
-
-test.list=JabberProtocolProviderSlick
-
-
+test.list=ConfigurationServiceLick \
+ MediaServiceLick \
+ NetworkAddressManagerServiceLick \
+ FileAccessServiceLick \
+ HistoryServiceLick \
+ SlicklessTests \
+ MetaContactListServiceLick \
+ IcqProtocolProviderSlick \
+ SipProtocolProviderServiceLick \
+ MsgHistoryServiceLick
# Set the name of the meta contact list file to use during testing so that
# we do not meddle with the file we're using while running the application