juergen 2002/09/24 22:49:43
Modified: src/webdav/server/org/apache/slide/webdav/util/resourcekind
AbstractResourceKind.java
src/webdav/server/org/apache/slide/webdav/util
PropertyHelper.java VersioningHelper.java
Log:
Handle "" (empty String) as a legal value for property <auto-version>.
(ralf)
Revision Changes Path
1.15 +17 -7
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/AbstractResourceKind.java
Index: AbstractResourceKind.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/AbstractResourceKind.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractResourceKind.java 12 Aug 2002 13:24:17 -0000 1.14
+++ AbstractResourceKind.java 25 Sep 2002 05:49:42 -0000 1.15
@@ -90,6 +90,11 @@
*/
abstract public class AbstractResourceKind implements ResourceKind,
WebdavConstants, DeltavConstants, AclConstants, DaslConstants {
+ /**
+ ** String constant for an empty (<code>""</code>) string.
+ **/
+ public static final String EMPTY_STRING = "";
+
// supported reports
protected static Set supportedFeatures = new HashSet();
@@ -108,7 +113,7 @@
* e.g. <code>checkout-checkin</code>.
*/
protected final static String[] SUPPORTED_AUTO_VERSION_ELEMENTS =
- new String[] {E_CHECKOUT, E_CHECKOUT_CHECKIN, E_CHECKOUT_UNLOCKED_CHECKIN,
E_LOCKED_CHECKOUT};
+ new String[] {EMPTY_STRING, E_CHECKOUT, E_CHECKOUT_CHECKIN,
E_CHECKOUT_UNLOCKED_CHECKIN, E_LOCKED_CHECKOUT};
/**
* A String array containing the names of the Elements supported as a
@@ -130,19 +135,19 @@
* The values of {@link #SUPPORTED_AUTO_VERSION_ELEMENTS
SUPPORTED_AUTO_VERSION_ELEMENTS}
* as a (unmodifiable) List.
*/
- protected final static List SUPPORTED_AUTO_VERSION_ELEMENTS_LIST =
Collections.unmodifiableList(Arrays.asList(SUPPORTED_AUTO_VERSION_ELEMENTS));
+ public final static List SUPPORTED_AUTO_VERSION_ELEMENTS_LIST =
Collections.unmodifiableList(Arrays.asList(SUPPORTED_AUTO_VERSION_ELEMENTS));
/**
* The values of {@link #SUPPORTED_CHECKOUT_FORK_ELEMENTS
SUPPORTED_CHECKOUT_FORK_ELEMENTS}
* as a (unmodifiable) List.
*/
- protected final static List SUPPORTED_CHECKOUT_FORK_ELEMENTS_LIST =
Collections.unmodifiableList(Arrays.asList(SUPPORTED_CHECKOUT_FORK_ELEMENTS));
+ public final static List SUPPORTED_CHECKOUT_FORK_ELEMENTS_LIST =
Collections.unmodifiableList(Arrays.asList(SUPPORTED_CHECKOUT_FORK_ELEMENTS));
/**
* The values of {@link #SUPPORTED_CHECKIN_FORK_ELEMENTS
SUPPORTED_CHECKIN_FORK_ELEMENTS}
* as a (unmodifiable) List.
*/
- protected final static List SUPPORTED_CHECKIN_FORK_ELEMENTS_LIST =
Collections.unmodifiableList(Arrays.asList(SUPPORTED_CHECKIN_FORK_ELEMENTS));
+ public final static List SUPPORTED_CHECKIN_FORK_ELEMENTS_LIST =
Collections.unmodifiableList(Arrays.asList(SUPPORTED_CHECKIN_FORK_ELEMENTS));
/**
* Maps the names of the properties that have a restricted set of supported
@@ -468,6 +473,11 @@
if (value == null) {
return false;
+ }
+
+ // handle "" value
+ if (EMPTY_STRING.equals(value)) {
+ return listOfRestrictedValues.contains(EMPTY_STRING);
}
XMLValue xmlValue = null;
1.35 +15 -24
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java
Index: PropertyHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- PropertyHelper.java 23 Aug 2002 12:12:15 -0000 1.34
+++ PropertyHelper.java 25 Sep 2002 05:49:42 -0000 1.35
@@ -280,17 +280,10 @@
else if( P_AUTO_VERSION.equals(propName) ) {
Element avv = null;
- if( E_CHECKOUT_CHECKIN.equals(DEFAULT_AUTO_VERSION) ) {
- avv = new Element( E_CHECKOUT_CHECKIN,
NamespaceCache.DEFAULT_NAMESPACE );
- }
- else if( E_CHECKOUT_UNLOCKED_CHECKIN.equals(DEFAULT_AUTO_VERSION) ) {
- avv = new Element( E_CHECKOUT_UNLOCKED_CHECKIN,
NamespaceCache.DEFAULT_NAMESPACE );
- }
- else if( E_CHECKOUT.equals(DEFAULT_AUTO_VERSION) ) {
- avv = new Element( E_CHECKOUT, NamespaceCache.DEFAULT_NAMESPACE );
- }
- else if( E_LOCKED_CHECKOUT.equals(DEFAULT_AUTO_VERSION) ) {
- avv = new Element( E_LOCKED_CHECKOUT,
NamespaceCache.DEFAULT_NAMESPACE );
+ if ( (DEFAULT_AUTO_VERSION != null) && (DEFAULT_AUTO_VERSION.length() >
0) ) {
+
+ if(
AbstractResourceKind.SUPPORTED_AUTO_VERSION_ELEMENTS_LIST.contains(DEFAULT_AUTO_VERSION)
) {
+ avv = new Element( DEFAULT_AUTO_VERSION,
NamespaceCache.DEFAULT_NAMESPACE );
}
else {
Domain.warn( "Auto-version not configured properly; using "
@@ -305,14 +298,15 @@
x.printStackTrace();
}
}
+ else {
+ result = "";
+ }
+ }
else if( P_CHECKOUT_FORK.equals(propName) ) {
Element cfv = null;
- if( E_FORBIDDEN.equals(DEFAULT_CHECKOUT_FORK) ) {
- cfv = new Element( E_FORBIDDEN, NamespaceCache.DEFAULT_NAMESPACE );
- }
- else if( E_DISCOURAGED.equals(DEFAULT_CHECKOUT_FORK) ) {
- cfv = new Element( E_DISCOURAGED, NamespaceCache.DEFAULT_NAMESPACE
);
+ if(
AbstractResourceKind.SUPPORTED_CHECKOUT_FORK_ELEMENTS_LIST.contains(DEFAULT_CHECKOUT_FORK)
) {
+ cfv = new Element( DEFAULT_CHECKOUT_FORK,
NamespaceCache.DEFAULT_NAMESPACE );
}
else {
Domain.warn( "Checkout-fork not configured properly; using "
@@ -330,11 +324,8 @@
else if( P_CHECKIN_FORK.equals(propName) ) {
Element cfv = null;
- if( E_FORBIDDEN.equals(DEFAULT_CHECKIN_FORK) ) {
- cfv = new Element( E_FORBIDDEN, NamespaceCache.DEFAULT_NAMESPACE );
- }
- else if( E_DISCOURAGED.equals(DEFAULT_CHECKIN_FORK) ) {
- cfv = new Element( E_DISCOURAGED, NamespaceCache.DEFAULT_NAMESPACE
);
+ if(
AbstractResourceKind.SUPPORTED_CHECKIN_FORK_ELEMENTS_LIST.contains(DEFAULT_CHECKIN_FORK)
) {
+ cfv = new Element( DEFAULT_CHECKIN_FORK,
NamespaceCache.DEFAULT_NAMESPACE );
}
else {
Domain.warn( "Checkin-fork not configured properly; using "
1.77 +8 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java
Index: VersioningHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- VersioningHelper.java 16 Sep 2002 12:26:23 -0000 1.76
+++ VersioningHelper.java 25 Sep 2002 05:49:42 -0000 1.77
@@ -1603,7 +1603,12 @@
String autoVersionValue = null;
NodeProperty autoVersionProperty =
revisionDescriptor.getProperty(DeltavConstants.P_AUTO_VERSION);
if ( (autoVersionProperty != null) && (autoVersionProperty.getValue() !=
null) ) {
+ if (autoVersionProperty.getValue().toString().length() > 0) {
autoVersionValue =
getElementName(autoVersionProperty.getValue().toString());
+ }
+ else {
+ autoVersionValue = "";
+ }
}
return autoVersionValue;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
