[Exist-commits] eXist-1.0/src/org/exist/xmldb LocalCollection.java,1.39,1.40 RemoteCollection.java,1.14,1.15

[Jean-Marc V. <jm...@us...>]

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

Modified Files:
	LocalCollection.java RemoteCollection.java 
Log Message:
add XML Schema validation (commands putschema and validate) - test in progress

Index: LocalCollection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/LocalCollection.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** LocalCollection.java	4 Aug 2004 14:48:05 -0000	1.39
--- LocalCollection.java	7 Aug 2004 14:55:59 -0000	1.40
***************
*** 43,46 ****
--- 43,47 ----
  import org.exist.dom.BinaryDocument;
  import org.exist.dom.DocumentImpl;
+ import org.exist.schema.LocalSchemaService;
  import org.exist.security.Permission;
  import org.exist.security.PermissionDeniedException;
***************
*** 401,409 ****
  			return new LocalIndexQueryService(user, brokerPool, this);
  
  		throw new XMLDBException(ErrorCodes.NO_SUCH_SERVICE);
  	}
  
  	public Service[] getServices() throws XMLDBException {
! 		Service[] services = new Service[6];
  		services[0] = new LocalXPathQueryService(user, brokerPool, this);
  		services[1] = new LocalCollectionManagementService(user, brokerPool, this);
--- 402,413 ----
  			return new LocalIndexQueryService(user, brokerPool, this);
  
+ 		if (name.equals("SchemaService"))
+ 			return new LocalSchemaService(user, brokerPool, this);
+ 		
  		throw new XMLDBException(ErrorCodes.NO_SUCH_SERVICE);
  	}
  
  	public Service[] getServices() throws XMLDBException {
! 		Service[] services = new Service[7];
  		services[0] = new LocalXPathQueryService(user, brokerPool, this);
  		services[1] = new LocalCollectionManagementService(user, brokerPool, this);
***************
*** 412,415 ****
--- 416,420 ----
  		services[4] = new LocalXUpdateQueryService(user, brokerPool, this);
  		services[5] = new LocalIndexQueryService(user, brokerPool, this);
+ 		services[6] = new LocalSchemaService(user, brokerPool, this);
  		return services; // jmv null;
  	}

Index: RemoteCollection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xmldb/RemoteCollection.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** RemoteCollection.java	8 Jun 2004 08:16:08 -0000	1.14
--- RemoteCollection.java	7 Aug 2004 14:55:59 -0000	1.15
***************
*** 40,43 ****
--- 40,44 ----
  import org.apache.xmlrpc.XmlRpcClient;
  import org.apache.xmlrpc.XmlRpcException;
+ import org.exist.schema.RemoteSchemaService;
  import org.exist.security.Permission;
  import org.exist.xmlrpc.RpcServer;
***************
*** 203,211 ****
  		if (name.equals("XUpdateQueryService"))
  			return new RemoteXUpdateQueryService(this);
  		throw new XMLDBException(ErrorCodes.NO_SUCH_SERVICE);
  	}
  
  	public Service[] getServices() throws XMLDBException {
! 		Service[] services = new Service[6];
  		services[0] = new RemoteXPathQueryService(this);
  		services[1] = new RemoteCollectionManagementService(this, rpcClient);
--- 204,214 ----
  		if (name.equals("XUpdateQueryService"))
  			return new RemoteXUpdateQueryService(this);
+ 		if (name.equals("SchemaService"))
+ 			return new RemoteSchemaService(this);
  		throw new XMLDBException(ErrorCodes.NO_SUCH_SERVICE);
  	}
  
  	public Service[] getServices() throws XMLDBException {
! 		Service[] services = new Service[7];
  		services[0] = new RemoteXPathQueryService(this);
  		services[1] = new RemoteCollectionManagementService(this, rpcClient);
***************
*** 214,217 ****
--- 217,221 ----
  		services[4] = new RemoteIndexQueryService(rpcClient, this);
  		services[5] = new RemoteXUpdateQueryService(this);
+ 		services[6] = new RemoteSchemaService(this);
  		return services;
  	}