[Exist-commits] eXist-1.0/src/org/exist/xmldb LocalCollection.java,1.60,1.61 DatabaseImpl.java,1.25,1.26 RemoteIndexQueryService.java,1.12,1.13 RemoteCollectionManagementService.java,1.10,1.11 LocalIndexQueryService.java,1.13,1.14 RemoteCollection.java,1.26,1.27 LocalCollectionManagementService.java,1.21,1.22

[Pierrick B. <br...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/xmldb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20351/src/org/exist/xmldb

Modified Files:
	LocalCollection.java DatabaseImpl.java 
	RemoteIndexQueryService.java 
	RemoteCollectionManagementService.java 
	LocalIndexQueryService.java RemoteCollection.java 
	LocalCollectionManagementService.java 
Log Message:
Using named constants in collection names : daily commit.

Index: RemoteCollectionManagementService.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/RemoteCollectionManagementService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** RemoteCollectionManagementService.java	24 Oct 2005 17:13:57 -0000	1.10
--- RemoteCollectionManagementService.java	29 Oct 2005 16:45:46 -0000	1.11
***************
*** 6,9 ****
--- 6,10 ----
  import org.apache.xmlrpc.XmlRpcClient;
  import org.apache.xmlrpc.XmlRpcException;
+ import org.exist.storage.DBBroker;
  import org.exist.storage.NativeBroker;
  import org.w3c.dom.Document;
***************
*** 30,34 ****
      public Collection createCollection( String collName, Date created) throws XMLDBException {
          String name = collName;
!         if ( ( !collName.startsWith( "/db" ) ) && parent != null )
              name = parent.getPath() + "/" + collName;
  
--- 31,35 ----
      public Collection createCollection( String collName, Date created) throws XMLDBException {
          String name = collName;
!         if ( ( !collName.startsWith( DBBroker.ROOT_COLLECTION ) ) && parent != null )
              name = parent.getPath() + "/" + collName;
  
***************
*** 119,128 ****
       */
      public void move(String collectionPath, String destinationPath, String newName) throws XMLDBException {
!       /*  if(!collectionPath.startsWith("/db/"))
              collectionPath = parent.getPath() + '/' + collectionPath;*/
      	collectionPath = NativeBroker.checkPath(collectionPath, parent.getPath());
          /*if(destinationPath != null)
          {
!         	if(!destinationPath.startsWith("/db/"))
          		destinationPath = parent.getPath() + '/' + destinationPath;
          }
--- 120,129 ----
       */
      public void move(String collectionPath, String destinationPath, String newName) throws XMLDBException {
!       /*  if(!collectionPath.startsWith(DBBroker.ROOT_COLLECTION + "/"))
              collectionPath = parent.getPath() + '/' + collectionPath;*/
      	collectionPath = NativeBroker.checkPath(collectionPath, parent.getPath());
          /*if(destinationPath != null)
          {
!         	if(!destinationPath.startsWith(DBBroker.ROOT_COLLECTION + "/"))
          		destinationPath = parent.getPath() + '/' + destinationPath;
          }
***************
*** 157,166 ****
       */
      public void moveResource(String resourcePath, String destinationPath, String newName) throws XMLDBException {
!         /*if(!resourcePath.startsWith("/db/"))
              resourcePath = parent.getPath() + '/' + resourcePath;*/
      	resourcePath = NativeBroker.checkPath(resourcePath, parent.getPath());
          /*if(destinationPath != null)
          {
!         	if(!destinationPath.startsWith("/db/"))
          		destinationPath = parent.getPath() + '/' + destinationPath;
          }
--- 158,167 ----
       */
      public void moveResource(String resourcePath, String destinationPath, String newName) throws XMLDBException {
!         /*if(!resourcePath.startsWith(DBBroker.ROOT_COLLECTION + "/"))
              resourcePath = parent.getPath() + '/' + resourcePath;*/
      	resourcePath = NativeBroker.checkPath(resourcePath, parent.getPath());
          /*if(destinationPath != null)
          {
!         	if(!destinationPath.startsWith(DBBroker.ROOT_COLLECTION + "/"))
          		destinationPath = parent.getPath() + '/' + destinationPath;
          }
***************
*** 196,203 ****
  	public void copy(String collectionPath, String destinationPath, String newName)
  			throws XMLDBException {
! 		/*if(!collectionPath.startsWith("/db/"))
              collectionPath = parent.getPath() + '/' + collectionPath;*/
  		collectionPath = NativeBroker.checkPath(collectionPath, parent.getPath());
!         /*if(!destinationPath.startsWith("/db/"))
              destinationPath = parent.getPath() + '/' + destinationPath;*/
  		destinationPath = NativeBroker.checkPath(destinationPath, parent.getPath());
--- 197,204 ----
  	public void copy(String collectionPath, String destinationPath, String newName)
  			throws XMLDBException {
! 		/*if(!collectionPath.startsWith(DBBroker.ROOT_COLLECTION + "/"))
              collectionPath = parent.getPath() + '/' + collectionPath;*/
  		collectionPath = NativeBroker.checkPath(collectionPath, parent.getPath());
!         /*if(!destinationPath.startsWith(DBBroker.ROOT_COLLECTION + "/"))
              destinationPath = parent.getPath() + '/' + destinationPath;*/
  		destinationPath = NativeBroker.checkPath(destinationPath, parent.getPath());
***************
*** 229,236 ****
      public void copyResource(String resourcePath, String destinationPath,
              String newName) throws XMLDBException {
!     	/*if(!resourcePath.startsWith("/db/"))
              resourcePath = parent.getPath() + '/' + resourcePath;*/
      	resourcePath = NativeBroker.checkPath(resourcePath, parent.getPath());
!         /*if(!destinationPath.startsWith("/db/"))
              destinationPath = parent.getPath() + '/' + destinationPath;*/
      	destinationPath = NativeBroker.checkPath(destinationPath, parent.getPath());
--- 230,237 ----
      public void copyResource(String resourcePath, String destinationPath,
              String newName) throws XMLDBException {
!     	/*if(!resourcePath.startsWith(DBBroker.ROOT_COLLECTION+ "/"))
              resourcePath = parent.getPath() + '/' + resourcePath;*/
      	resourcePath = NativeBroker.checkPath(resourcePath, parent.getPath());
!         /*if(!destinationPath.startsWith(DBBroker.ROOT_COLLECTION + "/"))
              destinationPath = parent.getPath() + '/' + destinationPath;*/
      	destinationPath = NativeBroker.checkPath(destinationPath, parent.getPath());

Index: LocalIndexQueryService.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/LocalIndexQueryService.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** LocalIndexQueryService.java	24 Oct 2005 17:13:57 -0000	1.13
--- LocalIndexQueryService.java	29 Oct 2005 16:45:46 -0000	1.14
***************
*** 81,85 ****
       */
      public void reindexCollection(String collectionPath) throws XMLDBException {
!         /*String path = (collectionPath.startsWith("/db/") ? collectionPath : 
      		parent.getPath() + '/' + collectionPath);*/
      	String path = NativeBroker.checkPath(collectionPath, parent.getPath());
--- 81,85 ----
       */
      public void reindexCollection(String collectionPath) throws XMLDBException {
!         /*String path = (collectionPath.startsWith(DBBroker.ROOT_COLLECTION + "/") ? collectionPath : 
      		parent.getPath() + '/' + collectionPath);*/
      	String path = NativeBroker.checkPath(collectionPath, parent.getPath());

Index: DatabaseImpl.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/DatabaseImpl.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** DatabaseImpl.java	29 Sep 2005 08:35:05 -0000	1.25
--- DatabaseImpl.java	29 Oct 2005 16:45:46 -0000	1.26
***************
*** 31,34 ****
--- 31,35 ----
  import org.exist.EXistException;
  import org.exist.security.User;
+ import org.exist.storage.DBBroker;
  import org.exist.storage.BrokerPool;
  import org.exist.util.Configuration;
***************
*** 186,190 ****
          // try to figure out server address
          int p = 0;
!         if ( ( p = c.indexOf( "/db", 2 ) ) > -1 ) {
              address = "http://" + c.substring( 2, p );
              if(address.charAt(address.length() - 1) == '/')
--- 187,191 ----
          // try to figure out server address
          int p = 0;
!         if ( ( p = c.indexOf( DBBroker.ROOT_COLLECTION, 2 ) ) > -1 ) {
              address = "http://" + c.substring( 2, p );
              if(address.charAt(address.length() - 1) == '/')

Index: LocalCollection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/LocalCollection.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** LocalCollection.java	25 Oct 2005 17:43:57 -0000	1.60
--- LocalCollection.java	29 Oct 2005 16:45:46 -0000	1.61
***************
*** 129,133 ****
  		this.path = name;
  		if (path == null)
! 			path = "/db";
  		getCollection();
  	}
--- 129,133 ----
  		this.path = name;
  		if (path == null)
! 			path = DBBroker.ROOT_COLLECTION;
  		getCollection();
  	}
***************
*** 302,306 ****
  	
  	public org.xmldb.api.base.Collection getParentCollection() throws XMLDBException {
! 		if (getName().equals("/db"))
  			return null;
  		if (parent == null) {
--- 302,306 ----
  	
  	public org.xmldb.api.base.Collection getParentCollection() throws XMLDBException {
! 		if (getName().equals(DBBroker.ROOT_COLLECTION))
  			return null;
  		if (parent == null) {

Index: RemoteIndexQueryService.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/RemoteIndexQueryService.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** RemoteIndexQueryService.java	24 Oct 2005 17:13:57 -0000	1.12
--- RemoteIndexQueryService.java	29 Oct 2005 16:45:46 -0000	1.13
***************
*** 28,31 ****
--- 28,32 ----
  import org.apache.xmlrpc.XmlRpcException;
  import org.exist.dom.QName;
+ import org.exist.storage.DBBroker;
  import org.exist.storage.NativeBroker;
  import org.exist.util.Occurrences;
***************
*** 53,57 ****
      /** @see org.exist.xmldb.IndexQueryService#reindexCollection(java.lang.String) */
      public void reindexCollection(String collectionPath) throws XMLDBException {
!         /*String path = (collectionPath.startsWith("/db") ? collectionPath : 
      		parent.getPath() + '/' + collectionPath);*/
      	String path = NativeBroker.checkPath(collectionPath, parent.getPath());
--- 54,58 ----
      /** @see org.exist.xmldb.IndexQueryService#reindexCollection(java.lang.String) */
      public void reindexCollection(String collectionPath) throws XMLDBException {
!         /*String path = (collectionPath.startsWith(DBBroker.ROOT_COLLECTION) ? collectionPath : 
      		parent.getPath() + '/' + collectionPath);*/
      	String path = NativeBroker.checkPath(collectionPath, parent.getPath());

Index: LocalCollectionManagementService.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/LocalCollectionManagementService.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** LocalCollectionManagementService.java	24 Oct 2005 17:13:57 -0000	1.21
--- LocalCollectionManagementService.java	29 Oct 2005 16:45:46 -0000	1.22
***************
*** 120,124 ****
  
      public void removeCollection( String collName ) throws XMLDBException {
!     	//String path = (collName.startsWith("/db/") ? collName : 
      	//	parent.getPath() + '/' + collName);
      	String path = NativeBroker.checkPath(collName, parent.getPath());
--- 120,124 ----
  
      public void removeCollection( String collName ) throws XMLDBException {
!     	//String path = (collName.startsWith(DBBroker.ROOT_COLLECTION + "/") ? collName : 
      	//	parent.getPath() + '/' + collName);
      	String path = NativeBroker.checkPath(collName, parent.getPath());
***************
*** 159,163 ****
      public void move(String collectionPath, String destinationPath,
              String newName) throws XMLDBException {
!         /*if(!collectionPath.startsWith("/db/"))
              collectionPath = parent.getPath() + '/' + collectionPath;*/
      	collectionPath = NativeBroker.checkPath(collectionPath, parent.getPath());
--- 159,163 ----
      public void move(String collectionPath, String destinationPath,
              String newName) throws XMLDBException {
!         /*if(!collectionPath.startsWith(DBBroker.ROOT_COLLECTION + "/"))
              collectionPath = parent.getPath() + '/' + collectionPath;*/
      	collectionPath = NativeBroker.checkPath(collectionPath, parent.getPath());
***************
*** 165,169 ****
          if(destinationPath != null)
          {
!         	if(!destinationPath.startsWith("/db/"))
          		destinationPath = parent.getPath() + '/' + destinationPath;
          }
--- 165,169 ----
          if(destinationPath != null)
          {
!         	if(!destinationPath.startsWith(DBBroker.ROOT_COLLECTION + "/"))
          		destinationPath = parent.getPath() + '/' + destinationPath;
          }
***************
*** 216,225 ****
      public void moveResource(String resourcePath, String destinationPath,
              String newName) throws XMLDBException {
!         /*if(!resourcePath.startsWith("/db/"))
              resourcePath = parent.getPath() + '/' + resourcePath;*/
      	resourcePath = NativeBroker.checkPath(resourcePath, parent.getPath());
          /*if(destinationPath != null)
          {
!         	if(!destinationPath.startsWith("/db/"))
          		destinationPath = parent.getPath() + '/' + destinationPath;
          }
--- 216,225 ----
      public void moveResource(String resourcePath, String destinationPath,
              String newName) throws XMLDBException {
!         /*if(!resourcePath.startsWith(DBBroker.ROOT_COLLECTION + "/"))
              resourcePath = parent.getPath() + '/' + resourcePath;*/
      	resourcePath = NativeBroker.checkPath(resourcePath, parent.getPath());
          /*if(destinationPath != null)
          {
!         	if(!destinationPath.startsWith(DBBroker.ROOT_COLLECTION + "/"))
          		destinationPath = parent.getPath() + '/' + destinationPath;
          }
***************
*** 284,292 ****
  	public void copyResource(String resourcePath, String destinationPath,
  			String newName) throws XMLDBException {
! 		/*(if(!resourcePath.startsWith("/db/"))
              resourcePath = parent.getPath() + '/' + resourcePath;
              */
  		resourcePath = NativeBroker.checkPath(resourcePath, parent.getPath());
!         /*if(!destinationPath.startsWith("/db/"))
              destinationPath = parent.getPath() + '/' + destinationPath;*/
  		destinationPath = NativeBroker.checkPath(destinationPath, parent.getPath());
--- 284,292 ----
  	public void copyResource(String resourcePath, String destinationPath,
  			String newName) throws XMLDBException {
! 		/*(if(!resourcePath.startsWith(DBBroker.ROOT_COLLECTION + "/"))
              resourcePath = parent.getPath() + '/' + resourcePath;
              */
  		resourcePath = NativeBroker.checkPath(resourcePath, parent.getPath());
!         /*if(!destinationPath.startsWith(DBBroker.ROOT_COLLECTION + "/"))
              destinationPath = parent.getPath() + '/' + destinationPath;*/
  		destinationPath = NativeBroker.checkPath(destinationPath, parent.getPath());
***************
*** 343,350 ****
  	public void copy(String collectionPath, String destinationPath, String newName)
  			throws XMLDBException {
! 		/*if(!collectionPath.startsWith("/db/"))
              collectionPath = parent.getPath() + '/' + collectionPath;*/
  		collectionPath = NativeBroker.checkPath(collectionPath, parent.getPath());
!         /*if(!destinationPath.startsWith("/db/"))
              destinationPath = parent.getPath() + '/' + destinationPath;
              */
--- 343,350 ----
  	public void copy(String collectionPath, String destinationPath, String newName)
  			throws XMLDBException {
! 		/*if(!collectionPath.startsWith(DBBroker.ROOT_COLLECTION + "/"))
              collectionPath = parent.getPath() + '/' + collectionPath;*/
  		collectionPath = NativeBroker.checkPath(collectionPath, parent.getPath());
!         /*if(!destinationPath.startsWith(DBBroker.ROOT_COLLECTION + "/"))
              destinationPath = parent.getPath() + '/' + destinationPath;
              */

Index: RemoteCollection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/RemoteCollection.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** RemoteCollection.java	25 Oct 2005 17:43:57 -0000	1.26
--- RemoteCollection.java	29 Oct 2005 16:45:46 -0000	1.27
***************
*** 39,42 ****
--- 39,43 ----
  import org.apache.xmlrpc.XmlRpcException;
  import org.exist.security.Permission;
+ import org.exist.storage.DBBroker;
  import org.exist.validation.service.RemoteValidationService;
  import org.exist.xmlrpc.RpcServer;
***************
*** 147,151 ****
  
  	public Collection getParentCollection() throws XMLDBException {
! 	    if(parent == null && !name.equals("/db")) {
  	        String parentName = name.substring(0, name.lastIndexOf('/'));
  	        return new RemoteCollection(rpcClient, null, parentName);
--- 148,152 ----
  
  	public Collection getParentCollection() throws XMLDBException {
! 	    if(parent == null && !name.equals(DBBroker.ROOT_COLLECTION)) {
  	        String parentName = name.substring(0, name.lastIndexOf('/'));
  	        return new RemoteCollection(rpcClient, null, parentName);
***************
*** 159,163 ****
  		        return name;
  		    else
! 		        return "/db";
  		}
  		return name;
--- 160,164 ----
  		        return name;
  		    else
! 		        return DBBroker.ROOT_COLLECTION;
  		}
  		return name;