Skip to content
Browse files

[ignore] merge trunk up to rev 18646

svn path=/branches/rangeindex/; revision=18647
  • Loading branch information...
2 parents 4bd746a + ae88040 commit 7d7bf5c7e3761c39ca1b3f68deb068f891a40a99 @shabanovd shabanovd committed Jul 4, 2013
Showing with 25,498 additions and 21,247 deletions.
  1. +1 −2 .classpath
  2. +3 −1 build/scripts/build-impl.xml
  3. +4 −0 build/scripts/dist.xml
  4. +9 −1 build/scripts/installer.xml
  5. +248 −0 build/scripts/macosx.xml
  6. +1 −0 conf.xml.tmpl
  7. +320 −412 eXist.iws
  8. +1 −1 extensions/betterform/build.xml
  9. BIN extensions/betterform/main/lib/betterform.jar
  10. BIN extensions/betterform/main/lib/dwr-2.0.5.jar
  11. BIN extensions/betterform/main/lib/dwr-3.0.RC2.jar
  12. +13 −32 extensions/betterform/main/webapp/WEB-INF/betterform-config.xml
  13. +2 −1 extensions/betterform/main/webapp/WEB-INF/betterform-version.info
  14. +1 −1 extensions/build.properties
  15. +9 −1 extensions/contentextraction/ivy.xml
  16. +68 −25 extensions/expath/src/org/expath/exist/SendRequestFunction.java
  17. BIN extensions/exquery/lib/exquery-annotations-common-1.0-SNAPSHOT.jar
  18. BIN extensions/exquery/lib/exquery-annotations-common-api-1.0-SNAPSHOT.jar
  19. BIN extensions/exquery/lib/exquery-common-1.0-SNAPSHOT.jar
  20. BIN extensions/exquery/lib/exquery-serialization-annotations-1.0-SNAPSHOT.jar
  21. BIN extensions/exquery/lib/exquery-serialization-annotations-api-1.0-SNAPSHOT.jar
  22. BIN extensions/exquery/lib/exquery-xquery-1.0-SNAPSHOT.jar
  23. BIN extensions/exquery/lib/exquery-xquery3-1.0-SNAPSHOT.jar
  24. BIN extensions/exquery/restxq/lib/exquery-restxq-1.0-SNAPSHOT.jar
  25. BIN extensions/exquery/restxq/lib/exquery-restxq-api-1.0-SNAPSHOT.jar
  26. +446 −0 ...ns/exquery/restxq/src/main/java/org/exist/extensions/exquery/restxq/impl/ExistXqueryRegistry.java
  27. +2 −2 ...ions/exquery/restxq/src/main/java/org/exist/extensions/exquery/restxq/impl/RestXqServiceImpl.java
  28. +4 −0 ...ry/restxq/src/main/java/org/exist/extensions/exquery/restxq/impl/RestXqServiceSerializerImpl.java
  29. +8 −354 extensions/exquery/restxq/src/main/java/org/exist/extensions/exquery/restxq/impl/RestXqTrigger.java
  30. +13 −14 ...xq/src/main/java/org/exist/extensions/exquery/restxq/impl/adapters/HttpServletRequestAdapter.java
  31. +9 −7 ...query/restxq/src/main/java/org/exist/extensions/exquery/restxq/impl/xquery/RegistryFunctions.java
  32. +76 −0 ...restxq/src/main/java/org/exist/extensions/exquery/restxq/impl/xquery/exist/ExistRestXqModule.java
  33. +262 −0 ...restxq/src/main/java/org/exist/extensions/exquery/restxq/impl/xquery/exist/RegistryFunctions.java
  34. +6 −6 .../org/exist/extensions/exquery/restxq/impl/{RestXqTriggerTest.java → ExistXqueryRegistryTest.java}
  35. +30 −1 extensions/fluent/src/org/exist/fluent/Database.java
  36. +4 −0 extensions/indexes/lucene/src/org/exist/indexing/lucene/AnalyzerConfig.java
  37. +8 −0 extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneConfig.java
  38. +72 −1 extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneIndexWorker.java
  39. +94 −0 extensions/indexes/lucene/src/org/exist/indexing/lucene/analyzers/NoDiacriticsStandardAnalyzer.java
  40. +22 −22 extensions/indexes/lucene/src/org/exist/xquery/modules/lucene/Index.java
  41. +95 −0 extensions/indexes/lucene/test/src/xquery/lucene/analyzers.xql
  42. +68 −0 extensions/indexes/lucene/test/src/xquery/lucene/binary.xql
  43. +9 −0 extensions/indexes/lucene/test/src/xquery/lucene/suite.xql
  44. +2 −2 extensions/metadata/interface/extension.xml
  45. +7 −0 extensions/metadata/interface/src/main/java/org/exist/storage/md/MetaData.java
  46. +3 −1 extensions/metadata/interface/src/main/java/org/exist/storage/md/Metas.java
  47. +7 −4 extensions/metadata/interface/src/main/java/org/exist/storage/md/xquery/Check.java
  48. +3 −2 extensions/metadata/interface/src/main/java/org/exist/storage/md/xquery/DocumentByPair.java
  49. +3 −2 extensions/metadata/interface/src/main/java/org/exist/storage/md/xquery/DocumentByUUID.java
  50. +4 −3 extensions/metadata/interface/src/main/java/org/exist/storage/md/xquery/Keys.java
  51. +6 −2 extensions/metadata/interface/src/main/java/org/exist/storage/md/xquery/MetadataModule.java
  52. +3 −2 extensions/metadata/interface/src/main/java/org/exist/storage/md/xquery/PairDelete.java
  53. +4 −3 extensions/metadata/interface/src/main/java/org/exist/storage/md/xquery/PairGet.java
  54. +4 −3 extensions/metadata/interface/src/main/java/org/exist/storage/md/xquery/PairSet.java
  55. +131 −0 extensions/metadata/interface/src/main/java/org/exist/storage/md/xquery/Reindex.java
  56. +128 −0 extensions/metadata/interface/src/main/java/org/exist/storage/md/xquery/Search.java
  57. +5 −4 extensions/metadata/interface/src/main/java/org/exist/storage/md/xquery/UUID.java
  58. +8 −9 extensions/metadata/interface/src/test/java/org/exist/storage/md/BackupRestoreMDTest.java
  59. +8 −8 extensions/metadata/interface/src/test/java/org/exist/storage/md/MatchDocumentsTest.java
  60. +333 −0 extensions/metadata/interface/src/test/java/org/exist/storage/md/SearchTest.java
  61. +1 −6 extensions/metadata/interface/src/test/java/org/exist/storage/md/SimpleMDTest.java
  62. +11 −3 extensions/metadata/sleepycat/extension.xml
  63. +549 −0 extensions/metadata/sleepycat/src/main/java/org/exist/indexing/lucene/PlugToLucene.java
  64. +38 −4 extensions/metadata/sleepycat/src/main/java/org/exist/storage/md/MetaDataImpl.java
  65. +1 −1 extensions/metadata/sleepycat/src/main/java/org/exist/storage/md/MetaImpl.java
  66. +7 −2 extensions/metadata/sleepycat/src/main/java/org/exist/storage/md/MetasImpl.java
  67. +10 −6 extensions/modules/build.xml
  68. +2 −2 extensions/modules/src/org/exist/xquery/modules/expathrepo/Deploy.java
  69. +92 −91 extensions/modules/src/org/exist/xquery/modules/file/SerializeToFile.java
  70. +281 −239 extensions/modules/src/org/exist/xquery/modules/httpclient/BaseHTTPClientFunction.java
  71. +19 −20 extensions/modules/src/org/exist/xquery/modules/httpclient/ClearFunction.java
  72. +73 −25 extensions/modules/src/org/exist/xquery/modules/jfreechart/JFreeChartFactory.java
  73. +3 −3 extensions/modules/src/org/exist/xquery/modules/jfreechart/JFreeCharting.java
  74. +6 −6 extensions/modules/src/org/exist/xquery/modules/xmlcalabash/readme.txt
  75. +3 −3 extensions/replication/src/org/exist/replication/jms/publish/JMSMessageSender.java
  76. +7 −7 extensions/replication/src/org/exist/replication/jms/publish/ReplicationTrigger.java
  77. +3 −2 extensions/replication/src/org/exist/replication/shared/eXistMessage.java
  78. BIN installer/App_DS_Store
  79. BIN installer/VolumeIcon.icns
  80. BIN installer/background.png
  81. +2 −30 installer/install.xml.tmpl
  82. +2 −2 installer/install.xsl
  83. +5 −1 installer/scripts/eXist-db.mac/Contents/{Info.plist → Info.plist.tmpl}
  84. +1 −1 installer/vm.properties
  85. BIN lib/endorsed/saxonhe-9.2.1.5.jar
  86. BIN lib/endorsed/saxonhe-9.4.0.7.jar
  87. 0 lib/endorsed/{resolver-1.2.jar → xml-resolver-1.2.jar}
  88. 0 lib/endorsed/{resolver-LICENSE.txt → xml-resolver-LICENSE.txt}
  89. 0 lib/endorsed/{resolver-NOTICE.txt → xml-resolver-NOTICE.txt}
  90. +14 −3 nbproject/build-impl.xml
  91. +2 −2 nbproject/genfiles.properties
  92. +2 −2 nbproject/project.properties
  93. +18 −2 schema/collection.xconf.xsd
  94. +6 −0 src/org/exist/atom/http/AtomServlet.java
  95. +6 −2 src/org/exist/client/ClientFrame.java
  96. +4 −4 src/org/exist/client/ConnectionDialog.java
  97. +10 −1 src/org/exist/client/InteractiveClient.java
  98. +9 −6 src/org/exist/client/QueryDialog.java
  99. +1 −1 src/org/exist/client/security/AccessControlEntryDialog.form
  100. +1 −1 src/org/exist/client/security/AccessControlEntryDialog.java
  101. +1 −1 src/org/exist/client/security/EditPropertiesDialog.form
  102. +1 −1 src/org/exist/client/security/EditPropertiesDialog.java
  103. +18 −7 src/org/exist/client/security/EditUserDialog.java
  104. +5 −1 src/org/exist/client/security/UserDialog.java
  105. +21 −7 src/org/exist/client/security/UserManagerDialog.java
  106. +6 −0 src/org/exist/collections/triggers/XQueryTrigger.java
  107. +33 −13 src/org/exist/config/Configurator.java
  108. +1 −2 src/org/exist/dom/NodeImpl.java
  109. +5 −1 src/org/exist/dom/NodeProxy.java
  110. +96 −107 src/org/exist/http/RESTServer.java
  111. +1 −1 src/org/exist/http/servlets/XQueryServlet.java
  112. +0 −2 src/org/exist/http/urlrewrite/Forward.java
  113. +13 −17 src/org/exist/http/urlrewrite/XQueryURLRewrite.java
  114. +1 −1 src/org/exist/interpreter/Context.java
  115. +321 −0 src/org/exist/launcher/ConfigurationDialog.form
  116. +563 −0 src/org/exist/launcher/ConfigurationDialog.java
  117. +76 −0 src/org/exist/launcher/ConfigurationUtility.java
  118. +65 −21 src/org/exist/launcher/Launcher.java
  119. +24 −13 src/org/exist/launcher/LauncherWrapper.java
  120. +41 −25 src/org/exist/launcher/UtilityPanel.java
  121. BIN src/org/exist/launcher/browsing.png
  122. +36 −0 src/org/exist/launcher/conf.xsl
  123. BIN src/org/exist/launcher/dashboard.png
  124. BIN src/org/exist/launcher/exide.png
  125. +4 −1 src/org/exist/launcher/vm.properties
  126. +44 −9 src/org/exist/repo/Deployment.java
  127. +24 −0 src/org/exist/repo/PackageLoader.java
  128. +1 −1 src/org/exist/scheduler/UserXQueryJob.java
  129. +1 −2 src/org/exist/security/AbstractAccount.java
  130. +4 −0 src/org/exist/security/AbstractPrincipal.java
  131. +10 −2 src/org/exist/security/AbstractRealm.java
  132. +2 −0 src/org/exist/security/internal/Password.java
  133. +1 −1 src/org/exist/security/internal/SecurityManagerImpl.java
  134. +1 −1 src/org/exist/soap/Session.java
  135. +12 −7 src/org/exist/storage/BrokerFactory.java
  136. +270 −237 src/org/exist/storage/BrokerPool.java
  137. +7 −0 src/org/exist/storage/NativeBroker.java
  138. +53 −7 src/org/exist/storage/btree/BTree.java
  139. +25 −16 src/org/exist/storage/journal/FileSyncThread.java
  140. +8 −6 src/org/exist/storage/journal/Journal.java
  141. +0 −1 src/org/exist/storage/recovery/RecoveryManager.java
  142. +5 −2 src/org/exist/util/io/Resource.java
  143. +5 −5 src/org/exist/xmlrpc/RpcConnection.java
  144. +12 −10 src/org/exist/xmlrpc/XmldbRequestProcessorFactory.java
  145. +21 −20 src/org/exist/xquery/DebuggableExpression.java
  146. +4 −3 src/org/exist/xquery/DynamicNameCheck.java
  147. +1 −0 src/org/exist/xquery/LocationStep.java
  148. +1 −1 src/org/exist/xquery/OpOr.java
  149. +1 −1 src/org/exist/xquery/Optimizer.java
  150. +12 −6 src/org/exist/xquery/Predicate.java
  151. +3 −0 src/org/exist/xquery/TryCatchExpression.java
  152. +48 −23 src/org/exist/xquery/XQueryContext.java
  153. +5 −2 src/org/exist/xquery/functions/fn/FunBaseURI.java
  154. +2 −0 src/org/exist/xquery/functions/securitymanager/SecurityManagerModule.java
  155. +14 −2 src/org/exist/xquery/functions/system/GetExistHome.java
  156. +1 −1 src/org/exist/xquery/functions/util/UUID.java
  157. +1 −0 src/org/exist/xquery/lib/xqsuite/xqsuite.xql
  158. +7 −2 src/org/exist/xquery/parser/XQuery.g
  159. +3,560 −3,560 src/org/exist/xquery/parser/XQueryLexer.smap
  160. +7 −2 src/org/exist/xquery/parser/XQueryParser.java
  161. +9,957 −9,952 src/org/exist/xquery/parser/XQueryParser.smap
  162. +54 −19 src/org/exist/xquery/parser/XQueryTree.g
  163. +125 −87 src/org/exist/xquery/parser/XQueryTreeParser.java
  164. +5,629 −5,591 src/org/exist/xquery/parser/XQueryTreeParser.smap
  165. +1 −1 src/org/exist/xquery/util/DocUtils.java
  166. +1 −1 src/org/exist/xquery/value/BinaryValueManager.java
  167. +22 −1 test/src/org/exist/ant/AntUnitTestRunner.java
  168. +10 −3 test/src/org/exist/storage/CollectionTest.java
  169. +27 −6 test/src/org/exist/storage/MoveResourceTest.java
  170. +6 −1 test/src/org/exist/storage/StoreBinaryTest.java
  171. +61 −1 test/src/org/exist/storage/btree/BTreeTest.java
  172. +2 −1 test/src/org/exist/xquery/AllXqueryTests.java
  173. +7 −0 test/src/org/exist/xquery/OptimizerTest.java
  174. +123 −0 test/src/org/exist/xquery/TestXPathOpOrSpecialCase.java
  175. +1 −1 test/src/org/exist/xquery/value/BinaryValueFromInputStreamTest.java
  176. +1 −1 test/src/org/exist/xquery/value/MockBinaryValueManager.java
  177. +89 −0 test/src/xquery/last.xql
  178. +33 −1 test/src/xquery/maps/maps.xql
  179. +8 −0 test/src/xquery/suite.xql
  180. +6 −1 tools/wrapper/bin/exist.sh.in
  181. BIN tools/wrapper/bin/wrapper-aix-ppc-32
  182. BIN tools/wrapper/bin/wrapper-aix-ppc-64
  183. BIN tools/wrapper/bin/wrapper-freebsd-x86-32
  184. BIN tools/wrapper/bin/wrapper-freebsd-x86-64
  185. BIN tools/wrapper/bin/wrapper-hpux-ia-32
  186. BIN tools/wrapper/bin/wrapper-hpux-ia-64
  187. BIN tools/wrapper/bin/wrapper-hpux-parisc-32
  188. BIN tools/wrapper/bin/wrapper-hpux-parisc-64
  189. BIN tools/wrapper/bin/wrapper-linux-armel-32
  190. BIN tools/wrapper/bin/wrapper-linux-armhf-32
  191. BIN tools/wrapper/bin/wrapper-linux-ppc-32
  192. BIN tools/wrapper/bin/wrapper-linux-ppc-64
  193. BIN tools/wrapper/bin/wrapper-windows-x86-64.exe
  194. +12 −9 tools/wrapper/conf/wrapper.conf.in
  195. BIN tools/wrapper/lib/libwrapper-aix-ppc-32.a
  196. BIN tools/wrapper/lib/libwrapper-aix-ppc-64.a
  197. BIN tools/wrapper/lib/libwrapper-freebsd-x86-32.so
  198. BIN tools/wrapper/lib/libwrapper-freebsd-x86-64.so
  199. BIN tools/wrapper/lib/libwrapper-hpux-ia-32.so
  200. BIN tools/wrapper/lib/libwrapper-hpux-ia-64.so
  201. BIN tools/wrapper/lib/libwrapper-hpux-parisc-32.sl
  202. BIN tools/wrapper/lib/libwrapper-hpux-parisc-64.sl
  203. BIN tools/wrapper/lib/libwrapper-linux-ppc-32.so
  204. BIN tools/wrapper/lib/libwrapper-linux-ppc-64.so
  205. BIN tools/wrapper/lib/wrapper-windows-x86-64.dll
  206. +15 −0 tools/wrapper/platformsupport.txt
  207. +42 −11 tools/wrapper/src/org/exist/wrapper/Main.java
  208. +5 −1 vm.properties
