From: <di...@us...> - 2008-10-26 15:04:12
|
Revision: 8289 http://exist.svn.sourceforge.net/exist/?rev=8289&view=rev Author: dizzzz Date: 2008-10-26 15:03:36 +0000 (Sun, 26 Oct 2008) Log Message: ----------- [ignore] first step to get branche working ; improves junit suite from 1274 tests/68 failures/10 errors back to 1289/22/0 ; probably need some help on RestServer. in the end only 'src' and 'test' need to be merged Modified Paths: -------------- branches/allad/jsr-225/.classpath branches/allad/jsr-225/bin/backup.bat branches/allad/jsr-225/bin/run.bat branches/allad/jsr-225/bin/shutdown.bat branches/allad/jsr-225/bin/startup_cluster.bat branches/allad/jsr-225/build/scripts/build-impl.xml branches/allad/jsr-225/build/scripts/cocoon/exist-jars.xsl branches/allad/jsr-225/build/scripts/demoserver.xml branches/allad/jsr-225/conf.xml.tmpl branches/allad/jsr-225/extensions/fluent/src/org/exist/fluent/Document.java branches/allad/jsr-225/extensions/fluent/src/org/exist/fluent/Item.java branches/allad/jsr-225/extensions/fluent/test/src/org/exist/fluent/DocumentTest.java branches/allad/jsr-225/extensions/indexes/build.properties branches/allad/jsr-225/extensions/indexes/common.xml branches/allad/jsr-225/extensions/indexes/modules.xml branches/allad/jsr-225/extensions/indexes/ngram/build.xml branches/allad/jsr-225/extensions/indexes/ngram/src/org/exist/indexing/ngram/NGramIndexConfig.java branches/allad/jsr-225/extensions/indexes/ngram/src/org/exist/indexing/ngram/NGramIndexWorker.java branches/allad/jsr-225/extensions/indexes/ngram/src/org/exist/xquery/modules/ngram/HighlightMatches.java branches/allad/jsr-225/extensions/indexes/ngram/test/src/org/exist/indexing/ngram/CustomIndexTest.java branches/allad/jsr-225/extensions/indexes/spatial/build.xml branches/allad/jsr-225/extensions/indexes/spatial/hsql.sh branches/allad/jsr-225/extensions/indexes/spatial/src/org/exist/indexing/spatial/AbstractGMLJDBCIndex.java branches/allad/jsr-225/extensions/indexes/spatial/src/org/exist/indexing/spatial/AbstractGMLJDBCIndexWorker.java branches/allad/jsr-225/extensions/indexes/spatial/src/org/exist/indexing/spatial/GMLHSQLIndex.java branches/allad/jsr-225/extensions/indexes/spatial/src/org/exist/indexing/spatial/GMLHSQLIndexWorker.java branches/allad/jsr-225/extensions/indexes/spatial/test/src/org/exist/indexing/spatial/GMLIndexTest.java branches/allad/jsr-225/extensions/modules/build.properties branches/allad/jsr-225/extensions/modules/build.xml branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/ModuleUtils.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/compression/CompressionModule.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/compression/ZipFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/datetime/DateForFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/datetime/FormatDateFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/datetime/FormatTimeFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/httpclient/BaseHTTPClientFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/httpclient/DELETEFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/httpclient/GETFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/httpclient/HEADFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/httpclient/OPTIONSFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/httpclient/POSTFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/httpclient/PUTFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/image/GetMetadataFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/image/GetThumbnailsFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/image/ScaleFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/mail/SendEmailFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/math/NoParamFunctions.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/math/OneParamFunctions.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/math/TwoParamFunctions.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/scheduler/GetScheduledJobs.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/sql/ExecuteFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/sql/GetConnectionFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/sql/GetJNDIConnectionFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/svn/svntask.xql branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/xslfo/RenderFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/xslfo/readme.txt branches/allad/jsr-225/installer/install.xml.tmpl branches/allad/jsr-225/mime-types.xml.tmpl branches/allad/jsr-225/samples/xinclude/sidebar.xml branches/allad/jsr-225/samples/xinclude/xinclude.xml branches/allad/jsr-225/samples/xquery/call.xq branches/allad/jsr-225/src/org/exist/Indexer.java branches/allad/jsr-225/src/org/exist/JettyStart.java branches/allad/jsr-225/src/org/exist/atom/http/AtomServlet.java branches/allad/jsr-225/src/org/exist/backup/Restore.java branches/allad/jsr-225/src/org/exist/client/ClientFrame.java branches/allad/jsr-225/src/org/exist/client/CollectionXConf.java branches/allad/jsr-225/src/org/exist/client/InteractiveClient.java branches/allad/jsr-225/src/org/exist/cluster/ClusterCollection.java branches/allad/jsr-225/src/org/exist/collections/Collection.java branches/allad/jsr-225/src/org/exist/collections/triggers/XQueryTrigger.java branches/allad/jsr-225/src/org/exist/dom/AbstractNodeSet.java branches/allad/jsr-225/src/org/exist/dom/DefaultDocumentSet.java branches/allad/jsr-225/src/org/exist/dom/DocumentImpl.java branches/allad/jsr-225/src/org/exist/dom/ElementImpl.java branches/allad/jsr-225/src/org/exist/dom/ExtArrayNodeSet.java branches/allad/jsr-225/src/org/exist/dom/Match.java branches/allad/jsr-225/src/org/exist/dom/NodeProxy.java branches/allad/jsr-225/src/org/exist/dom/NodeSet.java branches/allad/jsr-225/src/org/exist/dom/NodeSetHelper.java branches/allad/jsr-225/src/org/exist/dom/VirtualNodeSet.java branches/allad/jsr-225/src/org/exist/dom/XMLUtil.java branches/allad/jsr-225/src/org/exist/fulltext/FTIndexWorker.java branches/allad/jsr-225/src/org/exist/fulltext/FTMatchListener.java branches/allad/jsr-225/src/org/exist/http/SOAPServer.java branches/allad/jsr-225/src/org/exist/http/servlets/EXistServlet.java branches/allad/jsr-225/src/org/exist/http/servlets/HttpServletRequestWrapper.java branches/allad/jsr-225/src/org/exist/http/urlrewrite/Forward.java branches/allad/jsr-225/src/org/exist/http/urlrewrite/PassThrough.java branches/allad/jsr-225/src/org/exist/http/urlrewrite/PathForward.java branches/allad/jsr-225/src/org/exist/http/urlrewrite/Redirect.java branches/allad/jsr-225/src/org/exist/http/urlrewrite/URLRewrite.java branches/allad/jsr-225/src/org/exist/http/urlrewrite/XQueryURLRewrite.java branches/allad/jsr-225/src/org/exist/http/webdav/methods/Head.java branches/allad/jsr-225/src/org/exist/http/webdav/methods/Move.java branches/allad/jsr-225/src/org/exist/http/webdav/methods/Propfind.java branches/allad/jsr-225/src/org/exist/http/webdav/methods/Put.java branches/allad/jsr-225/src/org/exist/http/webdav/methods/collection.xq branches/allad/jsr-225/src/org/exist/indexing/AbstractMatchListener.java branches/allad/jsr-225/src/org/exist/indexing/IndexController.java branches/allad/jsr-225/src/org/exist/indexing/IndexWorker.java branches/allad/jsr-225/src/org/exist/management/impl/DatabaseMBean.java branches/allad/jsr-225/src/org/exist/management/impl/JMXAgent.java branches/allad/jsr-225/src/org/exist/memtree/AttributeImpl.java branches/allad/jsr-225/src/org/exist/memtree/DocumentImpl.java branches/allad/jsr-225/src/org/exist/memtree/InMemoryNodeSet.java branches/allad/jsr-225/src/org/exist/memtree/MemTreeBuilder.java branches/allad/jsr-225/src/org/exist/memtree/NodeImpl.java branches/allad/jsr-225/src/org/exist/soap/AdminSoapBindingImpl.java branches/allad/jsr-225/src/org/exist/soap/QuerySoapBindingImpl.java branches/allad/jsr-225/src/org/exist/source/DBSource.java branches/allad/jsr-225/src/org/exist/start/LatestFileResolver.java branches/allad/jsr-225/src/org/exist/start/start.config branches/allad/jsr-225/src/org/exist/stax/EmbeddedXMLStreamReader.java branches/allad/jsr-225/src/org/exist/storage/BrokerPool.java branches/allad/jsr-225/src/org/exist/storage/ConsistencyCheckTask.java branches/allad/jsr-225/src/org/exist/storage/DBBroker.java branches/allad/jsr-225/src/org/exist/storage/DefaultCacheManager.java branches/allad/jsr-225/src/org/exist/storage/ElementIndex.java branches/allad/jsr-225/src/org/exist/storage/IndexSpec.java branches/allad/jsr-225/src/org/exist/storage/NativeBroker.java branches/allad/jsr-225/src/org/exist/storage/NativeElementIndex.java branches/allad/jsr-225/src/org/exist/storage/NativeTextEngine.java branches/allad/jsr-225/src/org/exist/storage/NativeValueIndex.java branches/allad/jsr-225/src/org/exist/storage/NodePath.java branches/allad/jsr-225/src/org/exist/storage/RangeIndexSpec.java branches/allad/jsr-225/src/org/exist/storage/ValueIndexFactory.java branches/allad/jsr-225/src/org/exist/storage/XQueryMonitor.java branches/allad/jsr-225/src/org/exist/storage/btree/BTree.java branches/allad/jsr-225/src/org/exist/storage/btree/Paged.java branches/allad/jsr-225/src/org/exist/storage/dom/DOMFile.java branches/allad/jsr-225/src/org/exist/storage/index/BFile.java branches/allad/jsr-225/src/org/exist/storage/journal/Journal.java branches/allad/jsr-225/src/org/exist/storage/lock/FileLock.java branches/allad/jsr-225/src/org/exist/storage/recovery/RecoveryManager.java branches/allad/jsr-225/src/org/exist/storage/report/XMLStatistics.java branches/allad/jsr-225/src/org/exist/storage/serializers/Serializer.java branches/allad/jsr-225/src/org/exist/storage/serializers/XIncludeFilter.java branches/allad/jsr-225/src/org/exist/storage/statistics/DataGuide.java branches/allad/jsr-225/src/org/exist/storage/statistics/IndexStatistics.java branches/allad/jsr-225/src/org/exist/storage/statistics/IndexStatisticsWorker.java branches/allad/jsr-225/src/org/exist/storage/statistics/NodeStats.java branches/allad/jsr-225/src/org/exist/util/Configuration.java branches/allad/jsr-225/src/org/exist/validation/XmlLibraryChecker.java branches/allad/jsr-225/src/org/exist/webstart/JnlpHelper.java branches/allad/jsr-225/src/org/exist/webstart/JnlpJarFiles.java branches/allad/jsr-225/src/org/exist/webstart/JnlpServlet.java branches/allad/jsr-225/src/org/exist/xmldb/LocalBinaryResource.java branches/allad/jsr-225/src/org/exist/xmldb/LocalCollection.java branches/allad/jsr-225/src/org/exist/xmldb/LocalXMLResource.java branches/allad/jsr-225/src/org/exist/xmldb/RemoteBinaryResource.java branches/allad/jsr-225/src/org/exist/xmldb/RemoteCollection.java branches/allad/jsr-225/src/org/exist/xmldb/RemoteXMLResource.java branches/allad/jsr-225/src/org/exist/xmlrpc/RpcConnection.java branches/allad/jsr-225/src/org/exist/xquery/AncestorSelector.java branches/allad/jsr-225/src/org/exist/xquery/AttributeConstructor.java branches/allad/jsr-225/src/org/exist/xquery/BasicExpressionVisitor.java branches/allad/jsr-225/src/org/exist/xquery/BindingExpression.java branches/allad/jsr-225/src/org/exist/xquery/CastExpression.java branches/allad/jsr-225/src/org/exist/xquery/DocumentConstructor.java branches/allad/jsr-225/src/org/exist/xquery/DynamicAttributeConstructor.java branches/allad/jsr-225/src/org/exist/xquery/DynamicCommentConstructor.java branches/allad/jsr-225/src/org/exist/xquery/DynamicPIConstructor.java branches/allad/jsr-225/src/org/exist/xquery/ElementConstructor.java branches/allad/jsr-225/src/org/exist/xquery/ExpressionVisitor.java branches/allad/jsr-225/src/org/exist/xquery/FilteredExpression.java branches/allad/jsr-225/src/org/exist/xquery/ForExpr.java branches/allad/jsr-225/src/org/exist/xquery/FunctionCall.java branches/allad/jsr-225/src/org/exist/xquery/FunctionFactory.java branches/allad/jsr-225/src/org/exist/xquery/GeneralComparison.java branches/allad/jsr-225/src/org/exist/xquery/LetExpr.java branches/allad/jsr-225/src/org/exist/xquery/LocationStep.java branches/allad/jsr-225/src/org/exist/xquery/ModuleContext.java branches/allad/jsr-225/src/org/exist/xquery/NodeComparison.java branches/allad/jsr-225/src/org/exist/xquery/OpNumeric.java branches/allad/jsr-225/src/org/exist/xquery/Optimize.java branches/allad/jsr-225/src/org/exist/xquery/Optimizer.java branches/allad/jsr-225/src/org/exist/xquery/PIConstructor.java branches/allad/jsr-225/src/org/exist/xquery/PathExpr.java branches/allad/jsr-225/src/org/exist/xquery/Predicate.java branches/allad/jsr-225/src/org/exist/xquery/QuantifiedExpression.java branches/allad/jsr-225/src/org/exist/xquery/RootNode.java branches/allad/jsr-225/src/org/exist/xquery/SimpleStep.java branches/allad/jsr-225/src/org/exist/xquery/UnaryExpr.java branches/allad/jsr-225/src/org/exist/xquery/UserDefinedFunction.java branches/allad/jsr-225/src/org/exist/xquery/Variable.java branches/allad/jsr-225/src/org/exist/xquery/VariableReference.java branches/allad/jsr-225/src/org/exist/xquery/XPathException.java branches/allad/jsr-225/src/org/exist/xquery/XQuery.java branches/allad/jsr-225/src/org/exist/xquery/XQueryContext.java branches/allad/jsr-225/src/org/exist/xquery/XQueryWatchDog.java branches/allad/jsr-225/src/org/exist/xquery/functions/ExtCollection.java branches/allad/jsr-225/src/org/exist/xquery/functions/ExtDocument.java branches/allad/jsr-225/src/org/exist/xquery/functions/ExtFulltext.java branches/allad/jsr-225/src/org/exist/xquery/functions/ExtNear.java branches/allad/jsr-225/src/org/exist/xquery/functions/ExtPhrase.java branches/allad/jsr-225/src/org/exist/xquery/functions/ExtRegexp.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunAvg.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunBaseURI.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunConcat.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunDateTime.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunDoc.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunExactlyOne.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunId.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunIdRef.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunItemAt.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunLast.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunMatches.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunMax.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunMin.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunNormalizeUnicode.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunNot.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunOneOrMore.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunQName.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunReplace.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunResolveURI.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunRoot.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunStringPad.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunSum.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunTokenize.java branches/allad/jsr-225/src/org/exist/xquery/functions/FunZeroOrOne.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetContextPath.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetCookieNames.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetCookieValue.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetData.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetHeader.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetHeaderNames.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetHostname.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetMethod.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetParameter.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetParameterNames.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetPathInfo.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetQueryString.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetRequestAttribute.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetServerName.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetServerPort.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetURI.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetURL.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetUploadedFile.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetUploadedFileName.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/RequestModule.java branches/allad/jsr-225/src/org/exist/xquery/functions/response/RedirectTo.java branches/allad/jsr-225/src/org/exist/xquery/functions/response/SetCookie.java branches/allad/jsr-225/src/org/exist/xquery/functions/response/SetHeader.java branches/allad/jsr-225/src/org/exist/xquery/functions/response/SetStatusCode.java branches/allad/jsr-225/src/org/exist/xquery/functions/session/Clear.java branches/allad/jsr-225/src/org/exist/xquery/functions/session/Create.java branches/allad/jsr-225/src/org/exist/xquery/functions/session/EncodeURL.java branches/allad/jsr-225/src/org/exist/xquery/functions/session/GetAttribute.java branches/allad/jsr-225/src/org/exist/xquery/functions/session/GetAttributeNames.java branches/allad/jsr-225/src/org/exist/xquery/functions/session/GetID.java branches/allad/jsr-225/src/org/exist/xquery/functions/session/Invalidate.java branches/allad/jsr-225/src/org/exist/xquery/functions/session/RemoveAttribute.java branches/allad/jsr-225/src/org/exist/xquery/functions/session/SetAttribute.java branches/allad/jsr-225/src/org/exist/xquery/functions/session/SetCurrentUser.java branches/allad/jsr-225/src/org/exist/xquery/functions/system/Shutdown.java branches/allad/jsr-225/src/org/exist/xquery/functions/system/SystemModule.java branches/allad/jsr-225/src/org/exist/xquery/functions/system/TriggerSystemTask.java branches/allad/jsr-225/src/org/exist/xquery/functions/text/MatchRegexp.java branches/allad/jsr-225/src/org/exist/xquery/functions/text/RegexpFilter.java branches/allad/jsr-225/src/org/exist/xquery/functions/transform/Transform.java branches/allad/jsr-225/src/org/exist/xquery/functions/util/BinaryDoc.java branches/allad/jsr-225/src/org/exist/xquery/functions/util/CallFunction.java branches/allad/jsr-225/src/org/exist/xquery/functions/util/CatchFunction.java branches/allad/jsr-225/src/org/exist/xquery/functions/util/Compile.java branches/allad/jsr-225/src/org/exist/xquery/functions/util/DeepCopyFunction.java branches/allad/jsr-225/src/org/exist/xquery/functions/util/Eval.java branches/allad/jsr-225/src/org/exist/xquery/functions/util/FunUnEscapeURI.java branches/allad/jsr-225/src/org/exist/xquery/functions/util/FunctionFunction.java branches/allad/jsr-225/src/org/exist/xquery/functions/util/IndexKeyDocuments.java branches/allad/jsr-225/src/org/exist/xquery/functions/util/IndexKeyOccurrences.java branches/allad/jsr-225/src/org/exist/xquery/functions/util/IndexKeys.java branches/allad/jsr-225/src/org/exist/xquery/functions/util/UUID.java branches/allad/jsr-225/src/org/exist/xquery/functions/util/UtilModule.java branches/allad/jsr-225/src/org/exist/xquery/functions/validation/GrammarTooling.java branches/allad/jsr-225/src/org/exist/xquery/functions/validation/Validation.java branches/allad/jsr-225/src/org/exist/xquery/functions/xmldb/FunDocument.java branches/allad/jsr-225/src/org/exist/xquery/functions/xmldb/XMLDBAbstractCollectionManipulator.java branches/allad/jsr-225/src/org/exist/xquery/functions/xmldb/XMLDBGetMimeType.java branches/allad/jsr-225/src/org/exist/xquery/functions/xmldb/XMLDBReindex.java branches/allad/jsr-225/src/org/exist/xquery/functions/xmldb/XMLDBStore.java branches/allad/jsr-225/src/org/exist/xquery/functions/xmldb/XMLDBURIFunctions.java branches/allad/jsr-225/src/org/exist/xquery/value/DecimalValue.java branches/allad/jsr-225/src/org/exist/xquery/value/DoubleValue.java branches/allad/jsr-225/src/org/exist/xquery/value/FloatValue.java branches/allad/jsr-225/src/org/exist/xquery/value/IntegerValue.java branches/allad/jsr-225/src/org/exist/xquery/value/NumericValue.java branches/allad/jsr-225/src/org/exist/xquery/value/ValueSequence.java branches/allad/jsr-225/test/src/org/exist/dom/BasicNodeSetTest.java branches/allad/jsr-225/test/src/org/exist/fulltext/FtQueryTest.java branches/allad/jsr-225/test/src/org/exist/storage/AllStorageTests.java branches/allad/jsr-225/test/src/org/exist/storage/RecoverBinaryTest.java branches/allad/jsr-225/test/src/org/exist/storage/RecoveryTest.java branches/allad/jsr-225/test/src/org/exist/storage/ResourceTest.java branches/allad/jsr-225/test/src/org/exist/xmldb/CollectionConfigurationTest.java branches/allad/jsr-225/test/src/org/exist/xquery/ValueIndexTest.java branches/allad/jsr-225/test/src/org/exist/xquery/XPathQueryTest.java branches/allad/jsr-225/test/src/org/exist/xquery/XQueryTest.java branches/allad/jsr-225/tools/wrapper/build.xml branches/allad/jsr-225/webapp/WEB-INF/catalog.xml branches/allad/jsr-225/webapp/acknowledge.xml branches/allad/jsr-225/webapp/acronyms/sidebar.xml branches/allad/jsr-225/webapp/admin/admin.xql branches/allad/jsr-225/webapp/admin/dates.xqm branches/allad/jsr-225/webapp/admin/setup.xqm branches/allad/jsr-225/webapp/ant-tasks.xml branches/allad/jsr-225/webapp/apps/applications.xml branches/allad/jsr-225/webapp/apps/sidebar.xml branches/allad/jsr-225/webapp/apps/styles/default-style.css branches/allad/jsr-225/webapp/atompub.xml branches/allad/jsr-225/webapp/backup.xml branches/allad/jsr-225/webapp/building.xml branches/allad/jsr-225/webapp/client.xml branches/allad/jsr-225/webapp/cluster.xml branches/allad/jsr-225/webapp/configuration.xml branches/allad/jsr-225/webapp/credits.xml branches/allad/jsr-225/webapp/deployment.xml branches/allad/jsr-225/webapp/devguide.xml branches/allad/jsr-225/webapp/devguide_indexes.xml branches/allad/jsr-225/webapp/devguide_rest.xml branches/allad/jsr-225/webapp/devguide_soap.xml branches/allad/jsr-225/webapp/devguide_xmldb.xml branches/allad/jsr-225/webapp/devguide_xmlrpc.xml branches/allad/jsr-225/webapp/devguide_xquery.xml branches/allad/jsr-225/webapp/documentation.xml branches/allad/jsr-225/webapp/extensions.xml branches/allad/jsr-225/webapp/index.xml branches/allad/jsr-225/webapp/indexing.xml branches/allad/jsr-225/webapp/irclog/irclog.xql branches/allad/jsr-225/webapp/journal.xml branches/allad/jsr-225/webapp/ldap-security.xml branches/allad/jsr-225/webapp/mods/livesearch.xq branches/allad/jsr-225/webapp/quickstart.xml branches/allad/jsr-225/webapp/roadmap.xml branches/allad/jsr-225/webapp/sandbox/sandbox.xql branches/allad/jsr-225/webapp/sandbox/stylesheets/xml-highlight.xsl branches/allad/jsr-225/webapp/security.xml branches/allad/jsr-225/webapp/sidebar.xml branches/allad/jsr-225/webapp/sitemap.xmap branches/allad/jsr-225/webapp/styles/default-style.css branches/allad/jsr-225/webapp/stylesheets/changes.xsl branches/allad/jsr-225/webapp/stylesheets/clusterinfo.xsl branches/allad/jsr-225/webapp/stylesheets/db2html.xsl branches/allad/jsr-225/webapp/stylesheets/doc2html-2.xsl branches/allad/jsr-225/webapp/stylesheets/roadmap.xsl branches/allad/jsr-225/webapp/stylesheets/shakes.xsl branches/allad/jsr-225/webapp/stylesheets/simple-samples2html.xsl branches/allad/jsr-225/webapp/stylesheets/status.xsl branches/allad/jsr-225/webapp/stylesheets/xmldb-collection.xsl branches/allad/jsr-225/webapp/stylesheets/xmldb-query.xsl branches/allad/jsr-225/webapp/triggers.xml branches/allad/jsr-225/webapp/update_ext.xml branches/allad/jsr-225/webapp/webdav.xml branches/allad/jsr-225/webapp/webtest/scan-range-index.xql branches/allad/jsr-225/webapp/xacml-dev.xml branches/allad/jsr-225/webapp/xacml-features.xml branches/allad/jsr-225/webapp/xacml-intro.xml branches/allad/jsr-225/webapp/xacml-usage.xml branches/allad/jsr-225/webapp/xacml.xml branches/allad/jsr-225/webapp/xinclude.xml branches/allad/jsr-225/webapp/xmlprague06.xml branches/allad/jsr-225/webapp/xqts/build.xml branches/allad/jsr-225/webapp/xquery/call.xql branches/allad/jsr-225/webapp/xquery/functions.xq branches/allad/jsr-225/webapp/xquery/functions.xsl branches/allad/jsr-225/webapp/xquery/sidebar.xml branches/allad/jsr-225/webapp/xquery/styles/default-style.css branches/allad/jsr-225/webapp/xquery.xml Added Paths: ----------- branches/allad/jsr-225/bin/eXist_32x32.ico branches/allad/jsr-225/extensions/indexes/lucene/ branches/allad/jsr-225/extensions/indexes/lucene/build.xml branches/allad/jsr-225/extensions/indexes/lucene/lib/ branches/allad/jsr-225/extensions/indexes/lucene/src/ branches/allad/jsr-225/extensions/indexes/lucene/src/org/ branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/ branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/indexing/ branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/indexing/lucene/ branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/indexing/lucene/AnalyzerConfig.java branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneConfig.java branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneIndex.java branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneIndexConfig.java branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneIndexWorker.java branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneMatchListener.java branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/xquery/ branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/xquery/modules/ branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/xquery/modules/lucene/ branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/xquery/modules/lucene/LuceneModule.java branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/xquery/modules/lucene/Query.java branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/xquery/modules/lucene/Score.java branches/allad/jsr-225/extensions/indexes/lucene/test/ branches/allad/jsr-225/extensions/indexes/lucene/test/src/ branches/allad/jsr-225/extensions/indexes/lucene/test/src/org/ branches/allad/jsr-225/extensions/indexes/lucene/test/src/org/exist/ branches/allad/jsr-225/extensions/indexes/lucene/test/src/org/exist/indexes/ branches/allad/jsr-225/extensions/indexes/lucene/test/src/org/exist/indexing/ branches/allad/jsr-225/extensions/indexes/lucene/test/src/org/exist/indexing/lucene/ branches/allad/jsr-225/extensions/indexes/lucene/test/src/org/exist/indexing/lucene/ConcurrencyTest.java branches/allad/jsr-225/extensions/indexes/lucene/test/src/org/exist/indexing/lucene/LuceneIndexTest.java branches/allad/jsr-225/extensions/indexes/lucene/test/src/org/exist/indexing/lucene/LuceneMatchListenerTest.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/compression/GZipFunction.java branches/allad/jsr-225/extensions/modules/src/org/exist/xquery/modules/compression/TarFunction.java branches/allad/jsr-225/lib/endorsed/xalan-2.7.1.jar branches/allad/jsr-225/lib/optional/commons-fileupload-1.2.1.jar branches/allad/jsr-225/lib/optional/commons-io-1.4.jar branches/allad/jsr-225/nbbuild.xml branches/allad/jsr-225/nbproject/ branches/allad/jsr-225/nbproject/build-impl.xml branches/allad/jsr-225/nbproject/configs/ branches/allad/jsr-225/nbproject/configs/InteractiveClient.properties branches/allad/jsr-225/nbproject/configs/Jetty.properties branches/allad/jsr-225/nbproject/genfiles.properties branches/allad/jsr-225/nbproject/private/ branches/allad/jsr-225/nbproject/private/config.properties branches/allad/jsr-225/nbproject/private/configs/ branches/allad/jsr-225/nbproject/private/configs/InteractiveClient.properties branches/allad/jsr-225/nbproject/private/configs/Jetty.properties branches/allad/jsr-225/nbproject/private/private.xml branches/allad/jsr-225/nbproject/project.properties branches/allad/jsr-225/nbproject/project.xml branches/allad/jsr-225/src/org/exist/backup/BackupDescriptor.java branches/allad/jsr-225/src/org/exist/backup/FileSystemBackupDescriptor.java branches/allad/jsr-225/src/org/exist/backup/ZipArchiveBackupDescriptor.java branches/allad/jsr-225/src/org/exist/client/ZipFilter.java branches/allad/jsr-225/src/org/exist/dom/ExtNodeSet.java branches/allad/jsr-225/src/org/exist/dom/NewArrayNodeSet.java branches/allad/jsr-225/src/org/exist/http/urlrewrite/ModuleCall.java branches/allad/jsr-225/src/org/exist/management/impl/DiskUsage.java branches/allad/jsr-225/src/org/exist/management/impl/DiskUsageMBean.java branches/allad/jsr-225/src/org/exist/management/impl/SystemInfo.java branches/allad/jsr-225/src/org/exist/management/impl/SystemInfoMBean.java branches/allad/jsr-225/src/org/exist/storage/CreateBinaryLoggable.java branches/allad/jsr-225/src/org/exist/storage/RenameBinaryLoggable.java branches/allad/jsr-225/src/org/exist/storage/UpdateBinaryLoggable.java branches/allad/jsr-225/src/org/exist/util/EXistInputSource.java branches/allad/jsr-225/src/org/exist/util/FileInputSource.java branches/allad/jsr-225/src/org/exist/util/FileUtils.java branches/allad/jsr-225/src/org/exist/util/GZIPInputSource.java branches/allad/jsr-225/src/org/exist/util/ZipEntryInputSource.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/GetRemoteAddr.java branches/allad/jsr-225/src/org/exist/xquery/functions/request/SetAttribute.java branches/allad/jsr-225/src/org/exist/xquery/functions/system/GetRunningXQueries.java branches/allad/jsr-225/src/org/exist/xquery/functions/system/KillRunningXQuery.java branches/allad/jsr-225/src/org/exist/xquery/functions/system/UpdateStatistics.java branches/allad/jsr-225/src/org/exist/xquery/functions/util/Expand.java branches/allad/jsr-225/test/ant-tasks/ branches/allad/jsr-225/test/ant-tasks/README branches/allad/jsr-225/test/ant-tasks/base.xml branches/allad/jsr-225/test/ant-tasks/build.xml branches/allad/jsr-225/test/ant-tasks/common.xml branches/allad/jsr-225/test/ant-tasks/exist.properties branches/allad/jsr-225/test/ant-tasks/file.xml branches/allad/jsr-225/test/ant-tasks/server.xml branches/allad/jsr-225/test/ant-tasks/user.xml branches/allad/jsr-225/test/ant-tasks/xmldb.xml branches/allad/jsr-225/test/src/org/exist/http/RESTTest.java branches/allad/jsr-225/test/src/org/exist/storage/LargeValuesTest.java branches/allad/jsr-225/test/src/org/exist/xquery/functions/ branches/allad/jsr-225/test/src/org/exist/xquery/functions/request/ branches/allad/jsr-225/test/src/org/exist/xquery/functions/request/GetHeaderTest.java branches/allad/jsr-225/test/src/org/exist/xquery/functions/request/GetParameterTest.java branches/allad/jsr-225/tools/ant/lib/ant-antunit-1.0.jar branches/allad/jsr-225/tools/ant/lib/xmlunit-1.2.jar branches/allad/jsr-225/webapp/WEB-INF/entities/XMLSchema.xsd branches/allad/jsr-225/webapp/WEB-INF/entities/play.xsd branches/allad/jsr-225/webapp/WEB-INF/entities/xhtml-lat1.ent branches/allad/jsr-225/webapp/WEB-INF/entities/xhtml-special.ent branches/allad/jsr-225/webapp/WEB-INF/entities/xhtml-symbol.ent branches/allad/jsr-225/webapp/WEB-INF/entities/xhtml1-strict.dtd branches/allad/jsr-225/webapp/admin/xqueries.xqm branches/allad/jsr-225/webapp/docs.xql branches/allad/jsr-225/webapp/kwic.xql branches/allad/jsr-225/webapp/resources/exist_icon_16x16.ico branches/allad/jsr-225/webapp/resources/exist_icon_16x16.png branches/allad/jsr-225/webapp/search.xql branches/allad/jsr-225/webapp/styles/docsearch.css Removed Paths: ------------- branches/allad/jsr-225/extensions/indexes/lucene/build.xml branches/allad/jsr-225/extensions/indexes/lucene/lib/ branches/allad/jsr-225/extensions/indexes/lucene/src/ branches/allad/jsr-225/extensions/indexes/lucene/src/org/ branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/ branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/indexing/ branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/indexing/lucene/ branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/indexing/lucene/AnalyzerConfig.java branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneConfig.java branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneIndex.java branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneIndexConfig.java branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneIndexWorker.java branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneMatchListener.java branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/xquery/ branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/xquery/modules/ branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/xquery/modules/lucene/ branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/xquery/modules/lucene/LuceneModule.java branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/xquery/modules/lucene/Query.java branches/allad/jsr-225/extensions/indexes/lucene/src/org/exist/xquery/modules/lucene/Score.java branches/allad/jsr-225/extensions/indexes/lucene/test/ branches/allad/jsr-225/extensions/indexes/lucene/test/src/ branches/allad/jsr-225/extensions/indexes/lucene/test/src/org/ branches/allad/jsr-225/extensions/indexes/lucene/test/src/org/exist/ branches/allad/jsr-225/extensions/indexes/lucene/test/src/org/exist/indexes/ branches/allad/jsr-225/extensions/indexes/lucene/test/src/org/exist/indexing/ branches/allad/jsr-225/extensions/indexes/lucene/test/src/org/exist/indexing/lucene/ branches/allad/jsr-225/extensions/indexes/lucene/test/src/org/exist/indexing/lucene/ConcurrencyTest.java branches/allad/jsr-225/extensions/indexes/lucene/test/src/org/exist/indexing/lucene/LuceneIndexTest.java branches/allad/jsr-225/extensions/indexes/lucene/test/src/org/exist/indexing/lucene/LuceneMatchListenerTest.java branches/allad/jsr-225/lib/endorsed/xalan-2.7.0.jar branches/allad/jsr-225/lib/optional/commons-fileupload-1.1.1.jar branches/allad/jsr-225/lib/optional/commons-io-1.3.jar branches/allad/jsr-225/nbproject/ branches/allad/jsr-225/nbproject/build-impl.xml branches/allad/jsr-225/nbproject/configs/ branches/allad/jsr-225/nbproject/configs/InteractiveClient.properties branches/allad/jsr-225/nbproject/configs/Jetty.properties branches/allad/jsr-225/nbproject/genfiles.properties branches/allad/jsr-225/nbproject/private/ branches/allad/jsr-225/nbproject/private/config.properties branches/allad/jsr-225/nbproject/private/configs/ branches/allad/jsr-225/nbproject/private/configs/InteractiveClient.properties branches/allad/jsr-225/nbproject/private/configs/Jetty.properties branches/allad/jsr-225/nbproject/private/private.xml branches/allad/jsr-225/nbproject/project.properties branches/allad/jsr-225/nbproject/project.xml branches/allad/jsr-225/src/org/exist/http/urlrewrite/ServletForward.java branches/allad/jsr-225/test/ant-tasks/README branches/allad/jsr-225/test/ant-tasks/base.xml branches/allad/jsr-225/test/ant-tasks/build.xml branches/allad/jsr-225/test/ant-tasks/common.xml branches/allad/jsr-225/test/ant-tasks/exist.properties branches/allad/jsr-225/test/ant-tasks/file.xml branches/allad/jsr-225/test/ant-tasks/server.xml branches/allad/jsr-225/test/ant-tasks/user.xml branches/allad/jsr-225/test/ant-tasks/xmldb.xml branches/allad/jsr-225/test/src/org/exist/xquery/functions/request/ branches/allad/jsr-225/test/src/org/exist/xquery/functions/request/GetHeaderTest.java branches/allad/jsr-225/test/src/org/exist/xquery/functions/request/GetParameterTest.java branches/allad/jsr-225/tools/ant/lib/xmlunit-1.1.jar Property Changed: ---------------- branches/allad/jsr-225/ branches/allad/jsr-225/lib/endorsed/ branches/allad/jsr-225/lib/extensions/ branches/allad/jsr-225/src/org/exist/management/impl/DatabaseMBean.java branches/allad/jsr-225/src/org/exist/xquery/functions/util/UUID.java branches/allad/jsr-225/webapp/WEB-INF/data/ Property changes on: branches/allad/jsr-225 ___________________________________________________________________ Modified: svn:ignore - build dist test exist-modules.jar exist-optional.jar examples.jar exist.jar start.jar key.store .settings .exist_history .exist_query_history client.properties conf.xml descriptor.xml server.xml mime-types.xml TEST-org.exist.*.xml *.pack.gz *.tmp *.bak exist-fluent.jar + build dist test exist-modules.jar exist-optional.jar examples.jar exist.jar start.jar key.store .settings .exist_history .exist_query_history client.properties conf.xml descriptor.xml server.xml mime-types.xml TEST-org.exist.*.xml *.pack.gz *.tmp *.bak exist-fluent.jar junit*.properties Added: svn:mergeinfo + /trunk/eXist:7822-8288 Modified: branches/allad/jsr-225/.classpath =================================================================== --- branches/allad/jsr-225/.classpath 2008-10-25 16:11:47 UTC (rev 8288) +++ branches/allad/jsr-225/.classpath 2008-10-26 15:03:36 UTC (rev 8289) @@ -12,6 +12,7 @@ <classpathentry kind="src" path="extensions/indexes/ngram/test/src"/> <classpathentry sourcepath="/jEdit-syntax" kind="lib" path="lib/core/jEdit-syntax.jar"/> <classpathentry kind="lib" path="extensions/indexes/spatial/lib/hsqldb-1.8.0.7.jar"/> + <classpathentry kind="lib" path="extensions/indexes/lucene/lib/lucene-core-2.3.2.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="lib/cocoon/avalon-framework-impl-4.1.5.jar"/> <classpathentry kind="lib" path="lib/cocoon/cocoon-2.1.7-deprecated.jar"/> @@ -50,14 +51,13 @@ <classpathentry kind="lib" path="lib/core/sunxacml.jar"/> <classpathentry kind="lib" path="lib/core/xmldb.jar"/> <classpathentry kind="lib" path="lib/core/xmlrpc-1.2-patched.jar"/> - <classpathentry kind="lib" path="lib/endorsed/xalan-2.7.0.jar"/> <classpathentry kind="lib" path="lib/endorsed/xml-apis.jar"/> <classpathentry kind="lib" path="lib/optional/axis-ant.jar"/> <classpathentry kind="lib" path="lib/optional/axis-schema.jar"/> <classpathentry kind="lib" path="lib/optional/axis.jar"/> - <classpathentry kind="lib" path="lib/optional/commons-fileupload-1.1.1.jar"/> + <classpathentry kind="lib" path="lib/optional/commons-fileupload-1.2.1.jar"/> <classpathentry kind="lib" path="lib/optional/commons-httpclient-3.0.1.jar"/> - <classpathentry kind="lib" path="lib/optional/commons-io-1.3.jar"/> + <classpathentry kind="lib" path="lib/optional/commons-io-1.4.jar"/> <classpathentry kind="lib" path="lib/optional/jaxrpc.jar"/> <classpathentry kind="lib" path="lib/optional/saaj.jar"/> <classpathentry kind="lib" path="lib/optional/wsdl4j-1.5.1.jar"/> @@ -65,7 +65,7 @@ <classpathentry kind="lib" path="thirdparty/tomcat5/server/lib/catalina-5.0.28.jar"/> <classpathentry kind="lib" path="tools/ant/lib/ant.jar"/> <classpathentry kind="lib" path="tools/ant/lib/junit-4.3.1.jar"/> - <classpathentry kind="lib" path="tools/ant/lib/xmlunit-1.1.jar"/> + <classpathentry kind="lib" path="tools/ant/lib/xmlunit-1.2.jar"/> <classpathentry kind="lib" path="tools/ircbot/lib/pircbot.jar"/> <classpathentry kind="lib" path="tools/jetty/lib/org.mortbay.jetty.jar"/> <classpathentry kind="lib" path="tools/wrapper/lib/wrapper.jar"/> @@ -86,5 +86,6 @@ <classpathentry kind="lib" path="lib/user/nekohtml-0.9.5.jar"/> <classpathentry kind="lib" path="tools/jetty/lib/jasper-compiler.jar"/> <classpathentry kind="lib" path="lib/core/commons-codec-1.3.jar"/> + <classpathentry kind="lib" path="lib/endorsed/xalan-2.7.1.jar"/> <classpathentry kind="output" path="test/classes"/> </classpath> Modified: branches/allad/jsr-225/bin/backup.bat =================================================================== --- branches/allad/jsr-225/bin/backup.bat 2008-10-25 16:11:47 UTC (rev 8288) +++ branches/allad/jsr-225/bin/backup.bat 2008-10-26 15:03:36 UTC (rev 8289) @@ -1,4 +1,21 @@ @echo off +rem Slurp the command line arguments. This loop allows for an unlimited number +rem of arguments (up to the command line limit, anyway). + +set CMD_LINE_ARGS=%1 +if ""%1""=="""" goto doneStart +shift +:setupArgs +if ""%1""=="""" goto doneStart +set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 +shift +goto setupArgs + +rem This label provides a place for the argument list loop to break out +rem and for NT handling to skip to. + +:doneStart + if not "%JAVA_HOME%" == "" goto gotJavaHome echo Java environment not found. Please set echo your JAVA_HOME environment variable to @@ -23,6 +40,6 @@ set JAVA_ENDORSED_DIRS="%EXIST_HOME%"\lib\endorsed set JAVA_OPTS="-Xms16000k -Xmx256000k -Dfile.encoding=UTF-8 -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS%" -"%JAVA_HOME%\bin\java" "%JAVA_OPTS%" -Dexist.home="%EXIST_HOME%" -jar "%EXIST_HOME%\start.jar" backup %1 %2 %3 %4 %5 %6 %7 %8 %9 +"%JAVA_HOME%\bin\java" "%JAVA_OPTS%" -Dexist.home="%EXIST_HOME%" -jar "%EXIST_HOME%\start.jar" backup %CMD_LINE_ARGS% :eof Copied: branches/allad/jsr-225/bin/eXist_32x32.ico (from rev 8288, trunk/eXist/bin/eXist_32x32.ico) =================================================================== (Binary files differ) Modified: branches/allad/jsr-225/bin/run.bat =================================================================== --- branches/allad/jsr-225/bin/run.bat 2008-10-25 16:11:47 UTC (rev 8288) +++ branches/allad/jsr-225/bin/run.bat 2008-10-26 15:03:36 UTC (rev 8289) @@ -1,4 +1,22 @@ @echo off +rem Slurp the command line arguments. This loop allows for an unlimited number +rem of arguments (up to the command line limit, anyway). + +set CMD_LINE_ARGS=%1 +if ""%1""=="""" goto doneStart +shift +:setupArgs +if ""%1""=="""" goto doneStart +set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 +shift +goto setupArgs + +rem This label provides a place for the argument list loop to break out +rem and for NT handling to skip to. + +:doneStart + + if not "%JAVA_HOME%" == "" goto gotJavaHome echo Java environment not found. Please set echo your JAVA_HOME environment variable to @@ -24,5 +42,5 @@ set JAVA_OPTS="-Xms16000k -Xmx256000k -Dfile.encoding=UTF-8 -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS%" :gotJavaOpts -"%JAVA_HOME%\bin\java" "%JAVA_OPTS%" -Dexist.home="%EXIST_HOME%" -jar "%EXIST_HOME%\start.jar" %1 %2 %3 %4 %5 %6 %7 %8 %9 +"%JAVA_HOME%\bin\java" "%JAVA_OPTS%" -Dexist.home="%EXIST_HOME%" -jar "%EXIST_HOME%\start.jar" %CMD_LINE_ARGS% :eof \ No newline at end of file Modified: branches/allad/jsr-225/bin/shutdown.bat =================================================================== --- branches/allad/jsr-225/bin/shutdown.bat 2008-10-25 16:11:47 UTC (rev 8288) +++ branches/allad/jsr-225/bin/shutdown.bat 2008-10-26 15:03:36 UTC (rev 8289) @@ -1,4 +1,22 @@ @echo off +rem Slurp the command line arguments. This loop allows for an unlimited number +rem of arguments (up to the command line limit, anyway). + +set CMD_LINE_ARGS=%1 +if ""%1""=="""" goto doneStart +shift +:setupArgs +if ""%1""=="""" goto doneStart +set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 +shift +goto setupArgs + +rem This label provides a place for the argument list loop to break out +rem and for NT handling to skip to. + +:doneStart + + if not "%JAVA_HOME%" == "" goto gotJavaHome echo Java environment not found. Please set echo your JAVA_HOME environment variable to @@ -20,5 +38,5 @@ goto :eof :gotExistHome -"%JAVA_HOME%\bin\java" -Dexist.home="%EXIST_HOME%" -jar "%EXIST_HOME%\start.jar" shutdown %1 %2 %3 %4 %5 %6 %7 %8 %9 +"%JAVA_HOME%\bin\java" -Dexist.home="%EXIST_HOME%" -jar "%EXIST_HOME%\start.jar" shutdown %CMD_LINE_ARGS% :eof \ No newline at end of file Modified: branches/allad/jsr-225/bin/startup_cluster.bat =================================================================== --- branches/allad/jsr-225/bin/startup_cluster.bat 2008-10-25 16:11:47 UTC (rev 8288) +++ branches/allad/jsr-225/bin/startup_cluster.bat 2008-10-26 15:03:36 UTC (rev 8289) @@ -1,4 +1,22 @@ @echo off +rem Slurp the command line arguments. This loop allows for an unlimited number +rem of arguments (up to the command line limit, anyway). + +set CMD_LINE_ARGS=%1 +if ""%1""=="""" goto doneStart +shift +:setupArgs +if ""%1""=="""" goto doneStart +set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 +shift +goto setupArgs + +rem This label provides a place for the argument list loop to break out +rem and for NT handling to skip to. + +:doneStart + + if not "%JAVA_HOME%" == "" goto gotJavaHome echo Java environment not found. Please set echo your JAVA_HOME environment variable to @@ -23,6 +41,6 @@ set JAVA_ENDORSED_DIRS="%EXIST_HOME%"\lib\endorsed set JAVA_OPTS="-Xms16000k -Xmx128000k -Dfile.encoding=UTF-8 -Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS%" -"%JAVA_HOME%\bin\java" "%JAVA_OPTS%" -Dexist.home="%EXIST_HOME%" -jar "%EXIST_HOME%\start.jar" cluster %1 +"%JAVA_HOME%\bin\java" "%JAVA_OPTS%" -Dexist.home="%EXIST_HOME%" -jar "%EXIST_HOME%\start.jar" cluster %CMD_LINE_ARGS% :eof Modified: branches/allad/jsr-225/build/scripts/build-impl.xml =================================================================== --- branches/allad/jsr-225/build/scripts/build-impl.xml 2008-10-25 16:11:47 UTC (rev 8288) +++ branches/allad/jsr-225/build/scripts/build-impl.xml 2008-10-26 15:03:36 UTC (rev 8289) @@ -519,7 +519,7 @@ </target> <target name="wrapper" depends="jar"> - <ant antfile="build.xml" dir="tools/wrapper"/> + <ant antfile="build.xml" dir="tools/wrapper" inheritall="false"/> </target> <target name="extension-modules" depends="jar"> @@ -589,12 +589,12 @@ <!-- International Components for Unicode --> <!-- http://www.icu-project.org/ --> - <get src="http://prdownloads.sourceforge.net/icu/icu4j-3_6_1.jar" - dest="${lib.user}/icu4j-3_6_1.jar" verbose="true"/> + <get src="http://download.icu-project.org/files/icu4j/3.8.1/icu4j-3_8_1.jar" + dest="${lib.user}/icu4j-3_8_1.jar" verbose="true"/> <!-- Saxon XSLT2 Processor --> <!-- http://sourceforge.net/projects/saxon --> - <get src="http://prdownloads.sourceforge.net/saxon/saxonb9-0-0-3j.zip" + <get src="http://prdownloads.sourceforge.net/saxon/saxonb9-0-0-6j.zip" dest="${lib.endorsed}/saxon.zip" verbose="true"/> <unzip src="${lib.endorsed}/saxon.zip" dest="${lib.endorsed}"> Modified: branches/allad/jsr-225/build/scripts/cocoon/exist-jars.xsl =================================================================== --- branches/allad/jsr-225/build/scripts/cocoon/exist-jars.xsl 2008-10-25 16:11:47 UTC (rev 8288) +++ branches/allad/jsr-225/build/scripts/cocoon/exist-jars.xsl 2008-10-26 15:03:36 UTC (rev 8289) @@ -58,7 +58,7 @@ <title>Commons File Upload</title> <description>Apache commons library for file uploads</description> <used-by>exist</used-by> - <lib>optional/commons-fileupload-1.1.1.jar</lib> + <lib>optional/commons-fileupload-1.2.1.jar</lib> <homepage>http://jakarta.apache.org/commons/fileupload/</homepage> </file> <file> Modified: branches/allad/jsr-225/build/scripts/demoserver.xml =================================================================== --- branches/allad/jsr-225/build/scripts/demoserver.xml 2008-10-25 16:11:47 UTC (rev 8288) +++ branches/allad/jsr-225/build/scripts/demoserver.xml 2008-10-26 15:03:36 UTC (rev 8289) @@ -82,7 +82,7 @@ <replacefilter token="xmlprague06.xml" value="xmlprague06.html"/> <!-- - <replacefilter token="soc-ft.xml" value="soc-ft.html"/> + <replacefilter token="soc-ft.xml" value="soc-ft.html"/> <replacefilter token="soc-xqj.xml" value="soc-xqj.html"/> --> @@ -96,6 +96,8 @@ <replacefilter token="mods/" value="${demo.host}/mods/"/> <replacefilter token="xquery/xquery.xq" value="${demo.host}/xquery/xquery.xq"/> <replacefilter token="sandbox/sandbox.xql" value="${demo.host}/sandbox/sandbox.xql"/> + <replacefilter token="search.xql" value="${demo.host}/search.xql"/> + <replacefilter token="docs.xql" value="${demo.host}/docs.xql"/> <replacefilter token='url="xmldb/db/' value='url="${demo.host}/xmldb/db/'/> <replacefilter token='href="xmldb/db/' value='href="${demo.host}/xmldb/db/'/> <replacefilter token='="admin/admin.xql' value='="${demo.host}/admin/admin.xql'/> @@ -107,9 +109,12 @@ <replacefilter token="apps/applications.xml" value="${demo.host}/apps/applications.xml"/> <replacefilter token="webstart/exist.jnlp" value="${demo.host}:8080/webstart/exist.jnlp"/> - <replacefilter token="gsoc/2007/summer.xml" value="${demo.host}/gsoc/2007/summer.xml"/> - <replacefilter token="gsoc/2007/soc-xqj.xml" value="${demo.host}/gsoc/2007/soc-xqj.xml"/> - <replacefilter token="gsoc/2008/soc-ft.xml" value="${demo.host}/gsoc/2007/soc-ft.xml"/> + <replacefilter token="gsoc/2007/summer.xml" value="${demo.host}/gsoc/2007/summer.html"/> + <replacefilter token="gsoc/2007/soc-xqj.xml" value="${demo.host}/gsoc/2007/soc-xqj.html"/> + <replacefilter token="gsoc/2007/soc-ft.xml" value="${demo.host}/gsoc/2007/soc-ft.html"/> + <replacefilter token="gsoc/2008/summer.xml" value="${demo.host}/gsoc/2008/summer.html"/> + <replacefilter token="gsoc/2008/soc-xslt.xml" value="${demo.host}/gsoc/2008/soc-xslt.html"/> + <replacefilter token="gsoc/2008/soc-dsrch.xml" value="${demo.host}/gsoc/2008/soc-dsrch.html"/> </replace> </target> @@ -151,8 +156,10 @@ <uri type="append" src="extensions.xml"/> <uri type="append" src="gsoc/2007/summer.xml"/> <uri type="append" src="gsoc/2007/soc-ft.xml"/> - <uri type="append" src="gsoc/2007/soc-xqj.xml"/> + <uri type="append" src="gsoc/2007/soc-xqj.xml"/> <uri type="append" src="gsoc/2008/summer.xml"/> + <uri type="append" src="gsoc/2008/soc-xslt.xml"/> + <uri type="append" src="gsoc/2008/soc-dsrch.xml"/> </uris> </cocoon> @@ -215,7 +222,7 @@ <echo message="Renaming files ..."/> <move todir="${build.docs.html}"> <fileset dir="${build.docs.html}"> - <include name="*.xml"/> + <include name="**/*.xml"/> </fileset> <mapper type="glob" from="*.xml" to="*.html"/> </move> @@ -255,6 +262,7 @@ <replace dir="${build.docs.src}" summary="true" includes="sidebar.xml"> + <replacefilter token="http://demo.exist-db.org/webstart/exist.jnlp" value="http://demo.exist-db.org:8080/webstart/exist.jnlp"/> <replacefilter token="index.xml" value="${host}/index.html"/> <replacefilter token="download.xml" value="${host}/download.html"/> <replacefilter token="extensions.xml" value="${host}/extensions.html"/> @@ -267,14 +275,20 @@ <!--replacefilter token="#mailing" value="${host}/index.html#mailing"/--> <replacefilter token="api/index.html" value="${host}/api/index.html"/> <replacefilter token="gsoc/2007/summer.xml" value="${host}/gsoc/2007/summer.html"/> + <replacefilter token="gsoc/2007/soc-xqj.xml" value="${host}/gsoc/2007/soc-xqj.html"/> + <replacefilter token="gsoc/2007/soc-ft.xml" value="${host}/gsoc/2007/soc-ft.html"/> <replacefilter token="gsoc/2008/summer.xml" value="${host}/gsoc/2008/summer.html"/> - </replace> + <replacefilter token="gsoc/2008/soc-xslt.xml" value="${host}/gsoc/2008/soc-xslt.html"/> + <replacefilter token="gsoc/2008/soc-dsrch.xml" value="${host}/gsoc/2008/soc-dsrch.html"/> + + </replace> <replace dir="${build.docs.src}" summary="true"> <include name="acronyms/sidebar.xml"/> <include name="apps/sidebar.xml"/> <include name="library/sidebar.xml"/> <include name="xquery/sidebar.xml"/> + <replacefilter token="http://demo.exist-db.org/webstart/exist.jnlp" value="http://demo.exist-db.org:8080/webstart/exist.jnlp"/> <replacefilter token="../index.xml" value="${host}/index.html"/> <replacefilter token="../extensions.xml" value="${host}/extensions.html"/> <replacefilter token="../roadmap.xml" value="${host}/roadmap.html"/> @@ -284,22 +298,84 @@ <replacefilter token="../documentation.xml" value="${host}/documentation.html"/> <replacefilter token="../api/index.html" value="${host}/api/index.html"/> <replacefilter token="../download.xml" value="${host}/download.html"/> + </replace> + <replace dir="${build.docs.src}" summary="true" + includes="*.xml,stylesheets/roadmap.xsl"> + <replacefilter token='="index.xml' value='="${host}/index.html'/> + <replacefilter token='="../index.xml' value='="${host}/index.html'/> + <replacefilter token="acknowledge.xml" value="${host}/acknowledge.html"/> + <replacefilter token="ant-tasks.xml" value="${host}/ant-tasks.html"/> + <replacefilter token="changes.xml" value="${host}/changes.html"/> + <replacefilter token="extensions.xml" value="${host}/extensions.html"/> + <replacefilter token="client.xml" value="${host}/client.html"/> + <replacefilter token="cluster.xml" value="${host}/cluster.html"/> + <replacefilter token="journal.xml" value="${host}/journal.html"/> + <replacefilter token="configuration.xml" value="${host}/configuration.html"/> + <replacefilter token="ldap-security.xml" value="${host}/ldap-security.html"/> + <replacefilter token="atompub.xml" value="${host}/atompub.html"/> + <replacefilter token="credits.xml" value="${host}/credits.html"/> + <replacefilter token="deployment.xml" value="${host}/deployment.html"/> + + <replacefilter token="devguide.xml" value="${host}/devguide.html"/> + <replacefilter token="devguide_indexes.xml" value="${host}/devguide_indexes.html"/> + <replacefilter token="devguide_rest.xml" value="${host}/devguide_rest.html"/> + <replacefilter token="devguide_soap.xml" value="${host}/devguide_soap.html"/> + <replacefilter token="devguide_xmldb.xml" value="${host}/devguide_xmldb.html"/> + <replacefilter token="devguide_xmlrpc.xml" value="${host}/devguide_xmlrpc.html"/> + <replacefilter token="devguide_xquery.xml" value="${host}/devguide_xquery.html"/> + + <replacefilter token="documentation.xml" value="${host}/documentation.html"/> + <replacefilter token="roadmap.xml" value="${host}/roadmap.html"/> + <replacefilter token="indexing.xml" value="${host}/indexing.html"/> + <replacefilter token="triggers.xml" value="${host}/triggers.html"/> + <replacefilter token="facts.xml" value="${host}/facts.html"/> + <replacefilter token="howtos.xml" value="${host}/howtos.html"/> + <replacefilter token="performance.xml" value="${host}/performance.html"/> + <replacefilter token="quickstart.xml" value="${host}/quickstart.html"/> + <replacefilter token="security.xml" value="${host}/security.html"/> + <replacefilter token="xquery.xml" value="${host}/xquery.html"/> + <replacefilter token="updating.xml" value="${host}/updating.html"/> + <replacefilter token="update_ext.xml" value="${host}/update_ext.html"/> + <replacefilter token='"xinclude.xml' value='"${host}/xinclude.html'/> + <replacefilter token="xacml.xml" value="${host}/xacml.html"/> + <replacefilter token="xacml-features.xml" value="${host}/xacml-features.html"/> + <replacefilter token="xacml-intro.xml" value="${host}/xacml-intro.html"/> + <replacefilter token="xacml-usage.xml" value="${host}/xacml-usage.html"/> + <replacefilter token="xacml-dev.xml" value="${host}/xacml-dev.html"/> + <replacefilter token="webdav.xml" value="${host}/webdav.html"/> + <replacefilter token="backup.xml" value="${host}/backup.html"/> + <replacefilter token="building.xml" value="${host}/building.html"/> + <replacefilter token="xmlprague06.xml" value="${host}/xmlprague06.html"/> + + <!-- + <replacefilter token="soc-ft.xml" value="soc-ft.html"/> + <replacefilter token="soc-xqj.xml" value="soc-xqj.html"/> + --> + + <replacefilter token="tutorials.xml" value="${host}/tutorials.html"/> + <replacefilter token="validation.xml" value="${host}/validation.html"/> + <replacefilter token="jmx.xml" value="${host}/jmx.html"/> + <replacefilter token="download.xml" value="${host}/download.html"/> + </replace> <replace dir="${build.docs.src}/admin" summary="true"> <include name="admin.xql"/> <replacefilter token='<a href="..">Home</a>' value='<a href="${host}">Home</a>'/> </replace> + <replace dir="${build.docs.src}/sandbox" summary="true"> <include name="sandbox.xql"/> <replacefilter token='<a href="../index.xml">Home</a>' value='<a href="${host}">Home</a>'/> <replacefilter token='<a href="../download.xml">Download</a>' value='<a href="${host}/download.html">Download</a>'/> </replace> + <replace dir="${build.docs.src}/sandbox2" summary="true"> <... [truncated message content] |