[iCal4j-commit] ical4j-connector/src/main/java/net/fortuna/ical4j/connector/dav PathResolver.java, 1.3, 1.4 AbstractDavObjectCollection.java, 1.5, 1.6

[Ben F. <fo...@us...>]

Update of /cvsroot/ical4j/ical4j-connector/src/main/java/net/fortuna/ical4j/connector/dav
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15040/src/main/java/net/fortuna/ical4j/connector/dav

Modified Files:
	PathResolver.java AbstractDavObjectCollection.java 
Log Message:
Applied patch #2734152 - added path resolvers for iCal Server/Calendar Server

Index: AbstractDavObjectCollection.java
===================================================================
RCS file: /cvsroot/ical4j/ical4j-connector/src/main/java/net/fortuna/ical4j/connector/dav/AbstractDavObjectCollection.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractDavObjectCollection.java	18 Jan 2009 08:38:42 -0000	1.5
--- AbstractDavObjectCollection.java	6 Apr 2009 09:19:56 -0000	1.6
***************
*** 89,93 ****
       */
      public final String getPath() {
!         return getStore().getPath() + getId();
      }
  
--- 89,93 ----
       */
      public final String getPath() {
!         return getId();
      }
  

Index: PathResolver.java
===================================================================
RCS file: /cvsroot/ical4j/ical4j-connector/src/main/java/net/fortuna/ical4j/connector/dav/PathResolver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PathResolver.java	2 Apr 2009 12:57:36 -0000	1.3
--- PathResolver.java	6 Apr 2009 09:19:56 -0000	1.4
***************
*** 52,55 ****
--- 52,60 ----
  	public static final PathResolver ZIMBRA = new ZimbraPathResolver();
  	
+ 	public static final PathResolver ICAL_SERVER = new ICalServerPathResolver();
+ 
+ 	public static final PathResolver CALENDAR_SERVER = new CalendarServerPathResolver();
+ 
+ 	
  	/**
  	 * Resolves the path component for a user's calendar store URL.
***************
*** 177,180 ****
--- 182,237 ----
  		}
  	}
+ 	
+ 	/**
+ 	 * A {@link PathResolver} implementation for connecting to iCal Server (Mac OS X Server) instances.
+ 	 *
+ 	 * @author Pascal Robert
+ 	 *
+ 	 * Created on: 05/04/2009
+ 	 */
+ 	private static class ICalServerPathResolver extends PathResolver {
+ 		
+ 		/* (non-Javadoc)
+ 		 * @see net.fortuna.ical4j.connector.dav.PathResolver#getPrincipalPath(java.lang.String)
+ 		 */
+ 		@Override
+ 		public String getPrincipalPath(String username) {
+ 	    	return "/principals/users/" + username + "/";
+ 		}
+ 		
+ 		/* (non-Javadoc)
+ 		 * @see net.fortuna.ical4j.connector.dav.PathResolver#getUserPath(java.lang.String)
+ 		 */
+ 		@Override
+ 		public String getUserPath(String username) {
+ 			return "/dav/" + username + "/";
+ 		}
+ 	}
+ 	
+ 	/**
+ 	 * A {@link PathResolver} implementation for connecting to Calendar Server (open source version of iCal Server) instances.
+ 	 *
+ 	 * @author Pascal Robert
+ 	 *
+ 	 * Created on: 05/04/2009
+ 	 */
+ 	private static class CalendarServerPathResolver extends PathResolver {
+ 		
+ 		/* (non-Javadoc)
+ 		 * @see net.fortuna.ical4j.connector.dav.PathResolver#getPrincipalPath(java.lang.String)
+ 		 */
+ 		@Override
+ 		public String getPrincipalPath(String username) {
+ 	    	return "/principals/users/" + username + "/";
+ 		}
+ 		
+ 		/* (non-Javadoc)
+ 		 * @see net.fortuna.ical4j.connector.dav.PathResolver#getUserPath(java.lang.String)
+ 		 */
+ 		@Override
+ 		public String getUserPath(String username) {
+ 			return "/dav/" + username + "/";
+ 		}
+ 	}
  
  }