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 ju...@apache.org on 2002/03/05 16:21:32 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/common Uri.java Service.java Namespace.java AbstractServiceBase.java
juergen 02/03/05 07:21:32
Modified: src/share/org/apache/slide/common Uri.java Service.java
Namespace.java AbstractServiceBase.java
Log:
changed parameter from SlideToken to CredentialsToken (Eckehard)
Revision Changes Path
1.9 +6 -6 jakarta-slide/src/share/org/apache/slide/common/Uri.java
Index: Uri.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Uri.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Uri.java 28 Feb 2002 09:46:17 -0000 1.8
+++ Uri.java 5 Mar 2002 15:21:32 -0000 1.9
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Uri.java,v 1.8 2002/02/28 09:46:17 juergen Exp $
- * $Revision: 1.8 $
- * $Date: 2002/02/28 09:46:17 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Uri.java,v 1.9 2002/03/05 15:21:32 juergen Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/03/05 15:21:32 $
*
* ====================================================================
*
@@ -74,7 +74,7 @@
* manipulated by Slide.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public final class Uri implements Cloneable, java.io.Serializable {
@@ -259,7 +259,7 @@
*/
public void reconnectServices() {
try {
- store.connectIfNeeded(token);
+ store.connectIfNeeded(token.getCredentialsToken());
} catch (ServiceConnectionFailedException e) {
parseUri(this.uri);
} catch (ServiceAccessException e) {
@@ -362,7 +362,7 @@
Scope courScope = scopes.nextScope();
try {
if (store == null) {
- store = namespace.retrieveStore(courScope, token);
+ store = namespace.retrieveStore(courScope, token.getCredentialsToken());
if (store != null) {
scope = courScope;
// The PK in the current descriptorsStore is the
1.9 +9 -8 jakarta-slide/src/share/org/apache/slide/common/Service.java
Index: Service.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Service.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Service.java 28 Feb 2002 09:46:17 -0000 1.8
+++ Service.java 5 Mar 2002 15:21:32 -0000 1.9
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Service.java,v 1.8 2002/02/28 09:46:17 juergen Exp $
- * $Revision: 1.8 $
- * $Date: 2002/02/28 09:46:17 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Service.java,v 1.9 2002/03/05 15:21:32 juergen Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/03/05 15:21:32 $
*
* ====================================================================
*
@@ -67,12 +67,13 @@
import java.util.Enumeration;
import javax.transaction.xa.XAResource;
import org.apache.slide.util.logger.Logger;
+import org.apache.slide.authenticate.CredentialsToken;
/**
* Slide Service interface.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public interface Service
extends XAResource {
@@ -121,9 +122,9 @@
* Connects to the underlying data source (if any is needed).
*
* @exception ServiceConnectionFailedException Connection failed
- * @param token the slide token containing e.g. the credential
+ * @param token the Credeantials token containing e.g. the credential
*/
- void connect(SlideToken token)
+ void connect(CredentialsToken crdtoken)
throws ServiceConnectionFailedException;
@@ -180,12 +181,12 @@
/**
* Connects to the service, if we were not previously connected.
*
- * @param token the slide token containing e.g. the credential
+ * @param token the Credeantials token containing e.g. the credential
* @return boolean true if we were not already connected
* @exception ServiceAccessException Unspecified service access error
* @exception ServiceConnectionFailedException Connection failed
*/
- boolean connectIfNeeded(SlideToken token)
+ boolean connectIfNeeded(CredentialsToken crdtoken)
throws ServiceConnectionFailedException, ServiceAccessException;
1.45 +8 -7 jakarta-slide/src/share/org/apache/slide/common/Namespace.java
Index: Namespace.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Namespace.java 28 Feb 2002 09:46:17 -0000 1.44
+++ Namespace.java 5 Mar 2002 15:21:32 -0000 1.45
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v 1.44 2002/02/28 09:46:17 juergen Exp $
- * $Revision: 1.44 $
- * $Date: 2002/02/28 09:46:17 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v 1.45 2002/03/05 15:21:32 juergen Exp $
+ * $Revision: 1.45 $
+ * $Date: 2002/03/05 15:21:32 $
*
* ====================================================================
*
@@ -125,7 +125,7 @@
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
* @author Dirk Verbeeck
- * @version $Revision: 1.44 $
+ * @version $Revision: 1.45 $
*/
public final class Namespace {
@@ -507,12 +507,12 @@
* Connects a data source on demand.
*
* @param service Service on which a connection attempt will be made
- * @param token the slide token containing e.g. the credential
+ * @param token the credentials token containing e.g. the credential
* @exception ServiceConnectionFailedException Error connecting service
* @exception ServiceAccessException Unspecified low level service
* access exception
*/
- public void connectService(Service service, SlideToken token)
+ public void connectService(Service service, CredentialsToken token)
throws ServiceConnectionFailedException, ServiceAccessException {
// Try to connect ...
boolean newConnection = service.connectIfNeeded(token);
@@ -606,10 +606,11 @@
* connect to the store.
*
* @param scope Scope to match
+ * @param token the Credeantials token containing e.g. the credential
* @exception ServiceConnectionFailedException Connection to Store failed
* @exception ServiceAccessException Unspecified service access exception
*/
- public Store retrieveStore(Scope scope, SlideToken token)
+ public Store retrieveStore(Scope scope, CredentialsToken token)
throws ServiceConnectionFailedException, ServiceAccessException {
Store store = getStore(scope);
if (store != null) {
1.6 +9 -7 jakarta-slide/src/share/org/apache/slide/common/AbstractServiceBase.java
Index: AbstractServiceBase.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/AbstractServiceBase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractServiceBase.java 28 Feb 2002 09:46:17 -0000 1.5
+++ AbstractServiceBase.java 5 Mar 2002 15:21:32 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/AbstractServiceBase.java,v 1.5 2002/02/28 09:46:17 juergen Exp $
- * $Revision: 1.5 $
- * $Date: 2002/02/28 09:46:17 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/AbstractServiceBase.java,v 1.6 2002/03/05 15:21:32 juergen Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/03/05 15:21:32 $
*
* ====================================================================
*
@@ -67,12 +67,13 @@
import java.util.Enumeration;
import java.util.Vector;
import org.apache.slide.util.logger.Logger;
+import org.apache.slide.authenticate.CredentialsToken;
/**
* Slide Service abstract implementation.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public abstract class AbstractServiceBase implements Service {
@@ -149,10 +150,10 @@
* Connects to the underlying data source (if any is needed).
* Compatibility implementation for the previous store implementations
*
- * @param token the slide token containing e.g. the credential
+ * @param crdtoken the slide token containing e.g. the credential
* @exception ServiceConnectionFailedException Connection failed
*/
- public void connect(SlideToken token) throws ServiceConnectionFailedException {
+ public void connect(CredentialsToken crdtoken) throws ServiceConnectionFailedException {
connect();
}
@@ -211,11 +212,12 @@
/**
* Connects to the service, if we were not previously connected.
*
+ * @param token the Credeantials token containing e.g. the credential
* @return boolean true if we were not already connected
* @exception ServiceAccessException Unspecified service access error
* @exception ServiceConnectionFailedException Connection failed
*/
- public boolean connectIfNeeded(SlideToken token)
+ public boolean connectIfNeeded(CredentialsToken token)
throws ServiceConnectionFailedException, ServiceAccessException {
boolean result = true;
try {
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>