[Exist-commits] eXist-1.0/src/org/exist/cocoon XQueryGenerator.java,1.12,1.13

[Wolfgang M. M. <wol...@us...>]

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

Modified Files:
	XQueryGenerator.java 
Log Message:
request, response and session objects can not be passed to a remote database 
instance. Check added.

Index: XQueryGenerator.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/cocoon/XQueryGenerator.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** XQueryGenerator.java	14 Apr 2004 12:17:24 -0000	1.12
--- XQueryGenerator.java	15 Apr 2004 09:20:54 -0000	1.13
***************
*** 46,49 ****
--- 46,50 ----
  import org.exist.storage.serializers.EXistOutputKeys;
  import org.exist.storage.serializers.Serializer;
+ import org.exist.xmldb.CollectionImpl;
  import org.exist.xmldb.CompiledExpression;
  import org.exist.xmldb.XQueryService;
***************
*** 204,215 ****
  			service.setNamespace(prefix, RequestModule.NAMESPACE_URI);
  			service.setModuleLoadPath(baseURI);
! 			HttpServletRequest httpRequest = (HttpServletRequest) objectModel
! 					.get(HttpEnvironment.HTTP_REQUEST_OBJECT);
! 			service.declareVariable(prefix + ":request",
! 					new CocoonRequestWrapper(request, httpRequest));
! 			service.declareVariable(prefix + ":response",
! 					new CocoonResponseWrapper(response));
! 			service.declareVariable(prefix + ":session",
! 					new CocoonSessionWrapper(session));
  			declareParameters(service);
  			
--- 205,218 ----
  			service.setNamespace(prefix, RequestModule.NAMESPACE_URI);
  			service.setModuleLoadPath(baseURI);
! 			if(!((CollectionImpl)collection).isRemoteCollection()) {
! 				HttpServletRequest httpRequest = (HttpServletRequest) objectModel
! 						.get(HttpEnvironment.HTTP_REQUEST_OBJECT);
! 				service.declareVariable(prefix + ":request",
! 						new CocoonRequestWrapper(request, httpRequest));
! 				service.declareVariable(prefix + ":response",
! 						new CocoonResponseWrapper(response));
! 				service.declareVariable(prefix + ":session",
! 						new CocoonSessionWrapper(session));
! 			}
  			declareParameters(service);