You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by pn...@apache.org on 2002/05/20 14:09:34 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/util HistoryPathHandler.java UriHandler.java WorkingresourcePathHandler.java WorkspacePathHandler.java
pnever 02/05/20 05:09:34
Modified: src/webdav/server/org/apache/slide/webdav/util
HistoryPathHandler.java UriHandler.java
WorkingresourcePathHandler.java
WorkspacePathHandler.java
Log:
As the path definitions for history, workspace and workingresource are
now "global" in the domain (i.e. not namespace-specific), UriHandlers do
not anymore depend an a namespace.
Revision Changes Path
1.6 +16 -17 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HistoryPathHandler.java 17 May 2002 15:50:50 -0000 1.5
+++ HistoryPathHandler.java 20 May 2002 12:09:34 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/HistoryPathHandler.java,v 1.6 2002/05/20 12:09:34 pnever Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/05/20 12:09:34 $
*
* ====================================================================
*
@@ -69,31 +69,30 @@
public class HistoryPathHandler extends UriHandler {
- public final static String HISTORY_PATH =
+ final static String HISTORY_PATH =
Domain.getParameter( I_HISTORYPATH, I_HISTORYPATH_DEFAULT );
+ static HistoryPathHandler historyPathHandler = new HistoryPathHandler( HISTORY_PATH );
+
/**
* Factory method.
*/
- public static UriHandler
- getHistoryPathHandler( NamespaceAccessToken nsaToken ) {
-
- String nsName = nsaToken.getName();
- UriHandler result = (UriHandler)hpathHandlers.get( nsName );
-
- if( result == null ) {
- result = new HistoryPathHandler( nsName, HISTORY_PATH );
- hpathHandlers.put( nsName, result );
- }
- return result;
+ public static UriHandler getHistoryPathHandler() {
+ return historyPathHandler;
}
+ /**
+ * Factory method.
+ */
+ public static String getHistoryPath() {
+ return HISTORY_PATH;
+ }
/**
* Protected constructor
*/
- protected HistoryPathHandler( String nsName, String uri ) {
- super( nsName, uri );
+ protected HistoryPathHandler( String uri ) {
+ super( uri );
}
/**
1.13 +27 -55 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java
Index: UriHandler.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- UriHandler.java 17 May 2002 12:42:45 -0000 1.12
+++ UriHandler.java 20 May 2002 12:09:34 -0000 1.13
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java,v 1.12 2002/05/17 12:42:45 juergen Exp $
- * $Revision: 1.12 $
- * $Date: 2002/05/17 12:42:45 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java,v 1.13 2002/05/20 12:09:34 pnever Exp $
+ * $Revision: 1.13 $
+ * $Date: 2002/05/20 12:09:34 $
*
* ====================================================================
*
@@ -87,45 +87,22 @@
*/
public class UriHandler implements DeltavConstants, AclConstants, DaslConstants {
- // Cache for history path handlers:
- // namespace_name -> URI_handler_for_history_path
- protected static Map hpathHandlers = new HashMap();
-
- // Cache for workspace path handlers:
- // namespace_name -> URI_handler_for_workspace_path
- protected static Map wspathHandlers = new HashMap();
-
- // Cache for workingresource path handlers:
- // namespace_name -> URI_handler_for_workingresource_path
- protected static Map wrpathHandlers = new HashMap();
-
/**
* Factory method.
*/
- public static UriHandler
- getUriHandler( NamespaceAccessToken nsaToken, String resourcePath ) {
-
- String nsName = nsaToken.getName();
- HistoryPathHandler.getHistoryPathHandler( nsaToken );
- WorkspacePathHandler.getWorkspacePathHandler( nsaToken );
- WorkingresourcePathHandler.getWorkingresourcePathHandler( nsaToken );
- return new UriHandler( nsName, resourcePath );
+ public static UriHandler getUriHandler( String resourcePath ) {
+ return new UriHandler( resourcePath );
}
/**
* Factory method.
*/
public static UriHandler
- getUriHandler( NamespaceAccessToken nsaToken, NodeRevisionDescriptors nrds, NodeRevisionDescriptor nrd ) {
-
- String nsName = nsaToken.getName();
- HistoryPathHandler.getHistoryPathHandler( nsaToken );
- WorkspacePathHandler.getWorkspacePathHandler( nsaToken );
- WorkingresourcePathHandler.getWorkingresourcePathHandler( nsaToken );
+ getUriHandler( NodeRevisionDescriptors nrds, NodeRevisionDescriptor nrd ) {
StringBuffer b = new StringBuffer();
String uri = nrds.getUri();
- UriHandler uriHandler = UriHandler.getUriHandler( nsaToken, uri );
+ UriHandler uriHandler = UriHandler.getUriHandler( uri );
if ( ! uriHandler.isHistoryUri() ) {
// any resource
b.append( uri );
@@ -144,7 +121,7 @@
b.append( nrd.getRevisionNumber().toString() );
}
}
- return new UriHandler( nsName, b.toString() );
+ return new UriHandler( b.toString() );
}
/**
@@ -159,7 +136,7 @@
UriHandler result = null;
String nsName = nsaToken.getName();
UriHandler hpathHandler =
- HistoryPathHandler.getHistoryPathHandler( nsaToken );
+ HistoryPathHandler.getHistoryPathHandler();
Content content = nsaToken.getContentHelper();
String hpath = hpathHandler.toString();
@@ -192,8 +169,7 @@
}
String nextHnStr = (String)nextHnProp.getValue();
- result = new UriHandler(
- nsName, hpath+"/"+nextHnStr );
+ result = new UriHandler( hpath+"/"+nextHnStr );
long nextHnLong = Long.parseLong( nextHnStr );
nextHnProp = new NodeProperty(I_NEXT_HISTORY_NAME,
@@ -218,7 +194,7 @@
UriHandler result = null;
String nsName = nsaToken.getName();
UriHandler wrpathHandler =
- WorkingresourcePathHandler.getWorkingresourcePathHandler( nsaToken );
+ WorkingresourcePathHandler.getWorkingresourcePathHandler();
Content content = nsaToken.getContentHelper();
String wrpath = wrpathHandler.toString();
@@ -252,8 +228,7 @@
}
String nextWrnStr = (String)nextWrnProp.getValue();
- result = new UriHandler(
- nsName, wrpath+"/"+nextWrnStr );
+ result = new UriHandler( wrpath+"/"+nextWrnStr );
long nextWrnLong = Long.parseLong( nextWrnStr );
nextWrnProp = new NodeProperty(I_NEXT_WORKINGRESOURCE_NAME,
@@ -271,21 +246,19 @@
* returns an URI handler for it.
*/
public static UriHandler
- createVersionUri( NamespaceAccessToken nsaToken, UriHandler vhrUri, String version ) {
- return new UriHandler( nsaToken.getName(), vhrUri, version );
+ createVersionUri( UriHandler vhrUri, String version ) {
+ return new UriHandler( vhrUri, version );
}
private String uri;
- private String nsName;
private String[] uriTokens = null;
/**
* Protected constructor
*/
- protected UriHandler( String nsName, String uri ) {
+ protected UriHandler( String uri ) {
this.uri = uri;
- this.nsName = nsName;
StringTokenizer t = new StringTokenizer( uri, "/" );
int n = t.countTokens();
@@ -297,8 +270,7 @@
/**
* Protected constructor for VR URIs
*/
- protected UriHandler( String nsName, UriHandler vhrUri, String versionName ) {
- this.nsName = nsName;
+ protected UriHandler( UriHandler vhrUri, String versionName ) {
int n = vhrUri.getUriTokens().length;
this.uriTokens = new String[n + 1];
for( int i = 0; i < n; i++ )
@@ -327,7 +299,7 @@
* Return true, if this is a valid workspace URI
*/
public boolean isWorkspaceUri() {
- UriHandler wspathHandler = (UriHandler)wspathHandlers.get( nsName );
+ UriHandler wspathHandler = WorkspacePathHandler.getWorkspacePathHandler();
String[] wspathTokens = wspathHandler.getUriTokens();
if( (wspathTokens.length + 1) == uriTokens.length ) {
@@ -344,7 +316,7 @@
* Return true, if this URI determines the workspace path.
*/
public boolean isWorkspacePathUri() {
- UriHandler wspathHandler = (UriHandler)wspathHandlers.get( nsName );
+ UriHandler wspathHandler = WorkspacePathHandler.getWorkspacePathHandler();
String[] wspathTokens = wspathHandler.getUriTokens();
if( (wspathTokens.length) == uriTokens.length ) {
@@ -361,7 +333,7 @@
* Return true, if this is an URI of a resource in a workspace
*/
public boolean isResourceInWorkspaceUri() {
- UriHandler wspathHandler = (UriHandler)wspathHandlers.get( nsName );
+ UriHandler wspathHandler = WorkspacePathHandler.getWorkspacePathHandler();
String[] wspathTokens = wspathHandler.getUriTokens();
if( (wspathTokens.length + 1) < uriTokens.length ) {
@@ -378,7 +350,7 @@
* Return true, if this is a history URI
*/
public boolean isHistoryUri() {
- UriHandler hpathHandler = (UriHandler)hpathHandlers.get( nsName );
+ UriHandler hpathHandler = HistoryPathHandler.getHistoryPathHandler();
String[] hpathTokens = hpathHandler.getUriTokens();
if( (hpathTokens.length + 1) == uriTokens.length ) {
@@ -395,7 +367,7 @@
* Return true, if this URI determines the history path.
*/
public boolean isHistoryPathUri() {
- UriHandler hpathHandler = (UriHandler)hpathHandlers.get( nsName );
+ UriHandler hpathHandler = HistoryPathHandler.getHistoryPathHandler();
String[] hpathTokens = hpathHandler.getUriTokens();
if( (hpathTokens.length) == uriTokens.length ) {
@@ -412,7 +384,7 @@
* Return true, if this is a version URI
*/
public boolean isVersionUri() {
- UriHandler hpathHandler = (UriHandler)hpathHandlers.get( nsName );
+ UriHandler hpathHandler = HistoryPathHandler.getHistoryPathHandler();
String[] hpathTokens = hpathHandler.getUriTokens();
if( (hpathTokens.length + 2) == uriTokens.length ) {
@@ -429,7 +401,7 @@
* Return true, if this is a valid workingresource URI
*/
public boolean isWorkingresourceUri() {
- UriHandler wrpathHandler = (UriHandler)wrpathHandlers.get( nsName );
+ UriHandler wrpathHandler = HistoryPathHandler.getHistoryPathHandler();
String[] wrpathTokens = wrpathHandler.getUriTokens();
if( (wrpathTokens.length + 1) == uriTokens.length ) {
@@ -447,7 +419,7 @@
* @pre isWorkspaceUri()
*/
public String getWorkspaceName() {
- UriHandler wspathHandler = (UriHandler)wspathHandlers.get( nsName );
+ UriHandler wspathHandler = WorkspacePathHandler.getWorkspacePathHandler();
String[] wspathTokens = wspathHandler.getUriTokens();
if( !isWorkspaceUri() )
@@ -462,7 +434,7 @@
* @pre isHistoryUri() || isVersionUri()
*/
public String getHistoryName() {
- UriHandler hpathHandler = (UriHandler)hpathHandlers.get( nsName );
+ UriHandler hpathHandler = HistoryPathHandler.getHistoryPathHandler();
String[] hpathTokens = hpathHandler.getUriTokens();
if( !isHistoryUri() && !isVersionUri() )
@@ -477,7 +449,7 @@
* @pre isVersionUri()
*/
public String getVersionName() {
- UriHandler hpathHandler = (UriHandler)hpathHandlers.get( nsName );
+ UriHandler hpathHandler = HistoryPathHandler.getHistoryPathHandler();
String[] hpathTokens = hpathHandler.getUriTokens();
if( !isVersionUri() )
@@ -513,7 +485,7 @@
if( !isResourceInWorkspaceUri() )
return null;
- UriHandler wspathHandler = (UriHandler)wspathHandlers.get( nsName );
+ UriHandler wspathHandler = WorkspacePathHandler.getWorkspacePathHandler();
String[] wspathTokens = wspathHandler.getUriTokens();
StringBuffer b = new StringBuffer();
for( int i = 0; i < (wspathTokens.length + 1); i++ ) {
1.4 +18 -16 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WorkingresourcePathHandler.java 17 May 2002 15:50:50 -0000 1.3
+++ WorkingresourcePathHandler.java 20 May 2002 12:09:34 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WorkingresourcePathHandler.java,v 1.4 2002/05/20 12:09:34 pnever Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/20 12:09:34 $
*
* ====================================================================
*
@@ -69,31 +69,33 @@
public class WorkingresourcePathHandler extends UriHandler {
- public final static String WORKINGRESOURCE_PATH =
+ final static String WORKINGRESOURCE_PATH =
Domain.getParameter( I_WORKINGRESOURCEPATH, I_WORKINGRESOURCEPATH_DEFAULT );
+ final static WorkingresourcePathHandler workingresourcePathHandler =
+ new WorkingresourcePathHandler( WORKINGRESOURCE_PATH );
+
+
/**
* Factory method.
*/
- public static UriHandler
- getWorkingresourcePathHandler( NamespaceAccessToken nsaToken ) {
-
- String nsName = nsaToken.getName();
- UriHandler result = (UriHandler)wrpathHandlers.get( nsName );
-
- if( result == null ) {
- result = new WorkingresourcePathHandler( nsName, WORKINGRESOURCE_PATH );
- wrpathHandlers.put( nsName, result );
+ public static UriHandler getWorkingresourcePathHandler() {
+ return workingresourcePathHandler;
}
- return result;
+
+ /**
+ * Factory method.
+ */
+ public static String getWorkingresourcePath() {
+ return WORKINGRESOURCE_PATH;
}
/**
* Protected constructor
*/
- protected WorkingresourcePathHandler( String nsName, String uri ) {
- super( nsName, uri );
+ protected WorkingresourcePathHandler( String uri ) {
+ super( uri );
}
/**
1.4 +18 -16 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WorkspacePathHandler.java 17 May 2002 15:50:50 -0000 1.3
+++ WorkspacePathHandler.java 20 May 2002 12:09:34 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WorkspacePathHandler.java,v 1.4 2002/05/20 12:09:34 pnever Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/20 12:09:34 $
*
* ====================================================================
*
@@ -69,31 +69,33 @@
public class WorkspacePathHandler extends UriHandler {
- public final static String WORKSPACE_PATH =
+ final static String WORKSPACE_PATH =
Domain.getParameter( I_WORKSPACEPATH, I_WORKSPACEPATH_DEFAULT );
+ final static WorkspacePathHandler workspacePathHandler =
+ new WorkspacePathHandler( WORKSPACE_PATH );
+
+
/**
* Factory method.
*/
- public static UriHandler
- getWorkspacePathHandler( NamespaceAccessToken nsaToken ) {
-
- String nsName = nsaToken.getName();
- UriHandler result = (UriHandler)wspathHandlers.get( nsName );
-
- if( result == null ) {
- result = new WorkspacePathHandler( nsName, WORKSPACE_PATH );
- wspathHandlers.put( nsName, result );
+ public static UriHandler getWorkspacePathHandler() {
+ return workspacePathHandler;
}
- return result;
+
+ /**
+ * Factory method.
+ */
+ public static String getWorkspacePath() {
+ return WORKSPACE_PATH;
}
/**
* Protected constructor
*/
- protected WorkspacePathHandler( String nsName, String uri ) {
- super( nsName, uri );
+ protected WorkspacePathHandler( String uri ) {
+ super( uri );
}
/**
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>