pnever 02/05/22 09:23:57
Modified: src/share/org/apache/slide/content ContentImpl.java
src/webdav/server/org/apache/slide/webdav/util
DeltavUriRedirector.java
Log:
No NamespaceAccessToken required for URI redirection anymore
Revision Changes Path
1.41 +16 -16
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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ContentImpl.java 21 May 2002 09:04:17 -0000 1.40
+++ ContentImpl.java 22 May 2002 16:23:56 -0000 1.41
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.40
2002/05/21 09:04:17 pnever Exp $
- * $Revision: 1.40 $
- * $Date: 2002/05/21 09:04:17 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.41
2002/05/22 16:23:56 pnever Exp $
+ * $Revision: 1.41 $
+ * $Date: 2002/05/22 16:23:56 $
*
* ====================================================================
*
@@ -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.40 $
- * @version $Revision: 1.40 $
+ * @version $Revision: 1.41 $
+ * @version $Revision: 1.41 $
*/
public final class ContentImpl implements Content {
@@ -178,7 +178,7 @@
LinkedObjectNotFoundException, ServiceAccessException, ObjectLockedException {
String originalUri = strUri;
- strUri = redirectUri( Domain.accessNamespace(null, namespace.getName()),
originalUri ); // security token null - is ignored anyway
+ strUri = redirectUri( originalUri ); // security token null - is ignored
anyway
ObjectNode associatedObject =
structureHelper.retrieve(token, strUri, false);
@@ -225,8 +225,8 @@
NodeRevisionDescriptor result;
Uri objectUri = namespace.getUri(token, revisionDescriptors.getUri());
- NodeRevisionNumber latestNrn = redirectLatestRevisionNumber(
- Domain.accessNamespace(null, namespace.getName()),
revisionDescriptors.getOriginalUri() );
+ NodeRevisionNumber latestNrn =
+ redirectLatestRevisionNumber( revisionDescriptors.getOriginalUri() );
NodeRevisionDescriptors realRevisionDescriptors = objectUri.getStore()
.retrieveRevisionDescriptors(objectUri);
@@ -312,8 +312,8 @@
NodeRevisionDescriptor result;
Uri objectUri = namespace.getUri(token, revisionDescriptors.getUri());
- NodeRevisionNumber latestNrn = redirectLatestRevisionNumber(
- Domain.accessNamespace(null, namespace.getName()),
revisionDescriptors.getOriginalUri() );
+ NodeRevisionNumber latestNrn =
+ redirectLatestRevisionNumber( revisionDescriptors.getOriginalUri() );
NodeRevisionDescriptors realRevisionDescriptors = objectUri.getStore()
.retrieveRevisionDescriptors(objectUri);
@@ -1360,14 +1360,14 @@
/**
*
*/
- protected String redirectUri( NamespaceAccessToken nsaToken, String uri ) {
+ protected String redirectUri( String uri ) {
String result = uri;
if( uriRedirectorClass != null ) {
try {
Method ru = uriRedirectorClass.getMethod(
- "redirectUri", new Class[]{NamespaceAccessToken.class,
String.class} );
- result = (String)ru.invoke( null, new Object[]{nsaToken, uri} ); //
obj=null since method is static
+ "redirectUri", new Class[]{String.class} );
+ result = (String)ru.invoke( null, new Object[]{uri} ); // obj=null
since method is static
}
catch( Exception x ) {
Domain.warn( "Redirecting of URI "+uri+" failed: "+x.getMessage() );
@@ -1380,14 +1380,14 @@
/**
*
*/
- protected NodeRevisionNumber redirectLatestRevisionNumber( NamespaceAccessToken
nsaToken, String uri ) {
+ protected NodeRevisionNumber redirectLatestRevisionNumber( String uri ) {
NodeRevisionNumber result = null;
if( uriRedirectorClass != null ) {
try {
Method ru = uriRedirectorClass.getMethod(
- "redirectLatestRevisionNumber", new
Class[]{NamespaceAccessToken.class, String.class} );
- result = (NodeRevisionNumber)ru.invoke( null, new
Object[]{nsaToken, uri} ); // obj=null since method is static
+ "redirectLatestRevisionNumber", new Class[]{String.class} );
+ result = (NodeRevisionNumber)ru.invoke( null, new Object[]{uri} );
// obj=null since method is static
}
catch( Exception x ) {
Domain.warn( "Redirecting of latest revision number for "+uri+"
failed: "+x.getMessage() );
1.3 +5 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavUriRedirector.java
Index: DeltavUriRedirector.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavUriRedirector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeltavUriRedirector.java 20 May 2002 12:10:14 -0000 1.2
+++ DeltavUriRedirector.java 22 May 2002 16:23:56 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavUriRedirector.java,v
1.2 2002/05/20 12:10:14 pnever Exp $
- * $Revision: 1.2 $
- * $Date: 2002/05/20 12:10:14 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavUriRedirector.java,v
1.3 2002/05/22 16:23:56 pnever Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/22 16:23:56 $
*
* ====================================================================
*
@@ -78,7 +78,7 @@
/**
*
*/
- public static String redirectUri( NamespaceAccessToken nsaToken, String uri ) {
+ public static String redirectUri( String uri ) {
String result = uri;
if( Configuration.useVersionControl() ) {
@@ -93,7 +93,7 @@
/**
*
*/
- public static NodeRevisionNumber redirectLatestRevisionNumber(
NamespaceAccessToken nsaToken, String uri ) {
+ public static NodeRevisionNumber redirectLatestRevisionNumber( String uri ) {
NodeRevisionNumber result = null;
if( Configuration.useVersionControl() ) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
