updating VersionControlMethod.java
setting VersionControlMethod.java in edit mode
***** end *****
updating PropFindMethod.java
setting PropFindMethod.java in edit mode
***** end *****
cvs unedit PropFindMethod.java (in directory
D:\Projects\jakarta\jakarta-slide\src\webdav\server\org\apache\slide\webdav\
method\)
*****CVS exited normally with code 0*****
Saved settings for D:\Projects\jakarta successfully...
cvs diff VersionControlMethod.java (in directory
D:\Projects\jakarta\jakarta-slide\src\webdav\server\org\apache\slide\webdav\
method\)
Index: VersionControlMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/Ver
sionControlMethod.java,v
retrieving revision 1.2
diff -r1.2 VersionControlMethod.java
83c83,85
< import org.apache.slide.webdav.util.DeltavHelper;
---
> import org.apache.slide.webdav.util.VersioningHelper;
> import org.apache.slide.webdav.util.PropertyHelper;
> import org.apache.slide.webdav.util.MethodHelper;
137,138d138
< System.out.println("@@@@ VERSION-CONTROL: it works!!");
<
143,257c143,145
< UriHandler uh = UriHandler.getUriHandler( token, resourcePath
);
< DeltavHelper dvh = DeltavHelper.getDeltavHelper( token );
< Iterator i;
<
< String nrdsPath = resourcePath;
< if( uh.isVersionUri() )
< nrdsPath = uh.getAssociatedHistoryUri();
<
< System.out.println("@@@@ nrdsPath: "+nrdsPath);
<
< NodeRevisionDescriptors vcrNrds = content.retrieve(
slideToken, nrdsPath );
< NodeRevisionDescriptor vcrNrd = content.retrieve( slideToken,
vcrNrds );
< NodeRevisionContent vcrNrc = content.retrieve( slideToken,
vcrNrds, vcrNrd );
< String resourceKind = dvh.determineResourceKind( vcrNrd );
<
< System.out.println("@@@@ resourceKind: "+resourceKind);
<
< if( !dvh.isSupportedMethod(M_VERSION_CONTROL, resourceKind) )
{
< resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
< return;
< }
<
< // Check for resourceKind = K_VERSION_CONTROLLED*
< if( resourceKind == K_VERSION_CONTROLLED ) {
< // nothing to do
< resp.setStatus(WebdavStatus.SC_OK);
< return;
< }
<
< // Set initial VR properties
< NodeRevisionDescriptor vrNrd =
< new NodeRevisionDescriptor(req.getContentLength());
< i = dvh.createInitialProperties(K_VERSION).iterator();
< while( i.hasNext() )
< vrNrd.setProperty( (NodeProperty)i.next() );
<
< // Set initial VHR properties
< NodeRevisionNumber vhrNrn = new NodeRevisionNumber( 0, 0 );
//major=0; minor=0
< Vector vhrLabels = new Vector();
< Hashtable vhrProps = new Hashtable();
< String vhrBranch = NodeRevisionDescriptors.MAIN_BRANCH;
< NodeRevisionDescriptor vhrNrd =
< new NodeRevisionDescriptor( vhrNrn, vhrBranch, vhrLabels,
vhrProps );
< i = dvh.createInitialProperties(K_VERSION_HISTORY).iterator();
< while( i.hasNext() )
< vhrNrd.setProperty( (NodeProperty)i.next() );
<
< // Set initial VCR properties (do not overwrite existing!!)
< i =
dvh.createInitialProperties(K_VERSION_CONTROLLED).iterator();
< while( i.hasNext() ) {
< NodeProperty p = (NodeProperty)i.next();
< if( !vcrNrd.exists(p.getName()) )
< vcrNrd.setProperty( p );
< }
<
< // Create VHR/VR
< UriHandler vhrUri = UriHandler.createNextHistoryUri(
slideToken, token );
< String vhrUriStr = String.valueOf( vhrUri );
< SubjectNode vhrNode = new SubjectNode();
< structure.create( slideToken, vhrNode, String.valueOf(vhrUri)
);
< content.create( slideToken, vhrUriStr, true );
//isVersioned=true
< content.create( slideToken, vhrUriStr, vrNrd, vcrNrc );
< NodeRevisionDescriptors vhrNrds =
< content.retrieve( slideToken, vhrUriStr );
< content.create(
< slideToken, vhrUriStr, null, vhrNrd, null );
//branch=null, revisionContent=null
<
< // Create VR node
< NodeRevisionNumber vrVersion = vrNrd.getRevisionNumber();
< SubjectNode vrNode = new SubjectNode();
< UriHandler vrUri =
< UriHandler.createVersionUri( token, vhrUri,
String.valueOf(vrVersion) );
< String vrUriStr = String.valueOf( vrUri );
< structure.create( slideToken, vrNode, String.valueOf(vrUri) );
<
< // Set specific properties
< // First VCR ...
< vcrNrd.setProperty(
< new NodeProperty(P_VERSION_HISTORY,
dvh.createHrefValue(vhrUriStr)) );
< vcrNrd.setProperty(
< new NodeProperty(P_CHECKED_IN,
dvh.createHrefValue(vrUriStr)) );
< // ... then VHR ...
< vhrNrd.setETag( vhrUriStr.hashCode()+"_" ); // P_GETETAG
< vhrNrd.setLastModified( new Date() ); // P_GETLASTMODIFIED
< vhrNrd.setContentLength( 0 ); // P_GETCONTENTLENGTH
< vhrNrd.setName( vhrUri.getHistoryName() ); // P_DISPLAYNAME
< vhrNrd.setProperty(
< new NodeProperty(P_VERSION_SET,
dvh.createHrefValue(vrUriStr)) );
< vhrNrd.setProperty(
< new NodeProperty(P_ROOT_VERSION,
dvh.createHrefValue(vrUriStr)) );
< // ... and finally VR ...
< /* Content Type --start-- */
< String contentType = req.getContentType();
< if (contentType == null) {
< contentType = getConfig().getServletContext()
< .getMimeType(resourcePath);
< }
< if (contentType == null) {
< contentType = getConfig().getDefaultMimeType();
< }
< vrNrd.setContentType(contentType); // P_GETCONTENTTYPE
< /* Content Type --end-- */
< vrNrd.setName( vrUri.getVersionName() ); // P_DISPLAYNAME
< vrNrd.setContentLanguage( "en" ); // P_GETCONTENTLANGUAGE
< vrNrd.setETag( vrUriStr.hashCode()+"_"+req.getContentLength()
); // P_GETETAG
< vrNrd.setCreationDate( new Date() ); // P_CREATIONDATE
< vrNrd.setProperty(
< new NodeProperty(P_VERSION_HISTORY,
dvh.createHrefValue(vhrUriStr)) );
< vrNrd.setProperty(
< new NodeProperty(P_VERSION_NAME, vrUri.getVersionName())
);
<
< // Store changes
< content.store( slideToken, resourcePath, vcrNrd, null );
//revisionContent=null
< content.store( slideToken, vhrUriStr, vhrNrd, null );
//revisionContent=null
< content.store( slideToken, vhrUriStr, vrNrd, null );
//revisionContent=null
---
> VersioningHelper vh = VersioningHelper.getVersioningHelper(
> slideToken, token, req, resp, getConfig() );
> vh.versionControl( resourcePath );
*****CVS exited normally with code 1*****
cvs commit -m "Refactoring: substituted DeltavHelper by new
VersioningHelper, PropertyHelper an..." VersionControlMethod.java (in
directory
D:\Projects\jakarta\jakarta-slide\src\webdav\server\org\apache\slide\webdav\
method\)
Checking in VersionControlMethod.java;
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/Ver
sionControlMethod.java,v <-- VersionControlMethod.java
new revision: 1.3; previous revision: 1.2
done
Mailing the commit message...
*****CVS exited normally with code 0*****
'DeltavHelper.java' has been moved successfully to the recycle bin...
cvs remove DeltavHelper.java (in directory
D:\Projects\jakarta\jakarta-slide\src\webdav\server\org\apache\slide\webdav\
util\)
cvs server: scheduling `DeltavHelper.java' for removal
cvs server: use 'cvs commit' to remove this file permanently
*****CVS exited normally with code 0*****
cvs add VersioningHelper.java ReportHelper.java PropertyHelper.java
MethodHelper.java HistoryPathHandler.java DaslConstants.java
AclConstants.java AbstractWebdavHelper.java (in directory
D:\Projects\jakarta\jakarta-slide\src\webdav\server\org\apache\slide\webdav\
util\)
cvs server: scheduling file `VersioningHelper.java' for addition
cvs server: scheduling file `ReportHelper.java' for addition
cvs server: scheduling file `PropertyHelper.java' for addition
cvs server: scheduling file `MethodHelper.java' for addition
cvs server: scheduling file `HistoryPathHandler.java' for addition
cvs server: scheduling file `DaslConstants.java' for addition
cvs server: scheduling file `AclConstants.java' for addition
cvs server: scheduling file `AbstractWebdavHelper.java' for addition
cvs server: use 'cvs commit' to add these files permanently
*****CVS exited normally with code 0*****
updating WebdavConstants.java
setting WebdavConstants.java in edit mode
***** end *****
updating UriHandler.java
setting UriHandler.java in edit mode
***** end *****
updating DeltavConstants.java
setting DeltavConstants.java in edit mode
***** end *****
Saved settings for D:\Projects\jakarta successfully...
cvs commit -m "Refactoring: substituted by new VersioningHelper,
PropertyHelper, ReportHelper a..." DeltavHelper.java (in directory
D:\Projects\jakarta\jakarta-slide\src\webdav\server\org\apache\slide\webdav\
util\)
Removing DeltavHelper.java;
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Delta
vHelper.java,v <-- DeltavHelper.java
new revision: delete; previous revision: 1.4
done
Mailing the commit message...
*****CVS exited normally with code 0*****
cvs commit -m Initial VersioningHelper.java ReportHelper.java
PropertyHelper.java MethodHelper.java HistoryPathHandler.java
DaslConstants.java AclConstants.java AbstractWebdavHelper.java (in directory
D:\Projects\jakarta\jakarta-slide\src\webdav\server\org\apache\slide\webdav\
util\)
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Versi
oningHelper.java,v
done
Checking in VersioningHelper.java;
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Versi
oningHelper.java,v <-- VersioningHelper.java
initial revision: 1.1
done
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Repor
tHelper.java,v
done
Checking in ReportHelper.java;
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Repor
tHelper.java,v <-- ReportHelper.java
initial revision: 1.1
done
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Prope
rtyHelper.java,v
done
Checking in PropertyHelper.java;
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Prope
rtyHelper.java,v <-- PropertyHelper.java
initial revision: 1.1
done
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Metho
dHelper.java,v
done
Checking in MethodHelper.java;
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Metho
dHelper.java,v <-- MethodHelper.java
initial revision: 1.1
done
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Histo
ryPathHandler.java,v
done
Checking in HistoryPathHandler.java;
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Histo
ryPathHandler.java,v <-- HistoryPathHandler.java
initial revision: 1.1
done
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DaslC
onstants.java,v
done
Checking in DaslConstants.java;
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DaslC
onstants.java,v <-- DaslConstants.java
initial revision: 1.1
done
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/AclCo
nstants.java,v
done
Checking in AclConstants.java;
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/AclCo
nstants.java,v <-- AclConstants.java
initial revision: 1.1
done
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Abstr
actWebdavHelper.java,v
done
Checking in AbstractWebdavHelper.java;
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Abstr
actWebdavHelper.java,v <-- AbstractWebdavHelper.java
initial revision: 1.1
done
Mailing the commit message...
*****CVS exited normally with code 0*****
cvs diff WebdavConstants.java (in directory
D:\Projects\jakarta\jakarta-slide\src\webdav\server\org\apache\slide\webdav\
util\)
Index: WebdavConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Webda
vConstants.java,v
retrieving revision 1.1
diff -r1.1 WebdavConstants.java
73c73
< /** */
---
> /** XML Namespace */
75a76,78
>
> /** Features */
> String F_LOCKING = "2";
*****CVS exited normally with code 1*****
cvs commit -m "Added feature constants" WebdavConstants.java (in directory
D:\Projects\jakarta\jakarta-slide\src\webdav\server\org\apache\slide\webdav\
util\)
Checking in WebdavConstants.java;
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Webda
vConstants.java,v <-- WebdavConstants.java
new revision: 1.2; previous revision: 1.1
done
Mailing the commit message...
*****CVS exited normally with code 0*****
cvs diff DeltavConstants.java (in directory
D:\Projects\jakarta\jakarta-slide\src\webdav\server\org\apache\slide\webdav\
util\)
Index: DeltavConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Delta
vConstants.java,v
retrieving revision 1.3
diff -r1.3 DeltavConstants.java
74c74
< String I_NEXT_HISTORY_NAME =
"next-history-name"; //live non-RFC property
---
> String I_NEXT_HISTORY_NAME
= "next-history-name"; //property
94d93
< String K_NOT_VERSIONABLE =
"Not_Versionable";
200c199
< /** Reposrts */
---
> /** Reports */
206a206,327
>
> /** Pre- and postconditions */
> String C_ACTIVITY_CHECKIN
= "activity_checkin";
> String C_ACTIVITY_LOCATION_OK
= "activity_location_ok";
> String C_ADD_MUST_BE_NEW_LABEL
= "add_must_be_new_label";
> String C_ADD_OR_SET_LABEL
= "add_or_set_label";
> String C_ADD_TO_HISTORY
= "add_to_history";
> String C_ANCESTOR_VERSION
= "ancestor_version";
> String C_APPLY_REQUEST_TO_LABELED_VERSION
= "apply_request_to_labeled_version";
> String C_ATOMIC_ACTIVITY_CHECKIN
= "atomic_activity_checkin";
> String C_AUTO_CHECKIN
= "auto_checkin";
> String C_AUTO_CHECKOUT
= "auto_checkout";
> String C_AUTO_CHECKOUT_CHECKIN
= "auto_checkout_checkin";
> String C_AUTO_UPDATE
= "auto_update";
> String C_BASELINE_CONTROLLED_MEMBERS_MUST_BE_CHECKED_IN
= "baseline_controlled_members_must_be_checked_in";
> String C_BASELINES_FROM_SAME_HISTORY
= "baselines_from_same_history";
> String C_CANCEL_CHECKED_OUT
= "cancel_checked_out";
> String C_CANNOT_ADD_TO_EXISTING_HISTORY
= "cannot_add_to_existing_history";
> String C_CANNOT_COPY_COLLECTION_VERSION
= "cannot_copy_collection_version";
> String C_CANNOT_COPY_HISTORY
= "cannot_copy_history";
> String C_CANNOT_MERGE_CHECKED_OUT_RESOURCE
= "cannot_merge_checked_out_resource";
> String C_CANNOT_MODIFY_CHECKED_IN_PARENT
= "cannot_modify_checked_in_parent";
> String C_CANNOT_MODIFY_DESTINATION_CHECKED_IN_PARENT
= "cannot_modify_destination_checked_in_parent";
> String C_CANNOT_MODIFY_PROTECTED_PROPERTY
= "cannot_modify_protected_property";
> String C_CANNOT_MODIFY_VERSION
= "cannot_modify_version";
> String C_CANNOT_MODIFY_VERSION_CONTROLLED_CONFIGURATION
= "cannot_modify_version_controlled_configuration";
> String C_CANNOT_MODIFY_VERSION_CONTROLLED_CONTENT
= "cannot_modify_version_controlled_content";
> String C_CANNOT_MODIFY_VERSION_CONTROLLED_PROPERTY
= "cannot_modify_version_controlled_property";
> String C_CANNOT_RENAME_HISTORY
= "cannot_rename_history";
> String C_CANNOT_RENAME_VERSION
= "cannot_rename_version";
> String C_CANNOT_RENAME_WORKING_RESOURCE
= "cannot_rename_working_resource";
> String C_CHECKED_IN
= "checked_in";
> String C_CHECKED_OUT_FOR_MERGE
= "checked_out_for_merge";
> String C_CHECKIN_ACTIVITY
= "checkin_activity";
> String C_CHECKIN_FORK_DISCOURAGED
= "checkin_fork_discouraged";
> String C_CHECKIN_FORK_FORBIDDEN
= "checkin_fork_forbidden";
> String C_CHECKOUT_NOT_ALLOWED
= "checkout_not_allowed";
> String C_CHECKOUT_OF_CHECKED_OUT_VERSION_IS_DISCOURAGED
= "checkout_of_checked_out_version_is_discouraged";
> String C_CHECKOUT_OF_CHECKED_OUT_VERSION_IS_FORBIDDEN
= "checkout_of_checked_out_version_is_forbidden";
> String C_CHECKOUT_OF_VERSION_WITH_DESCENDANT_IS_DISCOURAGED
= "checkout_of_version_with_descendant_is_discouraged";
> String C_CHECKOUT_OF_VERSION_WITH_DESCENDANT_IS_FORBIDDEN
= "checkout_of_version_with_descendant_is_forbidden";
> String C_COPY_CREATES_NEW_RESOURCE
= "copy_creates_new_resource";
> String C_CREATE_BASELINE_COLLECTION
= "create_baseline_collection";
> String C_CREATE_NEW_BASELINE
= "create_new_baseline";
> String C_CREATE_VERSION
= "create_version";
> String C_CREATE_VERSION_CONTROLLED_CONFIGURATION
= "create_version_controlled_configuration";
> String C_CREATE_WORKING_RESOURCE
= "create_working_resource";
> String C_CREATE_WORKING_RESOURCE_FROM_CHECKED_IN_VERSION
= "create_working_resource_from_checked_in_version";
> String C_DELETE_ACTIVITY_REFERENCE
= "delete_activity_reference";
> String C_DELETE_VERSION_REFERENCE
= "delete_version_reference";
> String C_DELETE_VERSION_SET
= "delete_version_set";
> String C_DELETE_WORKING_RESOURCE
= "delete_working_resource";
> String C_DELETE_WORKSPACE_MEMBERS
= "delete_workspace_members";
> String C_DEPTH_UPDATE
= "depth_update";
> String C_DESCENDANT_VERSION
= "descendant_version";
> String C_INITIALIZE_ACTIVITY
= "initialize_activity";
> String C_INITIALIZE_ACTIVITY_SET
= "initialize_activity_set";
> String C_INITIALIZE_PREDECESSOR_SET
= "initialize_predecessor_set";
> String C_INITIALIZE_UNRESERVED
= "initialize_unreserved";
> String C_INITIALIZE_VERSION_CONTENT_AND_PROPERTIES
= "initialize_version_content_and_properties";
> String C_INITIALIZE_VERSION_CONTROLLED_BINDINGS
= "initialize_version_controlled_bindings";
> String C_INITIALIZE_VERSION_HISTORY_BINDINGS
= "initialize_version_history_bindings";
> String C_INITIALIZE_WORKSPACE
= "initialize_workspace";
> String C_IS_CHECKED_OUT
= "is_checked_out";
> String C_KEEP_CHECKED_OUT
= "keep_checked_out";
> String C_LABEL_MUST_EXIST
= "label_must_exist";
> String C_LINEAR_ACTIVITY
= "linear_activity";
> String C_MERGE_BASELINE
= "merge_baseline";
> String C_MERGE_MUST_BE_COMPLETE
= "merge_must_be_complete";
> String C_MERGE_SUBBASELINES
= "merge_subbaselines";
> String C_MODIFY_CONFIGURATION
= "modify_configuration";
> String C_MUST_BE_ACTIVITY
= "must_be_activity";
> String C_MUST_BE_BASELINE
= "must_be_baseline";
> String C_MUST_BE_CHECKED_IN
= "must_be_checked_in";
> String C_MUST_BE_CHECKED_OUT
= "must_be_checked_out";
> String C_MUST_BE_CHECKED_OUT_VERSION_CONTROLLED_RESOURCE
= "must_be_checked_out_version_controlled_resource";
> String C_MUST_BE_VERSION
= "must_be_version";
> String C_MUST_BE_VERSION_HISTORY
= "must_be_version_history";
> String C_MUST_HAVE_NO_VERSION_CONTROLLED_MEMBERS
= "must_have_no_version_controlled_members";
> String C_MUST_NOT_CHANGE_EXISTING_CHECKED_IN_OUT
= "must_not_change_existing_checked_in_out";
> String C_MUST_NOT_COPY_VERSIONING_PROPERTY
= "must_not_copy_versioning_property";
> String C_MUST_NOT_HAVE_LABEL_AND_APPLY_TO_VERSION
= "must_not_have_label_and_apply_to_version";
> String C_MUST_NOT_UPDATE_BASELINE_COLLECTION
= "must_not_update_baseline_collection";
> String C_MUST_SELECT_VERSION_IN_HISTORY
= "must_select_version_in_history";
> String C_NEW_VERSION_CONTROLLED_COLLECTION
= "new_version_controlled_collection";
> String C_NEW_VERSION_CONTROLLED_RESOURCE
= "new_version_controlled_resource";
> String C_NEW_VERSION_HISTORY
= "new_version_history";
> String C_NO_CHECKED_OUT_BASELINE_CONTROLLED_COLLECTION_MEMBERS
= "no_checked_out_baseline_controlled_collection_members";
> String C_NO_MODIFICATION
= "no_modification";
> String C_NO_OVERWRITE_BY_AUTO_UPDATE
= "no_overwrite_by_auto_update";
> String C_NO_VERSION_DELETE
= "no_version_delete";
> String C_ONE_BASELINE_CONTROLLED_COLLECTION_PER_HISTORY_PER_WORKSPACE
= "one_baseline_controlled_collection_per_history_per_workspace";
> String C_ONE_CHECKOUT_PER_ACTIVITY_PER_HISTORY
= "one_checkout_per_activity_per_history";
> String C_ONE_VERSION_CONTROLLED_RESOURCE_PER_HISTORY_PER_WORKSPACE
= "one_version_controlled_resource_per_history_per_workspace";
> String C_ONE_VERSION_PER_HISTORY_PER_BASELINE
= "one_version_per_history_per_baseline";
> String C_PRESERVE_VERSIONING_PROPERTIES
= "preserve_versioning_properties";
> String C_PUT_UNDER_VERSION_CONTROL
= "put_under_version_control";
> String C_REFERENCE_VERSION_CONTROLLED_CONFIGURATION
= "reference_version_controlled_configuration";
> String C_REMOVE_LABEL
= "remove_label";
> String C_REPORT_PROPERTIES
= "report_properties";
> String C_RESOURCE_MUST_BE_NULL
= "resource_must_be_null";
> String C_RESTORE_CONTENT_AND_DEAD_PROPERTIES
= "restore_content_and_dead_properties";
> String C_SELECT_EXISTING_BASELINE
= "select_existing_baseline";
> String C_SET_BASELINE_CONTROLLED_COLLECTION_MEMBERS
= "set_baseline_controlled_collection_members";
> String C_SUPPORTED_LIVE_PROPERTY
= "supported_live_property";
> String C_SUPPORTED_REPORT
= "supported_report";
> String C_UPDATE_ACTIVITY_REFERENCE
= "update_activity_reference";
> String C_UPDATE_AUTO_UPDATE
= "update_auto_update";
> String C_UPDATE_CHECKED_OUT_REFERENCE
= "update_checked_out_reference";
> String C_UPDATE_CONTENT_AND_PROPERTIES
= "update_content_and_properties";
> String C_UPDATE_MERGE_SET
= "update_merge_set";
> String C_UPDATE_PREDECESSOR_SET
= "update_predecessor_set";
> String C_UPDATE_SUBBASELINES
= "update_subbaselines";
> String C_UPDATE_VERSION_CONTROLLED_COLLECTION_MEMBERS
= "update_version_controlled_collection_members";
> String C_UPDATE_WORKSPACE_REFERENCE
= "update_workspace_reference";
> String C_VERSION_CONTROL_WORKING_COLLECTION_MEMBERS
= "version_control_working_collection_members";
> String C_VERSION_CONTROLLED_CONFIGURATION_MUST_NOT_EXIST
= "version_controlled_configuration_must_not_exist";
> String C_VERSION_HISTORY_HAS_ROOT
= "version_history_has_root";
> String C_VERSION_HISTORY_IS_TREE
= "version_history_is_tree";
> String C_WORKSPACE_LOCATION_OK
= "workspace_location_ok";
> String C_WORKSPACE_MEMBER_MOVED
= "workspace_member_moved";
> String C_WORKSPACE_MOVED
= "workspace_moved";
*****CVS exited normally with code 1*****
cvs commit -m "Added constants for pre and postconditions"
DeltavConstants.java (in directory
D:\Projects\jakarta\jakarta-slide\src\webdav\server\org\apache\slide\webdav\
util\)
Checking in DeltavConstants.java;
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/Delta
vConstants.java,v <-- DeltavConstants.java
new revision: 1.4; previous revision: 1.3
done
Mailing the commit message...
*****CVS exited normally with code 0*****
cvs diff UriHandler.java (in directory
D:\Projects\jakarta\jakarta-slide\src\webdav\server\org\apache\slide\webdav\
util\)
Index: UriHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHa
ndler.java,v
retrieving revision 1.2
diff -r1.2 UriHandler.java
83,89d82
<
< public class UriHandler implements DeltavConstants {
<
< // Cache for history path handlers:
< // namespace_name -> URI_handler_for_history_path
< private static Map hpathHandlers = new HashMap();
<
91c84
< * Return the history path handler for the specified namespace.
---
> * Helper class for the handling of URIs
93,94c86
< public static UriHandler
< getHistoryPathHandler( NamespaceAccessToken nsaToken ) {
---
> public class UriHandler implements DeltavConstants, AclConstants,
DaslConstants {
96,105c88,90
< String nsName = nsaToken.getName();
< UriHandler result = (UriHandler)hpathHandlers.get( nsName );
<
< if( result == null ) {
< String hpath = nsaToken.getNamespaceConfig().getHistoryPath();
< result = new UriHandler( nsName, hpath );
< hpathHandlers.put( nsName, result );
< }
< return result;
< }
---
> // Cache for history path handlers:
> // namespace_name -> URI_handler_for_history_path
> protected static Map hpathHandlers = new HashMap();
108c93
< * Return an URI handler for the specified namespace and resource
path.
---
> * Factory method.
114c99,100
< UriHandler hpathHandler = getHistoryPathHandler( nsaToken );
---
> UriHandler hpathHandler =
> HistoryPathHandler.getHistoryPathHandler( nsaToken );
119c105
< * Return an URI handler for the specified namespace and resource
path.
---
> * Generates the next available history URI and returns an URI handler
for it.
122c108
< createNextHistoryUri( SlideToken slideToken, NamespaceAccessToken
nsaToken )
---
> createNextHistoryUri( SlideToken sToken, NamespaceAccessToken nsaToken
)
129c115,116
< UriHandler hpathHandler = getHistoryPathHandler( nsaToken );
---
> UriHandler hpathHandler =
> HistoryPathHandler.getHistoryPathHandler( nsaToken );
134c121
< content.retrieve( slideToken, hpath );
---
> content.retrieve( sToken, hpath );
137c124
< content.retrieve( slideToken, hpathNrds );
---
> content.retrieve( sToken, hpathNrds );
155c142
< content.store( slideToken, hpath, hpathNrd, null );
//revisionContent = null
---
> content.store( sToken, hpath, hpathNrd, null ); //revisionContent
= null
161c148,149
< *
---
> * Creates a VR URI for the specified version in the specified history
and
> * returns an URI handler for it.
175c163
< * Default constructor
---
> * Protected constructor
177c165
< private UriHandler( String nsName, String uri ) {
---
> protected UriHandler( String nsName, String uri ) {
189c177
< * Version URI constructor
---
> * Protected constructor for VR URIs
191c179
< private UriHandler( String nsName, UriHandler vhrUri, String
versionName ) {
---
> protected UriHandler( String nsName, UriHandler vhrUri, String
versionName ) {
*****CVS exited normally with code 1*****
cvs commit -m "Refactoring: splitted out HistoryPathHandler" UriHandler.java
(in directory
D:\Projects\jakarta\jakarta-slide\src\webdav\server\org\apache\slide\webdav\
util\)
Checking in UriHandler.java;
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHa
ndler.java,v <-- UriHandler.java
new revision: 1.3; previous revision: 1.2
done
Mailing the commit message...
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