View
3 .classpath
@@ -37,7 +37,7 @@
<classpathentry kind="lib" path="lib/endorsed/xml-apis-1.4.01.jar"/>
<classpathentry kind="lib" path="lib/endorsed/serializer-2.7.1.jar"/>
<classpathentry kind="lib" path="lib/endorsed/xercesImpl-2.11.0.jar"/>
- <classpathentry kind="lib" path="lib/endorsed/resolver-1.2.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"/>
@@ -135,7 +135,6 @@
<classpathentry kind="lib" path="lib/optional/commons-lang3-3.1.jar"/>
<classpathentry kind="lib" path="tools/aspectj/lib/aspectjrt-1.7.1.jar"/>
<classpathentry kind="lib" path="lib/core/quartz-2.1.6.jar"/>
- <classpathentry kind="lib" path="lib/endorsed/saxonhe-9.2.1.5.jar"/>
<classpathentry kind="lib" path="lib/optional/fluent-hc-4.2.3.jar"/>
<classpathentry kind="lib" path="lib/optional/httpclient-4.2.3.jar"/>
<classpathentry kind="lib" path="lib/optional/httpclient-cache-4.2.3.jar"/>
View
4 build/scripts/build-impl.xml
@@ -143,7 +143,7 @@
<copy file="${basedir}/conf.xml.tmpl" tofile="${basedir}/conf.xml" filtering="true">
<filterset>
<filter token="dataDir" value="webapp/WEB-INF/data"/>
- <filter token="cacheSize" value="64"/>
+ <filter token="cacheSize" value="128"/>
</filterset>
</copy>
<copy file="${basedir}/conf.xml.tmpl" tofile="${basedir}/installer/conf.xml" filtering="true">
@@ -329,6 +329,8 @@
<copy todir="${build.classes}/org/exist/launcher">
<fileset dir="${src}/org/exist/launcher">
<include name="**.png"/>
+ <include name="**.xsl"/>
+ <include name="**.properties"/>
</fileset>
</copy>
<copy todir="${build.classes}/org/exist/webstart/resources">
View
4 build/scripts/dist.xml
@@ -101,6 +101,10 @@
<lib dir="extensions/modules/lib">
<include name="*.jar"/>
</lib>
+ <!-- Include content extraction jars if present -->
+ <lib dir="extensions/contentextraction/lib">
+ <include name="*.jar"/>
+ </lib>
<!-- Add configuration files to WEB-INF -->
View
10 build/scripts/installer.xml
@@ -3,7 +3,7 @@
<!-- eXist build file : Build installer -->
<!-- ======================================================================= -->
<!-- $Id$ -->
-<project basedir="../.." default="snapshot-installer" name="Build installer">
+<project basedir="../.." default="installer" name="Build installer">
<description>Build installer</description>
@@ -38,6 +38,14 @@
<delete dir="${jetty.dir}/work/Jetty__8080__exist"/>
<touch file="webapp/WEB-INF/logs/exist.log"/>
<touch file="webapp/WEB-INF/logs/xmldb.log"/>
+
+ <copy file="installer/scripts/eXist-db.mac/Contents/Info.plist.tmpl"
+ tofile="installer/scripts/eXist-db.mac/Contents/Info.plist" filtering="true">
+ <filterset>
+ <filter token="vmoptions" value=""/>
+ <filter token="classpath" value="$APP_PACKAGE/../start.jar"/>
+ </filterset>
+ </copy>
</target>
<target name="clean-installer-xars-dir" description="Remove installer apps.dir directory">
View
248 build/scripts/macosx.xml
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ======================================================================= -->
+<!-- eXist build file : Mac OS specific app -->
+<!-- Call target "dmg" to create dmg file -->
+<!-- ======================================================================= -->
+<!-- $Id$ -->
+<project basedir="../.." default="dmg" name="Mac OS App">
+
+ <description>Build installer</description>
+
+ <!-- import common targets -->
+ <import file="../../build.xml"/>
+
+ <property name="dist" value="${basedir}/dist"/>
+ <property name="app.dir" value="${dist}/eXist-db.app"/>
+ <property name="app.resources" value="${app.dir}/Contents/Resources"/>
+ <property name="app.exist" value="${app.resources}/eXist-db"/>
+
+ <target name="package" depends="jar,create-skeleton,copy-all"/>
+
+ <target name="prepare" depends="xars">
+ <delete failonerror="false" dir="${app.dir}"/>
+ <mkdir dir="${dist}"/>
+ </target>
+
+ <target name="create-skeleton" depends="prepare">
+ <copy todir="${app.dir}">
+ <fileset dir="installer/scripts/eXist-db.mac">
+ <exclude name=".svn"/>
+ <exclude name="Info.plist.tmpl"/>
+ </fileset>
+ </copy>
+ <copy file="installer/scripts/eXist-db.mac/Contents/Info.plist.tmpl"
+ tofile="${app.dir}/Contents/Info.plist" filtering="true">
+ <filterset>
+ <filter token="vmoptions" value="-Dexist.home=$APP_PACKAGE/Contents/Resources/eXist-db"/>
+ <filter token="classpath" value="$APP_PACKAGE/Contents/Resources/eXist-db/start.jar"/>
+ </filterset>
+ </copy>
+ <mkdir dir="${app.exist}"/>
+ </target>
+
+ <target name="copy-apps">
+ <copy todir="${app.exist}/autodeploy">
+ <fileset dir="${basedir}/installer/apps">
+ <include name="*.xar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="copy-all" depends="copy-apps">
+ <filter token="version" value="${project.version}"/>
+ <filter token="database" value="native"/>
+
+ <copy todir="${app.exist}/">
+ <fileset dir="${basedir}">
+ <include name="client.properties.tmpl"/>
+ <include name="client.properties"/>
+ <include name="backup.properties"/>
+ <include name="server.xml.tmpl"/>
+ <include name="server.xml"/>
+ <include name="conf.xml.tmpl"/>
+ <include name="descriptor.xml.tmpl"/>
+ <include name="descriptor.xml"/>
+ <include name="collection.xconf.init"/>
+ <include name="log4j.xml"/>
+ <include name="log4j.dtd"/>
+ <include name="LICENSE"/>
+ <include name="README"/>
+ <include name="VERSION.txt"/>
+ <include name="exist.jar"/>
+ <include name="exist-optional.jar"/>
+ <include name="exist-modules.jar"/>
+ <include name="exist-fluent.jar"/>
+ <include name="start.jar"/>
+ <include name="start.exe"/>
+ <include name="examples.jar"/>
+ <include name="mime-types.xml.tmpl"/>
+ <include name="mime-types.xml"/>
+ <include name="atom-example.xq"/>
+ <include name="atom-services.xml"/>
+ <include name="bin/"/>
+ <include name="lib/"/>
+ <include name="samples/**"/>
+ <include name="schema/"/>
+ <exclude name="**/CVS/"/>
+ <exclude name="**/*~"/>
+ <exclude name="**/*.log*"/>
+ <exclude name="**/.*"/>
+ </fileset>
+ </copy>
+ <copy todir="${app.exist}/extensions">
+ <fileset dir="${basedir}/extensions">
+ <exclude name="**/*~"/>
+ <exclude name="**/.*"/>
+ <exclude name="**/CVS/"/>
+ <exclude name=".*"/>
+ <exclude name="**/src/"/>
+ <exclude name="**/classes/"/>
+ <exclude name="**/javadoc/"/>
+ <!-- preferred to have explicit one explicit include but .... -->
+ <exclude name="indexes/**/lib/g*.jar"/>
+ <exclude name="indexes/**/lib/j*.jar"/>
+ <exclude name="indexes/**/lib/v*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${app.exist}/extensions/betterform/main/webapp/WEB-INF">
+ <fileset dir="${basedir}/extensions/betterform/main/webapp/WEB-INF">
+ <include name="classes/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${app.exist}/tools">
+ <fileset dir="${basedir}/tools">
+ <include name="**/*.jar"/>
+ <include name="wrapper/**"/>
+ <include name="requestlog/**"/>
+ <include name="rulesets/**"/>
+ <include name="ant/**"/>
+ <include name="Solaris/**"/>
+ <include name="SOAPServer/**"/>
+ <exclude name="ant/lib/javasvn*.jar"/>
+ <include name="jetty/**"/>
+ <exclude name="jetty/logs/*"/>
+ <exclude name="jetty/tmp/*"/>
+ <exclude name="jetty/work/*"/>
+ <exclude name="ircbot/**"/>
+ <include name="aspectj/**"/>
+ <exclude name="izpack/**"/>
+ <exclude name="ant/lib/svnkit*.jar"/>
+ <include name="jmx/**"/>
+ <exclude name="jmx/classes/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${app.exist}/webapp">
+ <fileset dir="${basedir}/webapp">
+ <exclude name="**/*.dbx"/>
+ <exclude name="**/*.log*"/>
+ <exclude name="**/*.lck*"/>
+ <exclude name="**/*.registry*"/>
+ <exclude name="api/**"/>
+ <!--exclude name="xqts/**"/-->
+ <exclude name="**/.svn/"/>
+ <exclude name="**/*~"/>
+ <exclude name="WEB-INF/logs/**"/>
+ <exclude name="WEB-INF/data/export/**"/>
+ <exclude name="WEB-INF/data/fs/**"/>
+ <exclude name="WEB-INF/data/fs.journal/**"/>
+ <exclude name="WEB-INF/data/lucene/**"/>
+ <exclude name="WEB-INF/expathrepo/**"/>
+ <exclude name="WEB-INF/data/expathrepo/**"/>
+ </fileset>
+ </copy>
+ <copy file="${basedir}/conf.xml.tmpl" tofile="${app.exist}/conf.xml" filtering="true">
+ <filterset>
+ <filter token="dataDir" value="webapp/WEB-INF/data"/>
+ <filter token="cacheSize" value="128"/>
+ </filterset>
+ </copy>
+ <chmod perm="+x">
+ <fileset dir="${app.dir}/Contents/MacOS">
+ <include name="JavaApplicationStub"/>
+ </fileset>
+ </chmod>
+ </target>
+
+ <!-- Create a DMG - This only works on MacOSX (requires hdiutil) -->
+ <target name="dmg" depends="package" description="Create a DMG package for MacOSX (only works on MacOSX)">
+
+ <!-- Set this property value to your application name -->
+ <property name="app.name" value="${project.name}"/>
+
+ <!-- Set this property value to a directory where you can
+ mount temporarily your images, for example /tmp -->
+ <property name="mountdir" value="/tmp"/>
+
+ <!-- Delete previously created DMG -->
+ <delete file="${dist}/${app.name}.dmg" quiet="yes" failonerror="false"/>
+
+ <!-- Create a temporary Disk Image -->
+ <exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="true">
+ <arg value="create"/>
+ <arg value="-srcfolder"/>
+ <arg value="${app.dir}"/>
+ <arg value="-volname"/>
+ <arg value="${app.name}"/>
+ <arg value="-ov"/>
+ <arg value="${dist}/${app.name}-tmp.dmg"/>
+ <arg value="-format"/>
+ <arg value="UDRW"/>
+ </exec>
+
+ <!-- Attach the temporary image -->
+ <exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="true">
+ <arg value="attach"/>
+ <arg value="${dist}/${app.name}-tmp.dmg"/>
+ <arg value="-mountroot"/>
+ <arg value="${mountdir}/"/>
+ </exec>
+
+ <!-- Copy the background, the volume icon and DS_Store files -->
+ <mkdir dir="${mountdir}/${app.name}/.DropDMGBackground"/>
+ <copy file="installer/background.png"
+ tofile="${mountdir}/${app.name}/.DropDMGBackground/background.png"
+ overwrite="true"/>
+ <copy file="installer/VolumeIcon.icns"
+ tofile="${mountdir}/${app.name}/.VolumeIcon.icns"
+ overwrite="true"/>
+ <copy file="installer/App_DS_Store"
+ tofile="${mountdir}/${app.name}/.DS_Store"
+ overwrite="true"/>
+
+ <!-- Indicate that we want a custom icon -->
+ <exec executable="/Applications/Xcode.app/Contents/Developer/Tools/SetFile" os="Mac OS X">
+ <arg value="-a"/>
+ <arg value="C"/>
+ <arg value="${mountdir}/${app.name}"/>
+ </exec>
+
+ <!-- Add a symbolic link to the Applications directory -->
+ <symlink link="${mountdir}/${app.name}" resource="/Applications"/>
+
+ <!-- Detach the temporary image -->
+ <exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="true">
+ <arg value="detach"/>
+ <arg value="${mountdir}/${app.name}"/>
+ </exec>
+
+ <!-- Compress it to a new image -->
+ <exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="true">
+ <arg value="convert"/>
+ <arg value="${dist}/${app.name}-tmp.dmg"/>
+ <arg value="-format"/>
+ <arg value="UDZO"/>
+ <arg value="-o"/>
+ <arg value="${dist}/${app.name}.dmg"/>
+ </exec>
+
+ <exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="true">
+ <arg value="internet-enable"/>
+ <arg value="-yes"/>
+ <arg value="${dist}/${app.name}.dmg"/>
+ </exec>
+
+ <!-- Delete the temporary image -->
+ <delete file="${dist}/${app.name}-tmp.dmg"
+ quiet="yes" failonerror="false"/>
+ </target>
+</project>
View
1 conf.xml.tmpl
@@ -782,6 +782,7 @@
<!-- EXQuery Modules -->
<!-- RESTXQ -->
<module uri="http://exquery.org/ns/restxq" class="org.exist.extensions.exquery.restxq.impl.xquery.RestXqModule"/>
+ <module uri="http://exquery.org/ns/restxq/exist" class="org.exist.extensions.exquery.restxq.impl.xquery.exist.ExistRestXqModule"/>
<!-- Request Module -->
<module uri="http://exquery.org/ns/request" class="org.exist.extensions.exquery.modules.request.RequestModule"/>
View
732 eXist.iws
@@ -105,21 +105,24 @@
<component name="ChangeListManager">
<list readonly="true" id="9c94c8a9-f5ba-4ada-96fc-bdc14754ba2b" name="Default" comment="" />
<list id="c2cbb0af-73e4-419e-a2b6-663e0bbfd989" name="[feature] added ant task to extract XQuery module documentation and store into the db. (Pre-Tested Commit)" comment="[feature] added ant task to extract XQuery module documentation and store into the db." />
- <list id="f5bc3222-24ad-43d3-b9b5-627b42110798" name="local" comment="[repo] added status field to public repo" />
+ <list id="f5bc3222-24ad-43d3-b9b5-627b42110798" name="local" comment="[feature] optimize compression from the File System" />
<list id="dee4f116-21e7-4919-8859-4bc3127d8801" name="xproc" comment="xproc" />
- <list default="true" id="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" name="Revert: [ignore] update idea project" comment="Revert: [ignore] update idea project">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/exist/collections/Collection.java" afterPath="$PROJECT_DIR$/src/org/exist/collections/Collection.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/exist/xquery/functions/xmldb/XMLDBSetCollectionPermissions.java" afterPath="$PROJECT_DIR$/src/org/exist/xquery/functions/xmldb/XMLDBSetCollectionPermissions.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/exist/xquery/functions/xmldb/XMLDBSetResourcePermissions.java" afterPath="$PROJECT_DIR$/src/org/exist/xquery/functions/xmldb/XMLDBSetResourcePermissions.java" />
+ <list default="true" id="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" name="Revert: [ignore] update idea project" comment="[ignore] update idea project">
+ <change type="DELETED" beforePath="$PROJECT_DIR$/webapp/WEB-INF/expathrepo" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/tools/ant/lib/ivy-2.2.0.jar" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/org/exist/util/serializer/DOMStreamer.java" afterPath="$PROJECT_DIR$/src/org/exist/util/serializer/DOMStreamer.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/org/exist/xmldb/ResourceTest.java" afterPath="$PROJECT_DIR$/test/src/org/exist/xmldb/ResourceTest.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/extensions/build.properties" afterPath="$PROJECT_DIR$/extensions/build.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/eXist.iws" afterPath="$PROJECT_DIR$/eXist.iws" />
</list>
+ <list id="2fe5d5c5-3eab-4c67-bc87-1c5a706e8808" name="New changelist" comment="" />
<ignored path="$USER_HOME$/.grails/" />
<ignored path="$USER_HOME$/.griffon/" />
<file path="/AccountManagementFunction.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1359905626485" ignored="false" />
<file path="/FindUserFunction.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1359891760538" ignored="false" />
<file path="/SecurityManagerModule.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1359905681897" ignored="false" />
<file path="/XMLDBCreateUser.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1359893357291" ignored="false" />
- <file path="/fragment.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1359894332124" ignored="false" />
+ <file path="/fragment.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1367613352724" ignored="false" />
<file path="/XMLDBDeleteUser.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1359895970968" ignored="false" />
<file path="/XMLDBChangeUser.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1359896759307" ignored="false" />
<file path="/GroupManagementFunction.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1359898488245" ignored="false" />
@@ -143,13 +146,74 @@
<file path="/UserAider.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1359908008200" ignored="false" />
<file path="/AbstractSubject.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1359908145543" ignored="false" />
<file path="/AbstractGroup.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1359909202582" ignored="false" />
- <file path="/Dummy.txt" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1359909223228" ignored="false" />
+ <file path="/Dummy.txt" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1367617319022" ignored="false" />
<file path="/SAXSerializer.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1360487326596" ignored="false" />
<file path="/MicroXmlWriter.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1360489244679" ignored="false" />
<file path="/XMLDBSetCollectionPermissions.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1360600213485" ignored="false" />
<file path="/LocalUserManagementService.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1360601232880" ignored="false" />
<file path="/Collection.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1360601370483" ignored="false" />
<file path="/XMLDBSetResourcePermissions.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1360601514247" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/exist/eXistWrapper.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363675114246" ignored="false" />
+ <file path="/eXistWrapper.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363284201333" ignored="false" />
+ <file path="/DOMStreamer.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363295478973" ignored="false" />
+ <file path="/ResourceTest.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363296629840" ignored="false" />
+ <file path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/classes.jar!/javax/xml/parsers/DocumentBuilderFactory.class" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363343146203" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/utils/src/main/java/ru/mcfr/oxygen/util/XmlTool.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1364555830066" ignored="false" />
+ <file path="/XmlTool.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363594633273" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/controller/LoginSuccess.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363346601192" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/plugin/extensions/ExistProtocolHandler.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363346601192" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/fenomen/commons/PackCreator.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363346601192" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/controller/ShowDoc.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363346601192" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/plugin/workspace/tools/fenomen/FenomenProvider.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363346601192" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/framework/src/main/java/ru/mcfr/oxygen/framework/operations/McfrBaseAuthorOperation.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363346601192" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/plugin/gui/documentList/DocsListFrame.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365591965071" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/util/FillIDs.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363346601192" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/plugin/workspace/listeners/FenomenDocumentInformation.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363346601192" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/framework/src/main/java/ru/mcfr/oxygen/framework/filters/workers/ScrollSchower.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363346601192" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/framework/src/main/java/ru/mcfr/oxygen/framework/operations/table/JoinCellInRowOperation.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363346630917" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/framework/src/main/java/ru/mcfr/oxygen/framework/operations/DeleteAllIdOperation.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363346636028" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/controller/src/main/java/ru/mcfr/oxygen/controller/Controller.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365604627479" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/controller/src/main/java/ru/mcfr/oxygen/controller/Response.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363346817364" ignored="false" />
+ <file path="/Response.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363346329905" ignored="false" />
+ <file path="/Controller.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365592374192" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/plugin/workspace/customizers/FenomenMenuBarCustomizer.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365591963595" ignored="false" />
+ <file path="/FenomenMenuBarCustomizer.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363593816071" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/plugin/gui/DictionaryEditor.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365591963595" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/.idea/ant.xml" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1363594770483" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/plugin/gui/DictionaryTreeView.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365591963595" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/plugin/gui/DictionaryTreeTableModel.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1364555830066" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/plugin/gui/DictWidgetsTest.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1364115848383" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/controller/PartController.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1364115848383" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/.idea/runConfigurations/Oxygen.xml" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1364116136314" ignored="false" />
+ <file path="/BaseHTTPClientFunction.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1364116987847" ignored="false" />
+ <file path="$PROJECT_DIR$/../../scala/.idea/workspace.xml" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1364805615690" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/.idea/libraries/org_swinglabs_swingx_swingx_all_1_6_4.xml" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1364555830066" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/plugin/gui/DictModel.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1364562562883" ignored="false" />
+ <file path="/DictModel.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1364562554605" ignored="false" />
+ <file path="$PROJECT_DIR$/../../scala/recfun/src/main/scala/recfun/Main.scala" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1364732672613" ignored="false" />
+ <file path="/Main.scala" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1364731950006" ignored="false" />
+ <file path="$PROJECT_DIR$/../../scala/HelloWorld/src/test.sc" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1364730569636" ignored="false" />
+ <file path="/test.sc" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1364730356040" ignored="false" />
+ <file path="$PROJECT_DIR$/../../scala/funsets/src/main/scala/funsets/FunSets.scala" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365552829726" ignored="false" />
+ <file path="/FunSets.scala" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365552267769" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/controller/src/test/java/ru/mcfr/oxygen/controller/ControllerTest.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365606223936" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/plugin/workspace/customizers/toolbarActions/OpenDocumentAction.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365591963595" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/controller/PartCache.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365591963595" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/plugin/gui/dataModels/Field.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365591963595" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/controller/src/main/java/ru/mcfr/oxygen/controller/RequestPool.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365591963595" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/fenomen/ui/LoginWindow.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365591963595" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/EditorUtils/src/main/java/ru/mcfr/oxygen/plugin/extensions/MainWorkspacePluginExtension.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365591963595" ignored="false" />
+ <file path="$PROJECT_DIR$/../../mcfr/oxygen/controller/src/main/java/ru/mcfr/oxygen/controller/Test.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365591965071" ignored="false" />
+ <file path="$PROJECT_DIR$/../../animotron/bridge/animo/apps/template/app-layout.animo" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365670574758" ignored="false" />
+ <file path="/app-layout.animo" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365670466948" ignored="false" />
+ <file path="$PROJECT_DIR$/../../animotron/bridge/src/main/java/org/animotron/bridge/websocket/Echo.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365671698325" ignored="false" />
+ <file path="/Echo.java" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365671677648" ignored="false" />
+ <file path="$PROJECT_DIR$/../../animotron/bridge/animo/apps/app.js" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365706308137" ignored="false" />
+ <file path="/app.js" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365705735755" ignored="false" />
+ <file path="$PROJECT_DIR$/../../animotron/bridge/animo/apps/IDE/IDE.js" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365762582837" ignored="false" />
+ <file path="/IDE.js" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365762580399" ignored="false" />
+ <file path="$APPLICATION_HOME_DIR$/lib/jdkAnnotations.jar!/java/lang/annotations.xml" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1365764528111" ignored="false" />
+ <file path="$PROJECT_DIR$/lib/extensions/exist-xqdoc.jar!/org/exist/xqdoc/ant/antlib.xml" changelist="54ed1300-8fbd-44d6-8b6e-222a6cf763c0" time="1367270481983" ignored="false" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -163,59 +227,54 @@
<splitter proportion="0.5" />
</component>
<component name="CreatePatchCommitExecutor">
- <option name="PATCH_PATH" value="" />
+ <option name="PATCH_PATH" value="$PROJECT_DIR$" />
</component>
<component name="DaemonCodeAnalyzer">
<disable_hints />
</component>
<component name="DebuggerManager">
- <line_breakpoints default_suspend_policy="SuspendAll" default_condition_enabled="true">
- <breakpoint url="file://$PROJECT_DIR$/src/org/exist/xquery/functions/securitymanager/GroupMembershipFunctions.java" line="260" class="org.exist.xquery.functions.securitymanager.GroupMembershipFunctions" package="org.exist.xquery.functions.securitymanager">
- <option name="ENABLED" value="true" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="SUSPEND" value="true" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="true" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/org/exist/xmldb/LocalUserManagementService.java" line="349" class="org.exist.xmldb.LocalUserManagementService$12$1" package="org.exist.xmldb">
- <option name="ENABLED" value="true" />
+ <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
+ <breakpoint>
+ <option name="NOTIFY_CAUGHT" value="true" />
+ <option name="NOTIFY_UNCAUGHT" value="true" />
+ <option name="ENABLED" value="false" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="REMOVE_AFTER_HIT" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="SUSPEND" value="true" />
<option name="COUNT_FILTER_ENABLED" value="false" />
<option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="true" />
+ <option name="CONDITION_ENABLED" value="false" />
<option name="CLASS_FILTERS_ENABLED" value="false" />
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/org/exist/xmldb/LocalUserManagementService.java" line="350" class="org.exist.xmldb.LocalUserManagementService$12$1" package="org.exist.xmldb">
- <option name="ENABLED" value="true" />
+ <breakpoint>
+ <option name="NOTIFY_CAUGHT" value="true" />
+ <option name="NOTIFY_UNCAUGHT" value="true" />
+ <option name="ENABLED" value="false" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="REMOVE_AFTER_HIT" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="SUSPEND" value="true" />
<option name="COUNT_FILTER_ENABLED" value="false" />
<option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="true" />
+ <option name="CONDITION_ENABLED" value="false" />
<option name="CLASS_FILTERS_ENABLED" value="false" />
<option name="INSTANCE_FILTERS_ENABLED" value="false" />
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/org/exist/xmldb/LocalUserManagementService.java" line="371" class="org.exist.xmldb.LocalUserManagementService$13$1" package="org.exist.xmldb">
+ </breakpoint_any>
+ <line_breakpoints default_suspend_policy="SuspendAll" default_condition_enabled="true">
+ <breakpoint url="file://$PROJECT_DIR$/src/org/exist/xquery/functions/securitymanager/GroupMembershipFunctions.java" line="260" class="org.exist.xquery.functions.securitymanager.GroupMembershipFunctions" package="org.exist.xquery.functions.securitymanager">
<option name="ENABLED" value="true" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="REMOVE_AFTER_HIT" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="SUSPEND" value="true" />
<option name="COUNT_FILTER_ENABLED" value="false" />
@@ -226,10 +285,11 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/org/exist/xmldb/LocalUserManagementService.java" line="370" class="org.exist.xmldb.LocalUserManagementService$13$1" package="org.exist.xmldb">
+ <breakpoint url="file://$PROJECT_DIR$/src/org/exist/xquery/functions/xmldb/XMLDBSetResourcePermissions.java" line="121" class="org.exist.xquery.functions.xmldb.XMLDBSetResourcePermissions" package="org.exist.xquery.functions.xmldb">
<option name="ENABLED" value="true" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="REMOVE_AFTER_HIT" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="SUSPEND" value="true" />
<option name="COUNT_FILTER_ENABLED" value="false" />
@@ -240,10 +300,11 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/org/exist/xquery/functions/xmldb/XMLDBSetResourcePermissions.java" line="121" class="org.exist.xquery.functions.xmldb.XMLDBSetResourcePermissions" package="org.exist.xquery.functions.xmldb">
+ <breakpoint url="file://$PROJECT_DIR$/src/org/exist/util/serializer/DOMStreamer.java" line="155" class="org.exist.util.serializer.DOMStreamer" package="org.exist.util.serializer">
<option name="ENABLED" value="true" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="REMOVE_AFTER_HIT" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="SUSPEND" value="true" />
<option name="COUNT_FILTER_ENABLED" value="false" />
@@ -256,40 +317,6 @@
</breakpoint>
</line_breakpoints>
<ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
- <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
- <breakpoint>
- <option name="NOTIFY_CAUGHT" value="true" />
- <option name="NOTIFY_UNCAUGHT" value="true" />
- <option name="ENABLED" value="false" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="SUSPEND" value="true" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint>
- <option name="NOTIFY_CAUGHT" value="true" />
- <option name="NOTIFY_UNCAUGHT" value="true" />
- <option name="ENABLED" value="false" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="SUSPEND" value="true" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- </breakpoint_any>
<breakpoint_rules />
<ui_properties />
</component>
@@ -329,87 +356,82 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="XMLDBSetCollectionPermissions.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/org/exist/xquery/functions/xmldb/XMLDBSetCollectionPermissions.java">
+ <file leaf-file-name="MemTreeBuilder.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/org/exist/memtree/MemTreeBuilder.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="22" column="0" selection-start="992" selection-end="992" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="43" column="13" selection-start="1386" selection-end="1386" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XMLDBSecurityTest.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/test/src/org/exist/security/XMLDBSecurityTest.java">
+ <file leaf-file-name="Serializer.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/org/exist/storage/serializers/Serializer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="26" column="13" selection-start="910" selection-end="910" vertical-scroll-proportion="0.0">
+ <state line="116" column="22" selection-start="4619" selection-end="4619" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="LocalUserManagementService.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/org/exist/xmldb/LocalUserManagementService.java">
+ <file leaf-file-name="DOMSerializer.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/org/exist/util/serializer/DOMSerializer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="176" column="44" selection-start="7134" selection-end="7134" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="e#5725#6071#0" expanded="true" />
- <element signature="e#6048#6049#0" expanded="true" />
- </folding>
+ <state line="48" column="36" selection-start="1747" selection-end="1747" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Permission.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/org/exist/security/Permission.java">
+ <file leaf-file-name="UnZipFunction.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/extensions/modules/src/org/exist/xquery/modules/compression/UnZipFunction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="149" column="16" selection-start="4358" selection-end="4358" vertical-scroll-proportion="0.0">
+ <state line="95" column="129" selection-start="5036" selection-end="5036" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="SimpleACLPermission.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/org/exist/security/SimpleACLPermission.java">
+ <file leaf-file-name="NativeSerializer.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/org/exist/storage/serializers/NativeSerializer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="13" selection-start="1544" selection-end="1544" vertical-scroll-proportion="0.0">
+ <state line="57" column="13" selection-start="1949" selection-end="1949" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="UnixStylePermission.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/org/exist/security/UnixStylePermission.java">
+ <file leaf-file-name="AbstractExtractFunction.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/extensions/modules/src/org/exist/xquery/modules/compression/AbstractExtractFunction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="130" column="38" selection-start="4335" selection-end="4335" vertical-scroll-proportion="0.0">
+ <state line="174" column="21" selection-start="7107" selection-end="7107" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="DocumentImpl.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/org/exist/dom/DocumentImpl.java">
+ <file leaf-file-name="eXist.iws" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/eXist.iws">
<provider selected="true" editor-type-id="text-editor">
- <state line="261" column="5" selection-start="7239" selection-end="7364" vertical-scroll-proportion="0.0">
+ <state line="2099" column="30" selection-start="110963" selection-end="110963" vertical-scroll-proportion="0.28384992">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XMLDBSetResourcePermissions.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/org/exist/xquery/functions/xmldb/XMLDBSetResourcePermissions.java">
+ <file leaf-file-name="DocumentBuilderReceiver.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/org/exist/memtree/DocumentBuilderReceiver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="119" column="13" selection-start="5629" selection-end="5629" vertical-scroll-proportion="0.80360067">
+ <state line="42" column="34" selection-start="1494" selection-end="1494" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Collection.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/org/exist/collections/Collection.java">
+ <file leaf-file-name="Transform.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/org/exist/xquery/functions/transform/Transform.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1980" column="56" selection-start="82135" selection-end="82135" vertical-scroll-proportion="0.0">
+ <state line="8" column="13" selection-start="335" selection-end="335" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -425,14 +447,6 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/src/org/exist/xquery/functions/securitymanager/AccountManagementFunction.java" />
- <option value="$PROJECT_DIR$/src/org/exist/xquery/functions/securitymanager/SecurityManagerModule.java" />
- <option value="$PROJECT_DIR$/src/org/exist/security/Account.java" />
- <option value="$PROJECT_DIR$/src/org/exist/security/AbstractAccount.java" />
- <option value="$PROJECT_DIR$/src/org/exist/security/internal/aider/UserAider.java" />
- <option value="$PROJECT_DIR$/src/org/exist/security/AbstractSubject.java" />
- <option value="$PROJECT_DIR$/src/org/exist/xquery/functions/xmldb/XMLDBGetCurrentUserAttribute.java" />
- <option value="$PROJECT_DIR$/src/org/exist/xquery/functions/securitymanager/GroupMembershipFunctions.java" />
<option value="$PROJECT_DIR$/src/org/exist/security/AbstractGroup.java" />
<option value="/Library/Java/JavaVirtualMachines/1.6.0_29-b11-402.jdk/Contents/Home/src.jar!/src/java/lang/CharSequence.java" />
<option value="$PROJECT_DIR$/src/org/exist/util/serializer/SAXSerializer.java" />
@@ -441,6 +455,14 @@
<option value="$PROJECT_DIR$/src/org/exist/collections/Collection.java" />
<option value="$PROJECT_DIR$/src/org/exist/xquery/functions/xmldb/XMLDBSetCollectionPermissions.java" />
<option value="$PROJECT_DIR$/src/org/exist/xquery/functions/xmldb/XMLDBSetResourcePermissions.java" />
+ <option value="$PROJECT_DIR$/src/org/exist/util/serializer/DOMStreamer.java" />
+ <option value="$PROJECT_DIR$/test/src/org/exist/xmldb/ResourceTest.java" />
+ <option value="$PROJECT_DIR$/extensions/modules/src/org/exist/xquery/modules/httpclient/BaseHTTPClientFunction.java" />
+ <option value="$PROJECT_DIR$/src/org/exist/memtree/SAXAdapter.java" />
+ <option value="$PROJECT_DIR$/extensions/modules/src/org/exist/xquery/modules/compression/AbstractCompressFunction.java" />
+ <option value="$PROJECT_DIR$/extensions/modules/src/org/exist/xquery/modules/compression/AbstractExtractFunction.java" />
+ <option value="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/classes.jar!/org/xml/sax/ContentHandler.class" />
+ <option value="$PROJECT_DIR$/eXist.iws" />
</list>
</option>
</component>
@@ -470,10 +492,8 @@
<option name="CLIENT" value="" />
</component>
<component name="ProjectFrameBounds">
- <option name="x" value="12" />
- <option name="y" value="22" />
- <option name="width" value="1920" />
- <option name="height" value="1114" />
+ <option name="width" value="1280" />
+ <option name="height" value="800" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
@@ -482,10 +502,12 @@
<State>
<id />
</State>
+ </expanded-state>
+ <selected-state>
<State>
- <id>Android Lint</id>
+ <id>Abstraction issues</id>
</State>
- </expanded-state>
+ </selected-state>
</profile-state>
</entry>
</component>
@@ -655,30 +677,7 @@
<sortByType PackagesPane="true" Favorites="true" />
</navigator>
<panes>
- <pane id="PackagesPane">
- <subPane>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="eXist" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="eXist" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- </subPane>
- </pane>
- <pane id="Scope">
- <subPane subId="Project Files">
- <PATH>
- <PATH_ELEMENT USER_OBJECT="Root">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
- </PATH_ELEMENT>
- </PATH>
- </subPane>
- </pane>
+ <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -693,104 +692,13 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="eXist" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="eXist" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="eXist" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="eXist" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="eXist" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="exist" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="eXist" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="eXist" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="exist" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="util" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="eXist" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="eXist" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="exist" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="util" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="serializer" />
+ <option name="myItemId" value="eXist-2.1dev" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
+ <pane id="Scope" />
<pane id="Favorites">
<subPane subId="eXist">
<PATH>
@@ -996,21 +904,22 @@
<property name="TEMP_MODULE_EXPLODED_DIR_FOR_eXist/web/Web3" value="/private/tmp/webExplodedDir6251tmp" />
<property name="recentsLimit" value="5" />
<property name="MemberChooser.sorted" value="false" />
- <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth2" value="229" />
- <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth1" value="250" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth2" value="199" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth1" value="198" />
<property name="TEMP_MODULE_EXPLODED_DIR_FOR_eXist/web/Web4" value="/private/tmp/webExplodedDir18349tmp" />
- <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth0" value="224" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth0" value="199" />
<property name="TEMP_MODULE_EXPLODED_DIR_FOR_eXist/web/Web2" value="/private/tmp/webExplodedDir42908tmp" />
- <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth4" value="901" />
- <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth3" value="224" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth5" value="198" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth4" value="199" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth3" value="198" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="cvs_file_history_flatWidth2" value="292" />
- <property name="FullScreen" value="false" />
- <property name="cvs_file_history_flatWidth3" value="292" />
<property name="cvs_file_history_treeOrder0" value="0" />
+ <property name="cvs_file_history_flatWidth3" value="292" />
+ <property name="FullScreen" value="true" />
<property name="cvs_file_history_flatWidth0" value="292" />
- <property name="GoToClass.includeLibraries" value="false" />
<property name="cvs_file_history_flatWidth1" value="291" />
+ <property name="GoToClass.includeLibraries" value="false" />
<property name="options.splitter.details.proportions" value="0.2" />
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="RunManagerConfig.compileBeforeRunning" value="true" />
@@ -1019,20 +928,21 @@
<property name="project.structure.side.proportion" value="0.2" />
<property name="MemberChooser.copyJavadoc" value="false" />
<property name="TEMP_MODULE_EXPLODED_DIR_FOR_eXist/web/Web" value="/private/tmp/webExplodedDir6263tmp" />
- <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth1" value="296" />
- <property name="project.structure.last.edited" value="Modules" />
- <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth0" value="255" />
- <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth3" value="33" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth1" value="73" />
+ <property name="project.structure.last.edited" value="Project" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth0" value="71" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth3" value="37" />
<property name="OverrideImplement.combined" value="true" />
<property name="project.structure.proportion" value="0.15" />
- <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth2" value="275" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth2" value="76" />
<property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder1" value="1" />
<property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder0" value="0" />
<property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder3" value="3" />
<property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder2" value="2" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder5" value="5" />
<property name="GenerateAntBuildDialog.generateSingleFile" value="false" />
<property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder4" value="4" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/extensions/exquery/restxq/lib" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/eXist.ipr" />
<property name="GoToClass.includeJavaFiles" value="false" />
<property name="GenerateAntBuildDialog.enableUiFormCompile" value="true" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
@@ -1041,19 +951,22 @@
<property name="cvs_file_history_treeWidth2" value="292" />
<property name="cvs_file_history_treeWidth3" value="292" />
<property name="MemberChooser.showClasses" value="true" />
- <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth4" value="969" />
- <property name="cvs_file_history_flatOrder2" value="2" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth4" value="115" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth5" value="819" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder5" value="5" />
<property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder3" value="3" />
- <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder4" value="4" />
+ <property name="cvs_file_history_flatOrder2" value="2" />
<property name="cvs_file_history_flatOrder3" value="3" />
- <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder1" value="1" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder4" value="4" />
<property name="cvs_file_history_flatOrder0" value="0" />
- <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder2" value="2" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder1" value="1" />
<property name="cvs_file_history_flatOrder1" value="1" />
+ <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder2" value="2" />
<property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder0" value="0" />
+ <property name="restartRequiresConfirmation" value="true" />
<property name="GenerateAntBuildDialog.backupFiles" value="true" />
- <property name="dynamic.classpath" value="false" />
<property name="options.searchVisible" value="true" />
+ <property name="dynamic.classpath" value="false" />
</component>
<component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY">
@@ -1072,20 +985,20 @@
<recent name="$PROJECT_DIR$/webapp/repo/packages/functx-example" />
</key>
</component>
- <component name="RunManager" selected="Application.eXist Client">
- <configuration default="false" name="XMLCalabashTests" type="JUnit" factoryName="JUnit" temporary="true">
+ <component name="RunManager" selected="Application.Server">
+ <configuration default="false" name="CoreTests" type="JUnit" factoryName="JUnit" temporary="true">
<extension name="coverage" enabled="false" merge="false" runner="emma">
<pattern>
- <option name="PATTERN" value="org.exist.xquery.modules.xmlcalabash.test.*" />
+ <option name="PATTERN" value="xquery.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<extension name="snapshooter" />
<module name="eXist" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" value="org.exist.xquery.modules.xmlcalabash" />
- <option name="MAIN_CLASS_NAME" value="org.exist.xquery.modules.xmlcalabash.test.XMLCalabashTests" />
+ <option name="PACKAGE_NAME" value="xquery" />
+ <option name="MAIN_CLASS_NAME" value="xquery.CoreTests" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" />
@@ -1102,21 +1015,16 @@
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
- <configuration default="false" name="DateTests" type="JUnit" factoryName="JUnit" temporary="true">
- <extension name="coverage" enabled="false" merge="false" runner="emma">
- <pattern>
- <option name="PATTERN" value="xquery.dates.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
+ <configuration default="false" name="ResourceTest.setContentAsDOM_1" type="JUnit" factoryName="JUnit" temporary="true">
+ <extension name="coverage" enabled="false" merge="false" runner="emma" />
<extension name="snapshooter" />
<module name="eXist" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" value="xquery.dates" />
- <option name="MAIN_CLASS_NAME" value="xquery.dates.DateTests" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
+ <option name="PACKAGE_NAME" value="org.exist.xmldb" />
+ <option name="MAIN_CLASS_NAME" value="org.exist.xmldb.ResourceTest" />
+ <option name="METHOD_NAME" value="setContentAsDOM_1" />
+ <option name="TEST_OBJECT" value="method" />
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@@ -1131,21 +1039,16 @@
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
- <configuration default="false" name="UtilTests" type="JUnit" factoryName="JUnit" temporary="true">
- <extension name="coverage" enabled="false" merge="false" runner="emma">
- <pattern>
- <option name="PATTERN" value="xquery.util.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
+ <configuration default="false" name="ResourceTest.setContentAsDOM_01" type="JUnit" factoryName="JUnit" temporary="true">
+ <extension name="coverage" enabled="false" merge="false" runner="emma" />
<extension name="snapshooter" />
<module name="eXist" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" value="xquery.util" />
- <option name="MAIN_CLASS_NAME" value="xquery.util.UtilTests" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
+ <option name="PACKAGE_NAME" value="org.exist.xmldb" />
+ <option name="MAIN_CLASS_NAME" value="org.exist.xmldb.ResourceTest" />
+ <option name="METHOD_NAME" value="setContentAsDOM_01" />
+ <option name="TEST_OBJECT" value="method" />
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@@ -1156,25 +1059,26 @@
</option>
<envs />
<patterns />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="true" />
+ </RunnerSettings>
<RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
- <configuration default="false" name="CoreTests" type="JUnit" factoryName="JUnit" temporary="true">
- <extension name="coverage" enabled="false" merge="false" runner="emma">
- <pattern>
- <option name="PATTERN" value="xquery.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
+ <configuration default="false" name="ResourceTest.setContentAsDOM_03" type="JUnit" factoryName="JUnit" temporary="true">
+ <extension name="coverage" enabled="false" merge="false" runner="emma" />
<extension name="snapshooter" />
<module name="eXist" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" value="xquery" />
- <option name="MAIN_CLASS_NAME" value="xquery.CoreTests" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
+ <option name="PACKAGE_NAME" value="org.exist.xmldb" />
+ <option name="MAIN_CLASS_NAME" value="org.exist.xmldb.ResourceTest" />
+ <option name="METHOD_NAME" value="setContentAsDOM_03" />
+ <option name="TEST_OBJECT" value="method" />
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@@ -1185,7 +1089,43 @@
</option>
<envs />
<patterns />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="true" />
+ </RunnerSettings>
<RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
+ <ConfigurationWrapper RunnerId="Run" />
+ <method />
+ </configuration>
+ <configuration default="false" name="ResourceTest.setContentAsDOM_02" type="JUnit" factoryName="JUnit" temporary="true">
+ <extension name="coverage" enabled="false" merge="false" runner="emma" />
+ <extension name="snapshooter" />
+ <module name="eXist" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" value="org.exist.xmldb" />
+ <option name="MAIN_CLASS_NAME" value="org.exist.xmldb.ResourceTest" />
+ <option name="METHOD_NAME" value="setContentAsDOM_02" />
+ <option name="TEST_OBJECT" value="method" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ <envs />
+ <patterns />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="true" />
+ </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
@@ -1197,24 +1137,6 @@
<option name="PORT" value="5005" />
<method />
</configuration>
- <configuration default="true" type="XSLT" factoryName="XSLT">
- <option name="myOutputFile" />
- <option name="myOpenOutputFile" value="false" />
- <option name="myOpenInBrowser" value="false" />
- <option name="mySmartErrorHandling" value="true" />
- <option name="myRunnerPort" value="34873" />
- <option name="myVmArguments" />
- <option name="myWorkingDirectory" />
- <option name="myModule" />
- <option name="myJdk" />
- <parameters />
- <OutputType value="CONSOLE" save-to-file="false" />
- <FileType name="XML" />
- <JdkChoice value="FROM_MODULE" />
- <method>
- <option name="Make" enabled="false" />
- </method>
- </configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -1314,7 +1236,7 @@
<configuration default="false" name="Server" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" runner="emma" />
<option name="MAIN_CLASS_NAME" value="org.exist.start.Main" />
- <option name="VM_PARAMETERS" value="-Dexist.home=$PROJECT_DIR$/../eXist-1.3 -Xmx128m" />
+ <option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="jetty" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -1460,7 +1382,7 @@
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
- <list size="12">
+ <list size="13">
<item index="0" class="java.lang.String" itemvalue="Application.RetrieveChunked" />
<item index="1" class="java.lang.String" itemvalue="Application.eXist Client" />
<item index="2" class="java.lang.String" itemvalue="Application.Server" />
@@ -1469,11 +1391,20 @@
<item index="5" class="java.lang.String" itemvalue="JUnit.DtdEntityTest" />
<item index="6" class="java.lang.String" itemvalue="JUnit.AntUnitTestRunner" />
<item index="7" class="java.lang.String" itemvalue="JUnit.ONVDLTest" />
- <item index="8" class="java.lang.String" itemvalue="JUnit.XMLCalabashTests" />
- <item index="9" class="java.lang.String" itemvalue="JUnit.DateTests" />
- <item index="10" class="java.lang.String" itemvalue="JUnit.UtilTests" />
- <item index="11" class="java.lang.String" itemvalue="JUnit.CoreTests" />
+ <item index="8" class="java.lang.String" itemvalue="JUnit.CoreTests" />
+ <item index="9" class="java.lang.String" itemvalue="JUnit.ResourceTest.setContentAsDOM_1" />
+ <item index="10" class="java.lang.String" itemvalue="JUnit.ResourceTest.setContentAsDOM_01" />
+ <item index="11" class="java.lang.String" itemvalue="JUnit.ResourceTest.setContentAsDOM_03" />
+ <item index="12" class="java.lang.String" itemvalue="JUnit.ResourceTest.setContentAsDOM_02" />
</list>
+ <recent_temporary>
+ <list size="4">
+ <item index="0" class="java.lang.String" itemvalue="JUnit.ResourceTest.setContentAsDOM_02" />
+ <item index="1" class="java.lang.String" itemvalue="JUnit.ResourceTest.setContentAsDOM_01" />
+ <item index="2" class="java.lang.String" itemvalue="JUnit.ResourceTest.setContentAsDOM_03" />
+ <item index="3" class="java.lang.String" itemvalue="JUnit.ResourceTest.setContentAsDOM_1" />
+ </list>
+ </recent_temporary>
<configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
<Host>localhost</Host>
<Port>5050</Port>
@@ -1682,6 +1613,11 @@
</subPane>
</component>
<component name="ShelveChangesManager" show_recycled="false" />
+ <component name="SliceManager">
+ <option name="analysisUIOptions">
+ <AnalysisUIOptions />
+ </option>
+ </component>
<component name="StarteamConfiguration">
<option name="SERVER" value="" />
<option name="PORT" value="49201" />
@@ -1720,7 +1656,7 @@
<option name="USE_PROJECT_SETTINGS" value="true" />
<option name="USE_ALTERNATE_LOCATION" value="false" />
</component>
- <component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="true">
+ <component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="true" SSL_PROTOCOLS="sslv3">
<option name="USER" value="" />
<option name="PASSWORD" value="" />
<option name="mySSHConnectionTimeout" value="30000" />
@@ -1730,7 +1666,6 @@
<option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
<option name="UPDATE_LOCK_ON_DEMAND" value="false" />
<option name="IGNORE_SPACES_IN_MERGE" value="false" />
- <option name="DETECT_NESTED_COPIES" value="true" />
<option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
<option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
<option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
@@ -1801,46 +1736,47 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="12" y="22" width="1920" height="1114" extended-state="0" />
+ <frame x="0" y="0" width="1280" height="800" extended-state="0" />
<editor active="true" />
<layout>
- <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.49469495" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
- <window_info id="JetGradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.494302" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.334004" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19141914" sideWeight="0.6141141" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="SBT Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24346076" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" x="2" y="25" width="822" height="573" />
+ <window_info id="SBT Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.37037036" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" x="2" y="25" width="822" height="573" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.32963374" sideWeight="0.5" order="19" side_tool="false" content_ui="tabs" x="4" y="2" width="968" height="391" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3443435" sideWeight="0.59375" order="3" side_tool="true" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3753754" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.42655936" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.37464386" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.42592594" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.35135135" sideWeight="0.0" order="11" side_tool="false" content_ui="tabs" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2318376" sideWeight="0.66599596" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23176661" sideWeight="0.5740741" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39780018" sideWeight="0.80755395" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20352565" sideWeight="0.7565392" order="0" side_tool="false" content_ui="combo" x="72" y="49" width="451" height="485" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38128772" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32333875" sideWeight="0.505698" order="0" side_tool="false" content_ui="combo" x="72" y="49" width="451" height="485" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3803419" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Problems" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" />
+ <window_info id="Ant Build" active="false" anchor="right" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19141914" sideWeight="0.6141141" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Color Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Maven projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Log4jMonitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5105634" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+ <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496523" sideWeight="0.6514132" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24959481" sideWeight="0.6514132" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.102658115" sideWeight="0.28521127" order="9" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="SVN Properties" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33453238" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+ <window_info id="SVN Properties" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.33333334" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+ <window_info id="JetGradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.334004" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="TeamCity" active="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53518516" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="18" side_tool="false" content_ui="tabs" />
+ <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39780018" sideWeight="0.80755395" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="18" side_tool="false" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22082585" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
<window_info id="Web Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32570422" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Duplicates" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" />
@@ -1881,7 +1817,7 @@
<option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
<option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
<option name="DEFAULT_PATCH_EXTENSION" value="patch" />
- <option name="SHORT_DIFF_HORISONTALLY" value="true" />
+ <option name="SHORT_DIFF_HORIZONTALLY" value="true" />
<option name="SHORT_DIFF_EXTRA_LINES" value="2" />
<option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
<option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
@@ -1891,9 +1827,13 @@
<option name="SHOW_DIRTY_RECURSIVELY" value="false" />
<option name="LIMIT_HISTORY" value="true" />
<option name="MAXIMUM_HISTORY_ROWS" value="1000" />
+ <option name="UPDATE_FILTER_SCOPE_NAME" />
+ <option name="USE_COMMIT_MESSAGE_MARGIN" value="false" />
+ <option name="COMMIT_MESSAGE_MARGIN_SIZE" value="72" />
+ <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="[bugfix] dont allow the same manager to be added to a group more than once" />
+ <option name="LAST_COMMIT_MESSAGE" value="[ignore] update idea project" />
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -1904,13 +1844,9 @@
<option name="ACTIVE_VCS_NAME" value="svn" />
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
<option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
+ <option name="UPDATE_FILTER_BY_SCOPE" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
- <MESSAGE value="[fixed] introduced path bug in repo package manager, fixed" />
- <MESSAGE value="[fixed] introduced multiple math jar bug in example package, fixed" />
- <MESSAGE value="[fixed] decided to remove repo metadata from expath package for now" />
- <MESSAGE value="[repo] repo admin ui now dependent on compression module, will ask exist-dev if we can enable this by default" />
- <MESSAGE value="[repo] corrected package author for math extension" />
<MESSAGE value="[repo] added to repo docs that compression module is now required and needs to be enabled via conf.xml" />
<MESSAGE value="[repo] tweaking public repository ui" />
<MESSAGE value="[repo] added docs for public repository and graphic" />
@@ -1929,8 +1865,13 @@
<MESSAGE value="[repo] adding missing image" />
<MESSAGE value="[repo] added status field to public repo" />
<MESSAGE value="[intellij] .iws had some additional vars defined unrelated to eXist" />
- <MESSAGE value="Revert: [ignore] update idea project" />
<MESSAGE value="[bugfix] dont allow the same manager to be added to a group more than once" />
+ <MESSAGE value="workaround for the xerces's getPrefix()" />
+ <MESSAGE value="Revert: [ignore] update idea project" />
+ <MESSAGE value="[bugfix] workaround for the xerces's getPrefix()" />
+ <MESSAGE value="test" />
+ <MESSAGE value="[feature] Enable compression from the File System via an URI like &quot;file:///...&quot;" />
+ <MESSAGE value="[ignore] update idea project" />
</component>
<component name="VssConfiguration">
<option name="CLIENT_PATH" value="" />
@@ -1977,7 +1918,6 @@
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" />
<buildFile url="file://$PROJECT_DIR$/build.xml">
- <antCommandLine value="" />
<runInBackground value="false" />
<targetFilters>
<filter targetName="all" isVisible="true" />
@@ -2092,36 +2032,25 @@
<filter targetName="XQueryTreeParser" isVisible="false" />
</targetFilters>
<treeView value="false" />
- <verbose value="true" />
<viewClosedWhenNoErrors value="true" />
<expanded value="true" />
</buildFile>
<buildFile url="file://$PROJECT_DIR$/test/src/ant/build.xml">
- <antCommandLine value="" />
- <runInBackground value="true" />
<targetFilters>
<filter targetName="alltests" isVisible="false" />
<filter targetName="run" isVisible="false" />
<filter targetName="setup" isVisible="false" />
<filter targetName="teardown" isVisible="false" />
</targetFilters>
- <treeView value="true" />
- <verbose value="true" />
- <viewClosedWhenNoErrors value="false" />
<expanded value="true" />
</buildFile>
<buildFile url="file://$PROJECT_DIR$/extensions/xprocxq/main/build.xml">
- <antCommandLine value="" />
- <runInBackground value="true" />
<targetFilters>
<filter targetName="clean" isVisible="false" />
<filter targetName="dist" isVisible="false" />
<filter targetName="exist-jar" isVisible="false" />
<filter targetName="get-w3c-artifacts" isVisible="true" />
</targetFilters>
- <treeView value="true" />
- <verbose value="true" />
- <viewClosedWhenNoErrors value="false" />
<expanded value="true" />
</buildFile>
</component>
@@ -2136,126 +2065,104 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/org/exist/util/serializer/SAXSerializer.java">
+ <entry file="jar://$PROJECT_DIR$/lib/core/xmldb.jar!/org/xmldb/api/base/Resource.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="48" column="37" selection-start="1883" selection-end="1883" vertical-scroll-proportion="-9.32">
- <folding>
- <element signature="e#0#21416#0" expanded="true" />
- <element signature="e#2721#2737#0" expanded="true" />
- <element signature="e#2815#2831#0" expanded="true" />
- </folding>
- </state>
+ <state line="13" column="21" selection-start="450" selection-end="450" vertical-scroll-proportion="0.29850745" />
</provider>
</entry>
- <entry file="jar:///Library/Java/JavaVirtualMachines/1.6.0_29-b11-402.jdk/Contents/Home/src.jar!/src/java/lang/CharSequence.java">
+ <entry file="file://$PROJECT_DIR$/build/classes/org/exist/collections/triggers/ContentHandlerWrapper.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="21" selection-start="1319" selection-end="1319" vertical-scroll-proportion="0.6008287">
- <folding />
- </state>
+ <state line="13" column="27" selection-start="572" selection-end="583" vertical-scroll-proportion="0.29363784" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/exist/util/serializer/XMLWriter.java">
+ <entry file="file://$PROJECT_DIR$/src/org/exist/util/serializer/DOMStreamer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="114" column="76" selection-start="3644" selection-end="3644" vertical-scroll-proportion="0.0">
+ <state line="61" column="31" selection-start="2156" selection-end="2156" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/exist/util/serializer/MicroXmlWriter.java">
+ <entry file="file://$PROJECT_DIR$/src/org/exist/storage/serializers/NativeSerializer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="153" column="0" selection-start="4903" selection-end="4903" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="e#0#5038#0" expanded="true" />
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="57" column="13" selection-start="1949" selection-end="1949" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/exist/xquery/functions/securitymanager/SecurityManagerModule.java">
+ <entry file="file://$PROJECT_DIR$/src/org/exist/util/serializer/DOMSerializer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="90" column="44" selection-start="5674" selection-end="5674" vertical-scroll-proportion="0.0">
+ <state line="48" column="36" selection-start="1747" selection-end="1747" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/exist/xmldb/UserManagementService.java">
+ <entry file="file://$PROJECT_DIR$/extensions/modules/src/org/exist/xquery/modules/compression/UnZipFunction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="22" column="17" selection-start="699" selection-end="699" vertical-scroll-proportion="0.24861878">
+ <state line="95" column="129" selection-start="5036" selection-end="5036" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/exist/xquery/functions/securitymanager/FindGroupFunction.java">
+ <entry file="file://$PROJECT_DIR$/src/org/exist/memtree/DocumentBuilderReceiver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="42" selection-start="2692" selection-end="2692" vertical-scroll-proportion="0.34379458">
+ <state line="42" column="34" selection-start="1494" selection-end="1494" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/src/org/exist/security/XMLDBSecurityTest.java">
+ <entry file="file://$PROJECT_DIR$/src/org/exist/xquery/functions/transform/Transform.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="26" column="13" selection-start="910" selection-end="910" vertical-scroll-proportion="0.0">
+ <state line="8" column="13" selection-start="335" selection-end="335" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/exist/security/Permission.java">
+ <entry file="jar:///System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/classes.jar!/org/xml/sax/ContentHandler.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="149" column="16" selection-start="4358" selection-end="4358" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="15" column="33" selection-start="486" selection-end="486" vertical-scroll-proportion="0.36585367" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/exist/xmldb/LocalUserManagementService.java">
+ <entry file="file://$PROJECT_DIR$/src/org/exist/memtree/MemTreeBuilder.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="176" column="44" selection-start="7134" selection-end="7134" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="e#5725#6071#0" expanded="true" />
- <element signature="e#6048#6049#0" expanded="true" />
- </folding>
+ <state line="43" column="13" selection-start="1386" selection-end="1386" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/exist/security/UnixStylePermission.java">
+ <entry file="file://$PROJECT_DIR$/src/org/exist/storage/serializers/Serializer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="130" column="38" selection-start="4335" selection-end="4335" vertical-scroll-proportion="0.0">
+ <state line="116" column="22" selection-start="4619" selection-end="4619" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/exist/dom/DocumentImpl.java">
+ <entry file="file://$PROJECT_DIR$/test/src/org/exist/xmldb/SerializationTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="261" column="5" selection-start="7239" selection-end="7364" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="74" column="20" selection-start="2715" selection-end="2715" vertical-scroll-proportion="0.1645768" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/exist/security/SimpleACLPermission.java">
+ <entry file="file://$PROJECT_DIR$/eXist.ipr">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="13" selection-start="1544" selection-end="1544" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="393" column="27" selection-start="20774" selection-end="20774" vertical-scroll-proportion="0.106583074" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/exist/xquery/functions/xmldb/XMLDBSetCollectionPermissions.java">
+ <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
- <state line="22" column="0" selection-start="992" selection-end="992" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/exist/collections/Collection.java">
+ <entry file="file://$PROJECT_DIR$/extensions/modules/src/org/exist/xquery/modules/compression/AbstractExtractFunction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1980" column="56" selection-start="82135" selection-end="82135" vertical-scroll-proportion="0.0">
+ <state line="174" column="21" selection-start="7107" selection-end="7107" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/org/exist/xquery/functions/xmldb/XMLDBSetResourcePermissions.java">
+ <entry file="file://$PROJECT_DIR$/eXist.iws">
<provider selected="true" editor-type-id="text-editor">
- <state line="119" column="13" selection-start="5629" selection-end="5629" vertical-scroll-proportion="0.80360067">
+ <state line="2099" column="30" selection-start="110963" selection-end="110963" vertical-scroll-proportion="0.28384992">
<folding />
</state>
</provider>
@@ -2277,7 +2184,7 @@
</state>
<state key="FacetStructureConfigurable.UI">
<settings>
- <last-edited>No facets are configured</last-edited>
+ <last-edited>Detection</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
@@ -2289,7 +2196,7 @@
</state>
<state key="GlobalLibrariesConfigurable.UI">
<settings>
- <last-edited>[gem] xmpp4r (v0.4, /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/gems/1.8/gems/xmpp4r-0.4)</last-edited>
+ <last-edited>jQuery-1.9.1</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
@@ -2318,14 +2225,15 @@
<option name="proportions">
<list>
<option value="0.2" />
+ <option value="0.5" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
- <last-edited>user</last-edited>
+ <last-edited>endorsed</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
View
2 extensions/betterform/build.xml