Permalink
Browse files

Merge branch 'develop' of https://github.com/eXist-db/exist into develop

  • Loading branch information...
2 parents 6d1e921 + eecd931 commit 6369bf50fec35a72fc1f606238868be29ebf0b5d @wolfgangmm wolfgangmm committed Jan 27, 2014
Showing with 1,367 additions and 1,201 deletions.
  1. +5 −5 .classpath
  2. +0 −3 eXist.ipr
  3. +164 −377 eXist.iws
  4. BIN extensions/fluent/lib/hamcrest-core-1.1.jar
  5. BIN extensions/fluent/lib/hamcrest-library-1.1.jar
  6. BIN extensions/fluent/lib/hamcrest-library-1.3.jar
  7. +209 −101 extensions/indexes/lucene/src/org/exist/indexing/lucene/AnalyzerConfig.java
  8. +1 −1 extensions/modules/src/org/exist/xquery/modules/math/NoParamFunctions.java
  9. +9 −9 extensions/modules/src/org/exist/xquery/modules/math/OneParamFunctions.java
  10. +2 −2 extensions/modules/src/org/exist/xquery/modules/math/TwoParamFunctions.java
  11. BIN lib/test/easymock-2.5.2.jar
  12. BIN lib/test/easymock-3.2.jar
  13. BIN lib/test/easymockclassextension-2.5.2.jar
  14. BIN lib/test/easymockclassextension-3.2.jar
  15. BIN lib/test/hamcrest-core-1.3.jar
  16. BIN lib/test/junit-4.11.jar
  17. BIN lib/test/junit-4.8.2.jar
  18. +13 −12 nbproject/project.properties
  19. +13 −0 src/org/exist/ant/AbstractXMLDBTask.java
  20. +4 −2 src/org/exist/collections/Collection.java
  21. +303 −212 src/org/exist/collections/CollectionConfigurationManager.java
  22. +14 −1 src/org/exist/storage/NativeBroker.java
  23. +69 −0 src/org/exist/storage/lock/Locked.java
  24. +9 −6 src/org/exist/xquery/functions/inspect/InspectModule.java
  25. +5 −5 src/org/exist/xquery/functions/inspect/InspectionModule.java
  26. +33 −30 src/org/exist/xquery/functions/inspect/ModuleFunctions.java
  27. +14 −14 src/org/exist/xquery/functions/math/MathModule.java
  28. +7 −9 src/org/exist/xquery/functions/math/NoParamFunctions.java
  29. +76 −68 src/org/exist/xquery/functions/math/OneParamFunctions.java
  30. +23 −23 src/org/exist/xquery/functions/math/TwoParamFunctions.java
  31. +1 −1 src/org/exist/xquery/functions/response/SetHeader.java
  32. +9 −9 src/org/exist/xquery/functions/securitymanager/PermissionsFunctions.java
  33. +2 −2 src/org/exist/xquery/functions/text/KWICDisplay.java
  34. +4 −2 src/org/exist/xquery/functions/util/BuiltinFunctions.java
  35. +1 −1 src/org/exist/xquery/functions/util/CatchFunction.java
  36. +2 −1 src/org/exist/xquery/functions/util/DescribeFunction.java
  37. +9 −8 src/org/exist/xquery/functions/util/ModuleInfo.java
  38. +1 −3 src/template_java.txt
  39. +9 −7 test/src/org/exist/dom/SymbolTableTest.java
  40. +1 −1 test/src/org/exist/http/RESTServiceTest.java
  41. +1 −1 test/src/org/exist/security/RestApiSecurityTest.java
  42. +1 −1 test/src/org/exist/security/XMLDBSecurityTest.java
  43. +1 −1 test/src/org/exist/security/XmldbApiSecurityTest.java
  44. +1 −1 test/src/org/exist/soap/CopyMoveTest.java
  45. +1 −1 test/src/org/exist/soap/XQueryTest.java
  46. +10 −10 test/src/org/exist/storage/AbstractUpdateTest.java
  47. +4 −6 test/src/org/exist/storage/AppendTest.java
  48. +10 −15 test/src/org/exist/storage/CollectionTest.java
  49. +38 −20 test/src/org/exist/storage/CopyCollectionTest.java
  50. +62 −35 test/src/org/exist/storage/CopyResourceTest.java
  51. +24 −26 test/src/org/exist/storage/MoveResourceTest.java
  52. +1 −1 test/src/org/exist/storage/NodePathTest.java
  53. +25 −16 test/src/org/exist/storage/RecoverBinaryTest.java
  54. +25 −15 test/src/org/exist/storage/RecoverBinaryTest2.java
  55. +29 −23 test/src/org/exist/storage/RecoveryTest.java
  56. +5 −6 test/src/org/exist/storage/RemoveTest.java
  57. +5 −6 test/src/org/exist/storage/RenameTest.java
  58. +5 −6 test/src/org/exist/storage/ReplaceTest.java
  59. +29 −25 test/src/org/exist/storage/ResourceTest.java
  60. +10 −16 test/src/org/exist/storage/ShutdownTest.java
  61. +5 −5 test/src/org/exist/storage/UpdateAttributeTest.java
  62. +29 −16 test/src/org/exist/storage/UpdateRecoverTest.java
  63. +5 −5 test/src/org/exist/storage/UpdateTest.java
  64. +1 −1 test/src/org/exist/storage/XIncludeSerializerTest.java
  65. +3 −3 test/src/org/exist/validation/ValidationFunctions_DTD_Test.java
  66. +3 −3 test/src/org/exist/validation/ValidationFunctions_Node_Test.java
  67. +1 −1 test/src/org/exist/validation/ValidationFunctions_XSD_Test.java
  68. +1 −1 test/src/org/exist/xmldb/BinaryResourceUpdateTest.java
  69. +1 −1 test/src/org/exist/xmldb/ContentAsDOMTest.java
  70. +1 −1 test/src/org/exist/xmldb/CopyMoveTest.java
  71. +1 −1 test/src/org/exist/xmldb/DOMTest.java
  72. +2 −2 test/src/org/exist/xmldb/DOMTestJUnit.java
  73. +2 −2 test/src/org/exist/xmldb/RemoteCollectionTest.java
  74. +2 −2 test/src/org/exist/xmldb/RemoteDatabaseImplTest.java
  75. +1 −1 test/src/org/exist/xmldb/ShutdownTest.java
  76. +2 −2 test/src/org/exist/xmldb/StorageStressTest.java
  77. +1 −1 test/src/org/exist/xmldb/TestEXistXMLSerialize.java
  78. +1 −1 test/src/org/exist/xmlrpc/MoveResourceTest.java
  79. +2 −2 test/src/org/exist/xmlrpc/XmlRpcTest.java
  80. +1 −1 test/src/org/exist/xquery/SAXStorageTest.java
  81. +1 −1 test/src/org/exist/xquery/xqts/QT3TS_To_junit.java
  82. +1 −1 test/src/org/exist/xquery/xqts/XQTS_To_junit.java
  83. +1 −1 tools/jetty/etc/standalone/WEB-INF/controller-config.xml
