sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

1. Installers now include all bundles in lib/bundles except junit.

Browse Source 
2. Fix message history finder methods - findFirstAfter and tests for multiple contacts in meta contact.
3. Some threads were not daemon - more to be checked
cusax-fix
Damian Minkov 18 years ago
parent 1e3951d98c
commit bbe43966ff
7 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File

6
resources/install/generic/installer-generic.xml
Unescape View File

@ -72,8 +72,10 @@
<fileset targetdir="$INSTALL_PATH/lib" dir="lib" override="true">
<include name="*.jar"/>
</fileset>
<file targetdir="$INSTALL_PATH/lib/bundle" src="lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar" override="true"/>
<file targetdir="$INSTALL_PATH/lib/bundle/log4j.jar" src="lib/bundle/log4j.jar" override="true"/>
<fileset targetdir="$INSTALL_PATH/lib/bundle" dir="lib/bundle" override="true">
<include name="*.jar"/>
<exclude name="junit.jar"/>
</fileset>
<file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties" override="true"/>
<file targetdir="$INSTALL_PATH/lib" src="resources/install/logging.properties" override="true"/>
</pack>

6
resources/install/linux/installer-linux.xml
Unescape View File

@ -73,8 +73,10 @@
<include name="*.jar"/>
<exclude name="jmf.jar"/>
</fileset>
<file targetdir="$INSTALL_PATH/lib/bundle" src="lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar" override="true"/>
<file targetdir="$INSTALL_PATH/lib/bundle" src="lib/bundle/log4j.jar" override="true"/>
<fileset targetdir="$INSTALL_PATH/lib/bundle" dir="lib/bundle" override="true">
<include name="*.jar"/>
<exclude name="junit.jar"/>
</fileset>
<file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties" override="true"/>
<file targetdir="$INSTALL_PATH/lib" src="resources/install/logging.properties" override="true"/>
</pack>

6
resources/install/windows/installer-windows.xml
Unescape View File

@ -76,8 +76,10 @@
<exclude name="jmf.jar"/>
<exclude name="sound.jar"/>
</fileset>
<file targetdir="$INSTALL_PATH/lib/bundle" src="lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar" override="true"/>
<file targetdir="$INSTALL_PATH/lib/bundle" src="lib/bundle/log4j.jar" override="true"/>
<fileset targetdir="$INSTALL_PATH/lib/bundle" dir="lib/bundle" override="true">
<include name="*.jar"/>
<exclude name="junit.jar"/>
</fileset>
<file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties" override="true"/>
<file targetdir="$INSTALL_PATH/lib" src="resources/install/logging.properties" override="true"/>
</pack>

16
src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java
Unescape View File

