pnever 02/05/17 08:50:50
Modified: src/share/org/apache/slide/content ContentImpl.java
NodeProperty.java
src/webdav/server/org/apache/slide/webdav/method
CopyMethod.java PutMethod.java
src/webdav/server/org/apache/slide/webdav/util
DeltavConstants.java HistoryPathHandler.java
PropertyHelper.java WorkingresourcePathHandler.java
WorkspacePathHandler.java
Log:
Adapted to the move of
- 2 config properties (slide.properties) and
- all DeltaV parameters from the namespace config
to be now "global" domain parameters (see log message for Domain.java)
Revision Changes Path
1.38 +12 -6
jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java
Index: ContentImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ContentImpl.java 15 May 2002 09:17:32 -0000 1.37
+++ ContentImpl.java 17 May 2002 15:50:49 -0000 1.38
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.37
2002/05/15 09:17:32 pnever Exp $
- * $Revision: 1.37 $
- * $Date: 2002/05/15 09:17:32 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.38
2002/05/17 15:50:49 pnever Exp $
+ * $Revision: 1.38 $
+ * $Date: 2002/05/17 15:50:49 $
*
* ====================================================================
*
@@ -82,8 +82,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
* @author Jean-Philippe Courson
- * @version $Revision: 1.37 $
- * @version $Revision: 1.37 $
+ * @version $Revision: 1.38 $
+ * @version $Revision: 1.38 $
*/
public final class ContentImpl implements Content {
@@ -97,7 +97,13 @@
protected static final int PRE_REMOVE = 3;
protected static final int POST_REMOVE = 4;
- protected static Class uriRedirectorClass = Configuration.uriRedirectorClass();
+ protected static Class uriRedirectorClass;
+ static {
+ try {
+ uriRedirectorClass = Class.forName(
Domain.getParameter("uriRedirectorClass") );
+ }
+ catch( ClassNotFoundException x ) {};
+ }
// ----------------------------------------------------------- Constructors
1.14 +6 -7
jakarta-slide/src/share/org/apache/slide/content/NodeProperty.java
Index: NodeProperty.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeProperty.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- NodeProperty.java 17 May 2002 08:35:41 -0000 1.13
+++ NodeProperty.java 17 May 2002 15:50:49 -0000 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeProperty.java,v 1.13
2002/05/17 08:35:41 juergen Exp $
- * $Revision: 1.13 $
- * $Date: 2002/05/17 08:35:41 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeProperty.java,v 1.14
2002/05/17 15:50:49 pnever Exp $
+ * $Revision: 1.14 $
+ * $Date: 2002/05/17 15:50:49 $
*
* ====================================================================
*
@@ -80,7 +80,7 @@
* Node property class
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
*/
public final class NodeProperty implements Serializable, Cloneable {
@@ -97,9 +97,8 @@
public static Set allComputedProperties;
static {
- Class slpc = Configuration.standardLivePropertiesClass();
- if( slpc != null ) {
try {
+ Class slpc = Class.forName(
Domain.getParameter("standardLivePropertiesClass") );
Method lp = slpc.getMethod( "getAllLiveProperties", new Class[]{} );
allLiveProperties = (Set)lp.invoke( null, new Object[]{} ); // obj=null
since method is static
Method pp = slpc.getMethod( "getAllProtectedProperties", new
Class[]{} );
@@ -110,7 +109,7 @@
catch( Exception x ) {
Domain.warn( "Loading of standard live properties failed:
"+x.getMessage() );
}
- }
+
if( allLiveProperties == null ) allLiveProperties =
Collections.EMPTY_SET;
if( allProtectedProperties == null ) allProtectedProperties =
Collections.EMPTY_SET;
if( allComputedProperties == null ) allComputedProperties =
Collections.EMPTY_SET;
1.36 +4 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java
Index: CopyMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- CopyMethod.java 16 May 2002 07:39:24 -0000 1.35
+++ CopyMethod.java 17 May 2002 15:50:49 -0000 1.36
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
1.35 2002/05/16 07:39:24 juergen Exp $
- * $Revision: 1.35 $
- * $Date: 2002/05/16 07:39:24 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
1.36 2002/05/17 15:50:49 pnever Exp $
+ * $Revision: 1.36 $
+ * $Date: 2002/05/17 15:50:49 $
*
* ====================================================================
*
@@ -396,7 +396,7 @@
// check if the resource should be put under version-control
- if (token.getNamespaceConfig().getAutoVersionControl() ) {
+ if( PutMethod.AUTO_VERSION_CONTROL ) {
versioningHelper.versionControl(destinationUri);
}
1.49 +6 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java
Index: PutMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- PutMethod.java 14 May 2002 15:33:42 -0000 1.48
+++ PutMethod.java 17 May 2002 15:50:50 -0000 1.49
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
1.48 2002/05/14 15:33:42 pnever Exp $
- * $Revision: 1.48 $
- * $Date: 2002/05/14 15:33:42 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
1.49 2002/05/17 15:50:50 pnever Exp $
+ * $Revision: 1.49 $
+ * $Date: 2002/05/17 15:50:50 $
*
* ====================================================================
*
@@ -106,6 +106,8 @@
// -------------------------------------------------------------- Constants
+ public final static boolean AUTO_VERSION_CONTROL = new Boolean(
+ Domain.getParameter(I_AUTO_VERSION_CONTROL, I_AUTO_VERSION_CONTROL_DEFAULT)
).booleanValue();
// ----------------------------------------------------- Instance Variables
@@ -374,8 +376,7 @@
revisionContent);
// check if the resource should be put under version-control
- if ( Configuration.useVersionControl() &&
- token.getNamespaceConfig().getAutoVersionControl() ) {
+ if ( Configuration.useVersionControl() && AUTO_VERSION_CONTROL ) {
versioningHelper.versionControl(resourcePath);
}
1.20 +18 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavConstants.java
Index: DeltavConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavConstants.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DeltavConstants.java 17 May 2002 04:56:24 -0000 1.19
+++ DeltavConstants.java 17 May 2002 15:50:50 -0000 1.20
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavConstants.java,v
1.19 2002/05/17 04:56:24 juergen Exp $
- * $Revision: 1.19 $
- * $Date: 2002/05/17 04:56:24 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavConstants.java,v
1.20 2002/05/17 15:50:50 pnever Exp $
+ * $Revision: 1.20 $
+ * $Date: 2002/05/17 15:50:50 $
*
* ====================================================================
*
@@ -81,6 +81,21 @@
String I_NEXT_WORKINGRESOURCE_NAME =
"next-workingresource-name"; //property
String I_INITIAL_WORKINGRESOURCE_NAME = "1";
String I_CHECKIN_LOCKTOKEN =
"checkin-locktoken";
+ String I_HISTORYPATH =
"historypath";
+ String I_HISTORYPATH_DEFAULT =
"/historypath";
+ String I_WORKSPACEPATH =
"workspacepath";
+ String I_WORKSPACEPATH_DEFAULT =
"/workspacepath";
+ String I_WORKINGRESOURCEPATH =
"workingresourcepath";
+ String I_WORKINGRESOURCEPATH_DEFAULT =
"/workingresourcepath";
+ String I_AUTO_VERSION =
"auto-version";
+ String I_AUTO_VERSION_DEFAULT =
"checkout-checkin";
+ String I_AUTO_VERSION_CONTROL =
"auto-version-control";
+ String I_AUTO_VERSION_CONTROL_DEFAULT = "false";
+ String I_CHECKOUT_FORK =
"checkout-fork";
+ String I_CHECKOUT_FORK_DEFAULT =
"forbidden";
+ String I_CHECKIN_FORK =
"checkin-fork";
+ String I_CHECKIN_FORK_DEFAULT =
"forbidden";
+
/** Features */
1.5 +8 -10
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/HistoryPathHandler.java
Index: HistoryPathHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/HistoryPathHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HistoryPathHandler.java 25 Apr 2002 21:12:28 -0000 1.4
+++ HistoryPathHandler.java 17 May 2002 15:50:50 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/HistoryPathHandler.java,v
1.4 2002/04/25 21:12:28 jericho Exp $
- * $Revision: 1.4 $
- * $Date: 2002/04/25 21:12:28 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/HistoryPathHandler.java,v
1.5 2002/05/17 15:50:50 pnever Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/05/17 15:50:50 $
*
* ====================================================================
*
@@ -63,11 +63,15 @@
package org.apache.slide.webdav.util;
+import org.apache.slide.common.Domain;
import org.apache.slide.common.NamespaceAccessToken;
public class HistoryPathHandler extends UriHandler {
+ public final static String HISTORY_PATH =
+ Domain.getParameter( I_HISTORYPATH, I_HISTORYPATH_DEFAULT );
+
/**
* Factory method.
*/
@@ -78,13 +82,7 @@
UriHandler result = (UriHandler)hpathHandlers.get( nsName );
if( result == null ) {
- String hpath = nsaToken.getNamespaceConfig().getHistoryPath();
- if( hpath == null || hpath.length() == 0 )
- throw new IllegalStateException(
- "No history path defined in namespace "+nsName+"; either "+
- "define it in domain.xml or disable versioning in
slide.properties"
- );
- result = new HistoryPathHandler( nsName, hpath );
+ result = new HistoryPathHandler( nsName, HISTORY_PATH );
hpathHandlers.put( nsName, result );
}
return result;
1.23 +19 -14
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- PropertyHelper.java 17 May 2002 08:38:45 -0000 1.22
+++ PropertyHelper.java 17 May 2002 15:50:50 -0000 1.23
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
1.22 2002/05/17 08:38:45 juergen Exp $
- * $Revision: 1.22 $
- * $Date: 2002/05/17 08:38:45 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
1.23 2002/05/17 15:50:50 pnever Exp $
+ * $Revision: 1.23 $
+ * $Date: 2002/05/17 15:50:50 $
*
* ====================================================================
*
@@ -119,6 +119,14 @@
public class PropertyHelper extends AbstractWebdavHelper implements
WebdavConstants, DeltavConstants, AclConstants, DaslConstants {
+ public final static String DEFAULT_AUTO_VERSION =
+ Domain.getParameter( I_AUTO_VERSION, I_AUTO_VERSION_DEFAULT );
+
+ public final static String DEFAULT_CHECKOUT_FORK =
+ Domain.getParameter( I_CHECKOUT_FORK, I_CHECKOUT_FORK_DEFAULT );
+
+ public final static String DEFAULT_CHECKIN_FORK =
+ Domain.getParameter( I_CHECKIN_FORK, I_CHECKIN_FORK_DEFAULT );
/**
* The Element returned by {@link #getCheckoutSetQueryElement
@@ -270,18 +278,17 @@
}
else if( P_AUTO_VERSION.equals(propName) ) {
Element avv = null;
- String avconf = nsaToken.getNamespaceConfig().getAutoVersion();
- if( E_CHECKOUT_CHECKIN.equals(avconf) ) {
+ if( E_CHECKOUT_CHECKIN.equals(DEFAULT_AUTO_VERSION) ) {
avv = new Element( E_CHECKOUT_CHECKIN,
NamespaceCache.DEFAULT_NAMESPACE );
}
- else if( E_CHECKOUT_UNLOCKED_CHECKIN.equals(avconf) ) {
+ 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(avconf) ) {
+ else if( E_CHECKOUT.equals(DEFAULT_AUTO_VERSION) ) {
avv = new Element( E_CHECKOUT, NamespaceCache.DEFAULT_NAMESPACE );
}
- else if( E_LOCKED_CHECKOUT.equals(avconf) ) {
+ else if( E_LOCKED_CHECKOUT.equals(DEFAULT_AUTO_VERSION) ) {
avv = new Element( E_LOCKED_CHECKOUT,
NamespaceCache.DEFAULT_NAMESPACE );
}
else {
@@ -299,12 +306,11 @@
}
else if( P_CHECKOUT_FORK.equals(propName) ) {
Element cfv = null;
- String cfconf = nsaToken.getNamespaceConfig().getCheckoutFork();
- if( E_FORBIDDEN.equals(cfconf) ) {
+ if( E_FORBIDDEN.equals(DEFAULT_CHECKOUT_FORK) ) {
cfv = new Element( E_FORBIDDEN, NamespaceCache.DEFAULT_NAMESPACE );
}
- else if( E_DISCOURAGED.equals(cfconf) ) {
+ else if( E_DISCOURAGED.equals(DEFAULT_CHECKOUT_FORK) ) {
cfv = new Element( E_DISCOURAGED, NamespaceCache.DEFAULT_NAMESPACE
);
}
else {
@@ -322,12 +328,11 @@
}
else if( P_CHECKIN_FORK.equals(propName) ) {
Element cfv = null;
- String cfconf = nsaToken.getNamespaceConfig().getCheckinFork();
- if( E_FORBIDDEN.equals(cfconf) ) {
+ if( E_FORBIDDEN.equals(DEFAULT_CHECKIN_FORK) ) {
cfv = new Element( E_FORBIDDEN, NamespaceCache.DEFAULT_NAMESPACE );
}
- else if( E_DISCOURAGED.equals(cfconf) ) {
+ else if( E_DISCOURAGED.equals(DEFAULT_CHECKIN_FORK) ) {
cfv = new Element( E_DISCOURAGED, NamespaceCache.DEFAULT_NAMESPACE
);
}
else {
1.3 +8 -10
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WorkingresourcePathHandler.java
Index: WorkingresourcePathHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WorkingresourcePathHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WorkingresourcePathHandler.java 29 Apr 2002 13:22:31 -0000 1.2
+++ WorkingresourcePathHandler.java 17 May 2002 15:50:50 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WorkingresourcePathHandler.java,v
1.2 2002/04/29 13:22:31 pnever Exp $
- * $Revision: 1.2 $
- * $Date: 2002/04/29 13:22:31 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WorkingresourcePathHandler.java,v
1.3 2002/05/17 15:50:50 pnever Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/17 15:50:50 $
*
* ====================================================================
*
@@ -63,11 +63,15 @@
package org.apache.slide.webdav.util;
+import org.apache.slide.common.Domain;
import org.apache.slide.common.NamespaceAccessToken;
public class WorkingresourcePathHandler extends UriHandler {
+ public final static String WORKINGRESOURCE_PATH =
+ Domain.getParameter( I_WORKINGRESOURCEPATH, I_WORKINGRESOURCEPATH_DEFAULT );
+
/**
* Factory method.
*/
@@ -78,13 +82,7 @@
UriHandler result = (UriHandler)wrpathHandlers.get( nsName );
if( result == null ) {
- String wrpath = nsaToken.getNamespaceConfig().getWorkingresourcePath();
- if( wrpath == null || wrpath.length() == 0 )
- throw new IllegalStateException(
- "No workingresource path defined in namespace "+nsName+";
either "+
- "define it in domain.xml or disable versioning in
slide.properties"
- );
- result = new WorkingresourcePathHandler( nsName, wrpath );
+ result = new WorkingresourcePathHandler( nsName, WORKINGRESOURCE_PATH );
wrpathHandlers.put( nsName, result );
}
return result;
1.3 +8 -10
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WorkspacePathHandler.java
Index: WorkspacePathHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WorkspacePathHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WorkspacePathHandler.java 25 Apr 2002 21:15:15 -0000 1.2
+++ WorkspacePathHandler.java 17 May 2002 15:50:50 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WorkspacePathHandler.java,v
1.2 2002/04/25 21:15:15 jericho Exp $
- * $Revision: 1.2 $
- * $Date: 2002/04/25 21:15:15 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WorkspacePathHandler.java,v
1.3 2002/05/17 15:50:50 pnever Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/17 15:50:50 $
*
* ====================================================================
*
@@ -63,11 +63,15 @@
package org.apache.slide.webdav.util;
+import org.apache.slide.common.Domain;
import org.apache.slide.common.NamespaceAccessToken;
public class WorkspacePathHandler extends UriHandler {
+ public final static String WORKSPACE_PATH =
+ Domain.getParameter( I_WORKSPACEPATH, I_WORKSPACEPATH_DEFAULT );
+
/**
* Factory method.
*/
@@ -78,13 +82,7 @@
UriHandler result = (UriHandler)wspathHandlers.get( nsName );
if( result == null ) {
- String wspath = nsaToken.getNamespaceConfig().getWorkspacePath();
- if( wspath == null || wspath.length() == 0 )
- throw new IllegalStateException(
- "No workspace path defined in namespace "+nsName+"; either "+
- "define it in domain.xml or disable versioning in
slide.properties"
- );
- result = new WorkspacePathHandler( nsName, wspath );
+ result = new WorkspacePathHandler( nsName, WORKSPACE_PATH );
wspathHandlers.put( nsName, result );
}
return result;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
