[Bedework-commit] caldav r502 - in releases/bedework-3.7: .
server/src/org/bedework/caldav/server
server/src/org/bedework/caldav/server/exsynchws
server/src/org/bedework/caldav/server/sysinterface
svnadmin at bedework.org
svnadmin at bedework.org
Thu Feb 24 15:09:41 EST 2011
Author: douglm
Date: 2011-02-24 15:09:40 -0500 (Thu, 24 Feb 2011)
New Revision: 502
Removed:
releases/bedework-3.7/genexsynchwssrc/
releases/bedework-3.7/server/src/org/bedework/caldav/server/exsynchws/NsContext.java
Modified:
releases/bedework-3.7/server/src/org/bedework/caldav/server/CaldavBWIntf.java
releases/bedework-3.7/server/src/org/bedework/caldav/server/exsynchws/ExsynchwsHandler.java
releases/bedework-3.7/server/src/org/bedework/caldav/server/exsynchws/Report.java
releases/bedework-3.7/server/src/org/bedework/caldav/server/sysinterface/SysIntf.java
Log:
Bring 3.7 up to date with bwxml
Minor changes to reduce warnings
Modified: releases/bedework-3.7/server/src/org/bedework/caldav/server/CaldavBWIntf.java
===================================================================
--- releases/bedework-3.7/server/src/org/bedework/caldav/server/CaldavBWIntf.java 2011-02-22 18:23:16 UTC (rev 501)
+++ releases/bedework-3.7/server/src/org/bedework/caldav/server/CaldavBWIntf.java 2011-02-24 20:09:40 UTC (rev 502)
@@ -80,7 +80,7 @@
import org.w3c.dom.Element;
-import ietf.params.xml.ns.icalendar_2.IcalendarType;
+import ietf.params.xml.ns.icalendar_2.Icalendar;
import java.io.CharArrayReader;
import java.io.InputStream;
@@ -901,7 +901,7 @@
*/
public boolean putEvent(final HttpServletRequest req,
final CaldavComponentNode bwnode,
- final IcalendarType ical,
+ final Icalendar ical,
final boolean create,
final String ifEtag) throws WebdavException {
String ifStag = Headers.ifScheduleTagMatch(req);
Modified: releases/bedework-3.7/server/src/org/bedework/caldav/server/exsynchws/ExsynchwsHandler.java
===================================================================
--- releases/bedework-3.7/server/src/org/bedework/caldav/server/exsynchws/ExsynchwsHandler.java 2011-02-22 18:23:16 UTC (rev 501)
+++ releases/bedework-3.7/server/src/org/bedework/caldav/server/exsynchws/ExsynchwsHandler.java 2011-02-24 20:09:40 UTC (rev 502)
@@ -36,6 +36,7 @@
import org.bedework.exsynch.wsmessages.FetchItem;
import org.bedework.exsynch.wsmessages.FetchItemResponse;
import org.bedework.exsynch.wsmessages.GetSycnchInfo;
+import org.bedework.exsynch.wsmessages.NamespaceType;
import org.bedework.exsynch.wsmessages.ObjectFactory;
import org.bedework.exsynch.wsmessages.StartServiceNotification;
import org.bedework.exsynch.wsmessages.StartServiceResponse;
@@ -50,6 +51,8 @@
import edu.rpi.cct.webdav.servlet.shared.WebdavException;
import edu.rpi.cct.webdav.servlet.shared.WebdavNsIntf;
import edu.rpi.cct.webdav.servlet.shared.WebdavNsNode;
+import edu.rpi.sss.util.xml.NsContext;
+import edu.rpi.sss.util.xml.tagdefs.XcalTags;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
@@ -65,7 +68,6 @@
import javax.xml.bind.JAXBElement;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.soap.MessageFactory;
@@ -259,7 +261,8 @@
}
}
- private Document makeDoc(final Object o) throws WebdavException {
+ private Document makeDoc(final QName name,
+ final Object o) throws WebdavException {
try {
Marshaller marshaller = jc.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
@@ -270,7 +273,7 @@
// marshaller.marshal(o, doc);
- marshaller.marshal(new JAXBElement(new QName("uri","local"),
+ marshaller.marshal(new JAXBElement(name,
o.getClass(), o),
doc);
@@ -475,12 +478,18 @@
trace("event: " + ev);
}
- Document doc = makeDoc(getIntf().getSysi().toIcalendar(ev, false));
+ Document doc = makeDoc(XcalTags.icalendar,
+ getIntf().getSysi().toIcalendar(ev, false));
ArrayOfUpdates aupd = ui.getUpdates();
- NamespaceContext ctx = new NsContext(null);
+ NsContext ctx = new NsContext(null);
+ ctx.clear();
+ for (NamespaceType ns: ui.getNamespaces().getNamespaces()) {
+ ctx.add(ns.getPrefix(), ns.getUri());
+ }
+
XPathFactory xpathFact = XPathFactory.newInstance();
XPath xpath = xpathFact.newXPath();
Deleted: releases/bedework-3.7/server/src/org/bedework/caldav/server/exsynchws/NsContext.java
===================================================================
--- releases/bedework-3.7/server/src/org/bedework/caldav/server/exsynchws/NsContext.java 2011-02-22 18:23:16 UTC (rev 501)
+++ releases/bedework-3.7/server/src/org/bedework/caldav/server/exsynchws/NsContext.java 2011-02-24 20:09:40 UTC (rev 502)
@@ -1,91 +0,0 @@
-package org.bedework.caldav.server.exsynchws;
-
-import edu.rpi.sss.util.xml.tagdefs.XcalTags;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-
-/** Class used for diff etc.
- * @author douglm
- *
- */
-public class NsContext implements NamespaceContext {
- private static Map<String, String> keyPrefix = new HashMap<String, String>();
- private static Map<String, String> keyUri = new HashMap<String, String>();
-
- static {
- addToMap("D", "DAV");
- addToMap("C", "urn:ietf:params:xml:ns:caldav");
- addToMap("X", XcalTags.namespace);
- addToMap("df", "urn:ietf:params:xml:ns:pidf-diff");
- }
-
- private String defaultNS;
-
- /** Constructor
- *
- * @param defaultNS
- */
- public NsContext(final String defaultNS) {
- this.defaultNS = defaultNS;
- }
-
- /**
- * @return default ns or null
- */
- public String getDefaultNS() {
- return defaultNS;
- }
-
- public String getNamespaceURI(final String prefix) {
- return keyPrefix.get(prefix);
- }
-
- public Iterator getPrefixes(final String val) {
- return keyPrefix.keySet().iterator();
- }
-
- public String getPrefix(final String uri) {
- if ((defaultNS != null) && uri.equals(defaultNS)) {
- return null;
- }
-
- return keyUri.get(uri);
- }
-
- /** Append the name with abbreviated namespace.
- *
- * @param sb
- * @param nm
- */
- public void appendNsName(final StringBuilder sb,
- final QName nm) {
- String uri = nm.getNamespaceURI();
- String abbr;
-
- if ((defaultNS != null) && uri.equals(defaultNS)) {
- abbr = null;
- } else {
- abbr = keyUri.get(uri);
- if (abbr == null) {
- abbr = uri;
- }
- }
-
- if (abbr != null) {
- sb.append(abbr);
- sb.append(":");
- }
-
- sb.append(nm.getLocalPart());
- }
-
- private static void addToMap(final String prefix, final String uri) {
- keyPrefix.put(prefix, uri);
- keyUri.put(uri, prefix);
- }
-}
Modified: releases/bedework-3.7/server/src/org/bedework/caldav/server/exsynchws/Report.java
===================================================================
--- releases/bedework-3.7/server/src/org/bedework/caldav/server/exsynchws/Report.java 2011-02-22 18:23:16 UTC (rev 501)
+++ releases/bedework-3.7/server/src/org/bedework/caldav/server/exsynchws/Report.java 2011-02-24 20:09:40 UTC (rev 502)
@@ -32,12 +32,13 @@
import edu.rpi.cct.webdav.servlet.common.PropFindMethod;
import edu.rpi.cct.webdav.servlet.shared.WebdavException;
import edu.rpi.cct.webdav.servlet.shared.WebdavNsIntf;
+import edu.rpi.sss.util.xml.NsContext;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import ietf.params.xml.ns.icalendar_2.IcalendarType;
+import ietf.params.xml.ns.icalendar_2.Icalendar;
import java.io.StringReader;
import java.io.StringWriter;
@@ -166,8 +167,8 @@
}
}
- IcalendarType fetch(final String resourceUri,
- final String uid) throws WebdavException {
+ Icalendar fetch(final String resourceUri,
+ final String uid) throws WebdavException {
// Build a report query and execute it.
StringBuilder sb = new StringBuilder();
Modified: releases/bedework-3.7/server/src/org/bedework/caldav/server/sysinterface/SysIntf.java
===================================================================
--- releases/bedework-3.7/server/src/org/bedework/caldav/server/sysinterface/SysIntf.java 2011-02-22 18:23:16 UTC (rev 501)
+++ releases/bedework-3.7/server/src/org/bedework/caldav/server/sysinterface/SysIntf.java 2011-02-24 20:09:40 UTC (rev 502)
@@ -48,7 +48,7 @@
import net.fortuna.ical4j.model.Calendar;
-import ietf.params.xml.ns.icalendar_2.IcalendarType;
+import ietf.params.xml.ns.icalendar_2.Icalendar;
import java.io.Reader;
import java.io.Writer;
@@ -621,7 +621,7 @@
* @return IcalendarType
* @throws WebdavException
*/
- public IcalendarType toIcalendar(CalDAVEvent ev,
+ public Icalendar toIcalendar(CalDAVEvent ev,
boolean incSchedMethod) throws WebdavException;
/** Convert a Calendar to it's string form
@@ -691,7 +691,7 @@
* @throws WebdavException
*/
public SysiIcalendar fromIcal(CalDAVCollection col,
- final IcalendarType ical,
+ final Icalendar ical,
IcalResultType rtype) throws WebdavException;
/** Create a Calendar object from the named timezone and convert to
More information about the Bedework-commit
mailing list