@ -335,13 +335,7 @@ public Collection findFirstMessagesAfter(MetaContact contact, Date date,
}
}
LinkedList resultAsList = new LinkedList(result);
int startIndex = resultAsList.size() - count;
if(startIndex < 0)
startIndex = 0;
return resultAsList.subList(startIndex, resultAsList.size());
return new LinkedList(result).subList(0, count);
}
/**
@ -1576,13 +1570,7 @@ public Collection findFirstMessagesAfter(ChatRoom room, Date date, int count)
logger.error("Could not read history", e);
}
LinkedList resultAsList = new LinkedList(result);
int startIndex = resultAsList.size() - count;
if(startIndex < 0)
startIndex = 0;
return resultAsList.subList(startIndex, resultAsList.size());
return new LinkedList(result).subList(0, count);
}
/**

5
src/net/java/sip/communicator/impl/protocol/jabber/ServerStoredContactListJabberImpl.java
Unescape View File

@ -971,6 +971,11 @@ private class ImageRetriever
* list with the accounts with missing image
*/
private Vector contactsForUpdate = new Vector();
ImageRetriever()
{
setDaemon(true);
}
public void run()
{

7
src/net/java/sip/communicator/impl/protocol/zeroconf/ClientThread.java
Unescape View File

@ -82,13 +82,14 @@ public ClientThread(Socket sock, BonjourService bonjourService)
this.remoteIPAddress = sock.getInetAddress();
this.bonjourService = bonjourService;
this.opSetBasicIM = (OperationSetBasicInstantMessagingZeroconfImpl)
bonjourService.getPPS().getSupportedOperationSets()
.get(OperationSetBasicInstantMessaging.class.getName());
bonjourService.getPPS().getSupportedOperationSets()
.get(OperationSetBasicInstantMessaging.class.getName());
this.opSetTyping = (OperationSetTypingNotificationsZeroconfImpl)
bonjourService.getPPS().getSupportedOperationSets()
.get(OperationSetTypingNotifications.class.getName());
this.setDaemon(true);
try
{
out = sock.getOutputStream();

23
test/net/java/sip/communicator/slick/msghistory/TestMsgHistoryService.java
Unescape View File

@ -33,7 +33,8 @@ public class TestMsgHistoryService
{
private static final Logger logger = Logger.getLogger(TestMsgHistoryService.class);
static final String TEST_CONTACT_NAME = "Mincho_Penchev";
static final String TEST_CONTACT_NAME_1 = "Mincho_Penchev_the_fisrt";
static final String TEST_CONTACT_NAME_2 = "Mincho_Penchev_the_second";
static final String TEST_ROOM_NAME = "test_room";
@ -138,7 +139,7 @@ public void setupContact()
MockContactGroup root =
(MockContactGroup)mockPresOpSet.getServerStoredContactListRoot();
testContact = new MockContact(TEST_CONTACT_NAME, mockProvider);
testContact = new MockContact(TEST_CONTACT_NAME_1, mockProvider);
root.addContact(testContact);
metaCLref = MsgHistoryServiceLick.bc.getServiceReference(
@ -163,7 +164,12 @@ public void setupContact()
logger.debug("Registered a mock protocol provider! ");
testMetaContact = metaClService.getRoot().
getMetaContact(mockProvider, TEST_CONTACT_NAME);
getMetaContact(mockProvider, TEST_CONTACT_NAME_1);
// add one more contact as specific problems may happen only when
// more than one contact is in the metacontact
metaClService.addNewContactToMetaContact(
mockProvider, testMetaContact, TEST_CONTACT_NAME_2);
messagesToSend = new Message[]
{
@ -186,7 +192,8 @@ public void writeRecords()
assertNotNull("No metacontact", testMetaContact);
// First deliver message, so they are stored by the message history service
mockBImOpSet.deliverMessage(TEST_CONTACT_NAME, messagesToSend[0]);
mockBImOpSet.deliverMessage(TEST_CONTACT_NAME_1, messagesToSend[0]);
mockBImOpSet.deliverMessage(TEST_CONTACT_NAME_2, messagesToSend[0]);
this.controlDate1 = new Date();
@ -203,9 +210,9 @@ public void writeRecords()
}
}
mockBImOpSet.deliverMessage(TEST_CONTACT_NAME, messagesToSend[1]);
mockBImOpSet.deliverMessage(TEST_CONTACT_NAME_1, messagesToSend[1]);
mockBImOpSet.deliverMessage(TEST_CONTACT_NAME, messagesToSend[2]);
mockBImOpSet.deliverMessage(TEST_CONTACT_NAME_2, messagesToSend[2]);
this.controlDate2 = new Date();
synchronized (lock)
@ -220,9 +227,9 @@ public void writeRecords()
}
}
mockBImOpSet.deliverMessage(TEST_CONTACT_NAME, messagesToSend[3]);
mockBImOpSet.deliverMessage(TEST_CONTACT_NAME_1, messagesToSend[3]);
mockBImOpSet.deliverMessage(TEST_CONTACT_NAME, messagesToSend[4]);
mockBImOpSet.deliverMessage(TEST_CONTACT_NAME_2, messagesToSend[4]);
}

Write Preview
Loading…
Cancel
Save