xlawrence 2005/05/09 14:49:42 CEST
Modified files:
syncServer project.xml
syncServer/src/java/org/jahia/suite/calendar/sync4jModule
CalendarSyncSource.java
syncServer/src/java/org/jahia/suite/calendar/syncServer
CalendarManager.java
JMSAgent.java
syncServer/src/java/org/jahia/suite/calendar/test
SyncTransportAgentTest.java
Log:
Updated sources
Revision Changes Path
1.3 +2 -2 uwcal_JSR168/syncServer/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/syncServer/project.xml.diff?r1=1.2&r2=1.3&f=h
1.9 +1 -1
uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/sync4jModule/CalendarSyncSource.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/sync4jModule/CalendarSyncSource.java.diff?r1=1.8&r2=1.9&f=h
1.8 +1 -1
uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/syncServer/CalendarManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/syncServer/CalendarManager.java.diff?r1=1.7&r2=1.8&f=h
1.4 +11 -3
uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/syncServer/JMSAgent.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/syncServer/JMSAgent.java.diff?r1=1.3&r2=1.4&f=h
1.2 +1 -1
uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/test/SyncTransportAgentTest.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/test/SyncTransportAgentTest.java.diff?r1=1.1&r2=1.2&f=h
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/syncServer/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 1 Feb 2005 09:34:36 -0000 1.2
+++ project.xml 9 May 2005 12:49:41 -0000 1.3
@@ -30,7 +30,7 @@
<pomVersion>3</pomVersion>
<id>uwCalSync4jSync-syncServer</id>
<name>Sync Server Connector</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.0-SNAPSHOT</currentVersion>
<package>org.jahia.suite.calendar</package>
@@ -38,7 +38,7 @@
<dependency>
<groupId>uwCalSync4jSync-framework</groupId>
<artifactId>uwCalSync4jSync-framework</artifactId>
- <version>1.0</version>
+ <version>1.0-SNAPSHOT</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
Index: CalendarSyncSource.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/sync4jModule/CalendarSyncSource.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CalendarSyncSource.java 11 Feb 2005 13:44:23 -0000 1.8
+++ CalendarSyncSource.java 9 May 2005 12:49:41 -0000 1.9
@@ -210,7 +210,7 @@
// Sync4j contains a bug !!! The mapping is not done correctly when a
// twin item is found and we are in FAST synch
- if (syncMode != sync4j.framework.core.AlertCode.SLOW) return null;
+ // if (syncMode != sync4j.framework.core.AlertCode.SLOW) return null;
SyncItem[] syncItems =
getSyncItemsFromTwins(principal, new SyncItem[] {syncItem});
Index: CalendarManager.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/syncServer/CalendarManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CalendarManager.java 11 Feb 2005 13:44:24 -0000 1.7
+++ CalendarManager.java 9 May 2005 12:49:42 -0000 1.8
@@ -130,7 +130,7 @@
TransportSender tAgent = new TransportSenderFactory().
createTransportSender(TransportSenderFactory.JMS);
try {
- tAgent.start();
+ tAgent.start("localhost", 16400);
} catch (Exception e){
log.fatal(e);
throw new SyncException(e.getMessage(), e);
Index: JMSAgent.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/syncServer/JMSAgent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMSAgent.java 10 Feb 2005 09:06:22 -0000 1.3
+++ JMSAgent.java 9 May 2005 12:49:42 -0000 1.4
@@ -101,15 +101,23 @@
* Initializes JMS transport ressources
* @see org.jahia.suite.calendar.framework.Transport
*/
- public void start() throws TransportException {
+ public void start(String host, int port) throws TransportException {
+
+ if (host == null || host.length() < 1) {
+ host = "localhost";
+ port = 16400;
+ }
+
+ if (port < 1024) port = 16400;
+
if (!started) {
try {
// Create the JNDI context
Hashtable context = new Hashtable(0);
context.put(Context.INITIAL_CONTEXT_FACTORY,
"fr.dyade.aaa.jndi2.client.NamingContextFactory");
- context.put("java.naming.factory.host", "localhost");
- context.put("java.naming.factory.port", "16400");
+ context.put("java.naming.factory.host", host);
+ context.put("java.naming.factory.port",
Integer.toString(port));
Context jndiCtx = new javax.naming.InitialContext(context);
connFactory = (javax.jms.QueueConnectionFactory)
Index: SyncTransportAgentTest.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/test/SyncTransportAgentTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SyncTransportAgentTest.java 5 Jan 2005 10:04:26 -0000 1.1
+++ SyncTransportAgentTest.java 9 May 2005 12:49:42 -0000 1.2
@@ -75,7 +75,7 @@
"syncServer");
if (!tAgent.started) {
log.debug("TransportAgent not started, starting...");
- tAgent.start();
+ tAgent.start("localhost", 16400);
}
log.info("TransportAgent started. Sending simple Requests...");
