xlawrence 2005/01/21 16:40:48 CET
Modified files:
calClient/webapp/admin/src/webapp/WEB-INF web.xml
calClient/webapp/uiclient/src/webapp/WEB-INF web.xml
syncServer/src/java/org/jahia/suite/calendar/sync4jModule
CalendarSyncSource.java
Revision Changes Path
1.8 +17 -1
uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/web.xml.diff?r1=1.7&r2=1.8&f=h
1.6 +8 -2
uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/web.xml.diff?r1=1.5&r2=1.6&f=h
1.3 +5 -2
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.2&r2=1.3&f=h
Index: web.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- web.xml 21 Jan 2005 11:02:50 -0000 1.7
+++ web.xml 21 Jan 2005 15:40:48 -0000 1.8
@@ -37,6 +37,23 @@
<param-value>@APP-NAME@</param-value>
</context-param>
+ <filter>
+ <filter-name>SvcI Filter</filter-name>
+ <filter-class>edu.rpi.cct.uwcal.webcommon.UWCalSvciFilter</filter-class>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>@RPI-DEBUG@</param-value>
+ </init-param>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>SvcI Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+
<listener>
<listener-class>edu.rpi.sss.util.jsp.SessionListener</listener-class>
</listener>
@@ -126,7 +143,6 @@
<servlet-name>uwCal-AdminApp</servlet-name>
<url-pattern>/uwCal-AdminApp</url-pattern>
</servlet-mapping>
-
-->
<session-config>
Index: web.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- web.xml 21 Jan 2005 08:51:29 -0000 1.5
+++ web.xml 21 Jan 2005 15:40:48 -0000 1.6
@@ -49,7 +49,7 @@
<param-value>no</param-value>
</init-param>
</filter>
-
+
<filter>
<filter-name>SvcI Filter</filter-name>
<filter-class>edu.rpi.cct.uwcal.webcommon.UWCalSvciFilter</filter-class>
@@ -62,11 +62,17 @@
<filter-mapping>
<filter-name>SvcI Filter</filter-name>
<url-pattern>/*</url-pattern>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>REQUEST</dispatcher>
</filter-mapping>
-
+
<filter-mapping>
<filter-name>XSLT Filter</filter-name>
<url-pattern>/*</url-pattern>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>REQUEST</dispatcher>
</filter-mapping>
<listener>
Index: CalendarSyncSource.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/sync4jModule/CalendarSyncSource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CalendarSyncSource.java 12 Jan 2005 16:34:27 -0000 1.2
+++ CalendarSyncSource.java 21 Jan 2005 15:40:48 -0000 1.3
@@ -80,6 +80,8 @@
private CalendarManager cm;
private boolean loaded;
+ private int syncMode;
+
public String getName() {
return NAME;
}
@@ -99,6 +101,7 @@
throws SyncSourceException {
log.info("beginSync: "+principal+": "+syncMode);
cm = new CalendarManager(this);
+ this.syncMode = syncMode;
}
/**
@@ -199,8 +202,8 @@
syncItem.getKey().getKeyAsString() + ")");
// Sync4j contains a bug !!! The mapping is not done correctly when
a
- // twin item is found
- if (true) return null;
+ // twin item is found and we are in FAST synch
+ if (syncMode != sync4j.framework.core.AlertCode.SLOW) return null;
SyncItem[] syncItems =
getSyncItemsFromTwins(principal, new SyncItem[] {syncItem});