View
@@ -39,8 +39,8 @@
<classpathentry kind="lib" path="lib/endorsed/xercesImpl-2.11.0.jar"/>
<classpathentry kind="lib" path="lib/endorsed/xml-resolver-1.2.jar"/>
<classpathentry kind="lib" path="lib/endorsed/xalan-2.7.1.jar"/>
- <classpathentry kind="lib" path="extensions/fluent/lib/hamcrest-core-1.1.jar"/>
- <classpathentry kind="lib" path="extensions/fluent/lib/hamcrest-library-1.1.jar"/>
+ <classpathentry kind="lib" path="lib/test/hamcrest-core-1.3.jar"/>
+ <classpathentry kind="lib" path="extensions/fluent/lib/hamcrest-library-1.3.jar"/>
<classpathentry kind="lib" path="extensions/fluent/lib/jmock-2.4.0.jar"/>
<classpathentry kind="lib" path="extensions/fluent/lib/jmock-junit4-2.4.0.jar"/>
<classpathentry kind="lib" path="lib/core/commons-pool-1.6.jar"/>
@@ -75,7 +75,7 @@
<classpathentry kind="lib" path="lib/optional/saaj-1.2.jar"/>
<classpathentry kind="lib" path="lib/optional/wsdl4j-1.5.1.jar"/>
<classpathentry kind="lib" path="tools/ant/lib/ant.jar"/>
- <classpathentry kind="lib" path="lib/test/junit-4.8.2.jar"/>
+ <classpathentry kind="lib" path="lib/test/junit-4.11.jar"/>
<classpathentry kind="lib" path="tools/ircbot/lib/pircbot.jar"/>
<classpathentry kind="lib" path="tools/wrapper/lib/wrapper.jar"/>
<classpathentry kind="lib" path="lib/core/jta-1.1.jar"/>
@@ -91,8 +91,8 @@
<classpathentry kind="lib" path="tools/ant/lib/xmlunit-1.3.jar"/>
<classpathentry kind="lib" path="lib/user/activation-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/user/nekohtml-1.9.15.jar"/>
- <classpathentry kind="lib" path="lib/test/easymock-2.5.2.jar"/>
- <classpathentry kind="lib" path="lib/test/easymockclassextension-2.5.2.jar"/>
+ <classpathentry kind="lib" path="lib/test/easymock-3.2.jar"/>
+ <classpathentry kind="lib" path="lib/test/easymockclassextension-3.2.jar"/>
<classpathentry kind="lib" path="extensions/webdav/lib/jdom-1.1.jar"/>
<classpathentry kind="lib" path="extensions/webdav/lib/mime-util-2.1.3.jar"/>
<classpathentry kind="lib" path="lib/optional/commons-compress-1.4.1.jar"/>
View
@@ -103,9 +103,6 @@
<option name="OPEN_IN_BROWSER" value="false" />
<option name="OUTPUT_DIRECTORY" />
</component>
- <component name="GradleSettings">
- <option name="gradleHome" value="$USER_HOME$/Apps/gradle" />
- </component>
<component name="IdProvider" IDEtalkID="EDCB317F9C51C9BBC9F54E158B17D480" />
<component name="JavacSettings">
<option name="DEPRECATION" value="false" />
View
Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 6369bf5

Please sign in to comment.