diff --git a/community/server/pom.xml b/community/server/pom.xml
index 8f728f8a45add..292bb208d165f 100644
--- a/community/server/pom.xml
+++ b/community/server/pom.xml
@@ -507,52 +507,6 @@
-
- maven-antrun-plugin
- 1.7
-
-
-
- generate-source-based-documentation
- process-classes
-
-
-
-
-
-
-
-
- run
-
-
-
-
-
- ant-contrib
- ant-contrib
- 1.0b3
-
-
- ant
- ant
-
-
-
-
- org.apache.ant
- ant
- 1.8.2
-
-
- org.apache.ant
- ant-apache-regexp
- 1.8.2
-
-
-
-
diff --git a/manual/contents/pom.xml b/manual/contents/pom.xml
index f88ee3699a04a..473aea548d818 100644
--- a/manual/contents/pom.xml
+++ b/manual/contents/pom.xml
@@ -168,8 +168,15 @@
provided
- org.neo4j.app
- neo4j-server
+ org.neo4j.doc
+ neo4j-server-docs
+ ${neo4j.version}
+ docs
+ provided
+
+
+ org.neo4j.doc
+ neo4j-server-docs
${neo4j.version}
test-sources
provided
@@ -342,7 +349,7 @@
META-INF,META-INF/**,org/neo4j/kernel/impl/storemigration/legacystore/**
jar
${docs.test-sources}
- neo4j-cypher-docs,neo4j-examples,neo4j-harness-test,neo4j-server,neo4j-lucene-index-docs,neo4j-backup-docs,neo4j-kernel-docs
+ neo4j-cypher-docs,neo4j-examples,neo4j-harness-test,neo4j-server,neo4j-server-docs,neo4j-lucene-index-docs,neo4j-backup-docs,neo4j-kernel-docs
diff --git a/manual/contents/src/reference/index.asciidoc b/manual/contents/src/reference/index.asciidoc
index 23c5e68a4b066..671fa802b6188 100644
--- a/manual/contents/src/reference/index.asciidoc
+++ b/manual/contents/src/reference/index.asciidoc
@@ -21,7 +21,7 @@ include::import/import.asciidoc[]
:leveloffset: 1
-include::{importdir}/neo4j-server-docs-jar/dev/rest-api/index.asciidoc[]
+include::{importdir}/neo4j-server-docs-docs-jar/dev/rest-api/index.asciidoc[]
:leveloffset: 1
diff --git a/manual/pom.xml b/manual/pom.xml
index 0f990373b56ee..1def7974b4891 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -28,6 +28,7 @@
server-examples
bolt
import-tool
+ server-docs
shell
kernel
lucene
diff --git a/manual/server-docs/LICENSES.txt b/manual/server-docs/LICENSES.txt
new file mode 100644
index 0000000000000..8c351519aba76
--- /dev/null
+++ b/manual/server-docs/LICENSES.txt
@@ -0,0 +1,216 @@
+This file contains the full license text of the included third party
+libraries. For an overview of the licenses see the NOTICE.txt file.
+
+------------------------------------------------------------------------------
+Apache Software License, Version 2.0
+ Apache Commons Configuration
+ Commons BeanUtils
+ Commons Digester
+ Commons Lang
+ Commons Logging
+------------------------------------------------------------------------------
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+
diff --git a/manual/server-docs/NOTICE.txt b/manual/server-docs/NOTICE.txt
new file mode 100644
index 0000000000000..e38637c77c364
--- /dev/null
+++ b/manual/server-docs/NOTICE.txt
@@ -0,0 +1,34 @@
+Neo4j
+Copyright © 2002-2016 Network Engine for Objects in Lund AB (referred to
+in this notice as "Neo Technology")
+ [http://neotechnology.com]
+
+This product includes software ("Software") developed by Neo Technology.
+
+The copyright in the bundled Neo4j graph database (including the
+Software) is owned by Neo Technology. The Software developed and owned
+by Neo Technology is licensed under the GNU GENERAL PUBLIC LICENSE
+Version 3 (http://www.fsf.org/licensing/licenses/gpl-3.0.html) ("GPL")
+to all third parties and that license, as required by the GPL, is
+included in the LICENSE.txt file.
+
+However, if you have executed an End User Software License and Services
+Agreement or an OEM Software License and Support Services Agreement, or
+another commercial license agreement with Neo Technology or one of its
+affiliates (each, a "Commercial Agreement"), the terms of the license in
+such Commercial Agreement will supersede the GPL and you may use the
+software solely pursuant to the terms of the relevant Commercial
+Agreement.
+
+Full license texts are found in LICENSES.txt.
+
+Third-party licenses
+--------------------
+
+Apache Software License, Version 2.0
+ Apache Commons Configuration
+ Commons BeanUtils
+ Commons Digester
+ Commons Lang
+ Commons Logging
+
diff --git a/manual/server-docs/pom.xml b/manual/server-docs/pom.xml
new file mode 100644
index 0000000000000..e7fe393788a7a
--- /dev/null
+++ b/manual/server-docs/pom.xml
@@ -0,0 +1,300 @@
+
+
+
+ org.neo4j
+ parent
+ 3.0.7-SNAPSHOT
+ ../..
+
+
+ 4.0.0
+ org.neo4j.doc
+ neo4j-server-docs
+ 3.0.7-SNAPSHOT
+ Neo4j - Server Docs
+ Documentation for the Neo4j server
+
+
+ org.neo4j.server
+ server
+ server.impl
+ GPL-3-header.txt
+ notice-gpl-prefix.txt
+ true
+
+ ${project.version}
+ 1.1.8
+
+ org.neo4j.server.CommunityEntryPoint
+ target/generated-resources/appassembler/jsw
+ target/test-classes/etc/neo-server
+
+ 3.0.2
+ ${project.build.directory}
+
+
+ false
+ http://localhost:7474
+
+ 2.42.2
+ Firefox
+
+
+ webdriver-binaries/chromedriver
+ http://chromedriver.googlecode.com/files/chromedriver_mac_23.0.1240.0.zip
+
+ **Needs to provided externally by the CI job for security reasons**
+
+
+
+
+
+
+
+
+
+ org.apache.httpcomponents
+ httpclient
+ test
+ 4.3.4
+
+
+
+ org.apache.httpcomponents
+ httpcore
+ test
+ 4.3.2
+
+
+
+
+
+
+ org.neo4j.app
+ neo4j-server
+ ${project.version}
+ test
+
+
+
+ org.neo4j.app
+ neo4j-server-enterprise
+ ${project.version}
+ test
+
+
+
+
+ com.sun.jersey
+ jersey-client
+ test
+
+
+
+ com.google.code.gson
+ gson
+ test
+
+
+
+ org.apache.httpcomponents
+ httpclient
+ test
+
+
+
+ org.apache.httpcomponents
+ httpcore
+ test
+
+
+
+ org.neo4j
+ neo4j-graphviz
+ ${project.version}
+ test
+
+
+
+ org.neo4j
+ neo4j-kernel
+ ${project.version}
+ test-jar
+ test
+
+
+
+ org.neo4j
+ neo4j-logging
+ ${project.version}
+ test-jar
+ test
+
+
+
+ org.neo4j
+ neo4j-io
+ ${project.version}
+ test-jar
+ test
+
+
+
+ junit
+ junit
+ test
+
+
+ org.hamcrest
+ hamcrest-core
+ test
+
+
+ org.hamcrest
+ hamcrest-library
+ test
+
+
+ org.mockito
+ mockito-core
+ test
+
+
+
+ org.json
+ json
+ 20090211
+ test
+
+
+
+ org.neo4j.doc
+ neo4j-doc-tools
+ ${project.version}
+ test
+ test-jar
+
+
+
+
+
+
+
+ maven-antrun-plugin
+ 1.7
+
+
+
+ generate-source-based-documentation
+ process-test-classes
+
+
+
+
+
+
+
+
+ run
+
+
+
+
+
+ ant-contrib
+ ant-contrib
+ 1.0b3
+
+
+ ant
+ ant
+
+
+
+
+ org.apache.ant
+ ant
+ 1.8.2
+
+
+ org.apache.ant
+ ant-apache-regexp
+ 1.8.2
+
+
+
+
+
+
+
+
+ surefire-windows
+
+
+ windows
+
+
+
+
+
+ maven-surefire-plugin
+
+ always
+
+
+
+
+
+
+ all-tests
+
+
+ tests
+ all
+
+
+
+
+
+
+
+ java.net
+ http://download.java.net/maven/2/
+
+
+ selenium-repository
+ http://selenium.googlecode.com/svn/repository
+
+
+ neo4j-release-repository
+ Neo4j Maven 2 release repository
+ http://m2.neo4j.org/content/repositories/releases
+
+ true
+
+
+ false
+
+
+
+ neo4j-snapshot-repository
+ Neo4j Maven 2 snapshot repository
+ http://m2.neo4j.org/content/repositories/snapshots
+
+ true
+
+
+ false
+
+
+
+
+
+
+ jsdoctk2
+ http://jsdoctk-plugin.googlecode.com/svn/repo
+
+
+
+
diff --git a/community/server/src/docs/dev/images/batch-request-api.png b/manual/server-docs/src/docs/dev/images/batch-request-api.png
similarity index 100%
rename from community/server/src/docs/dev/images/batch-request-api.png
rename to manual/server-docs/src/docs/dev/images/batch-request-api.png
diff --git a/community/server/src/docs/dev/rest-api/batch-operations.asciidoc b/manual/server-docs/src/docs/dev/rest-api/batch-operations.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/batch-operations.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/batch-operations.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/constraints.asciidoc b/manual/server-docs/src/docs/dev/rest-api/constraints.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/constraints.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/constraints.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/cypher.asciidoc b/manual/server-docs/src/docs/dev/rest-api/cypher.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/cypher.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/cypher.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/graph-algos.asciidoc b/manual/server-docs/src/docs/dev/rest-api/graph-algos.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/graph-algos.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/graph-algos.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/index.asciidoc b/manual/server-docs/src/docs/dev/rest-api/index.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/index.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/index.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/indexes-unique.asciidoc b/manual/server-docs/src/docs/dev/rest-api/indexes-unique.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/indexes-unique.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/indexes-unique.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/indexes.asciidoc b/manual/server-docs/src/docs/dev/rest-api/indexes.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/indexes.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/indexes.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/introduction.asciidoc b/manual/server-docs/src/docs/dev/rest-api/introduction.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/introduction.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/introduction.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/legacy-indexes.asciidoc b/manual/server-docs/src/docs/dev/rest-api/legacy-indexes.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/legacy-indexes.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/legacy-indexes.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/node-degree.asciidoc b/manual/server-docs/src/docs/dev/rest-api/node-degree.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/node-degree.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/node-degree.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/node-labels.asciidoc b/manual/server-docs/src/docs/dev/rest-api/node-labels.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/node-labels.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/node-labels.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/node-properties.asciidoc b/manual/server-docs/src/docs/dev/rest-api/node-properties.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/node-properties.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/node-properties.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/nodes.asciidoc b/manual/server-docs/src/docs/dev/rest-api/nodes.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/nodes.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/nodes.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/properties.asciidoc b/manual/server-docs/src/docs/dev/rest-api/properties.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/properties.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/properties.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/relationship-properties.asciidoc b/manual/server-docs/src/docs/dev/rest-api/relationship-properties.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/relationship-properties.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/relationship-properties.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/relationship-types.asciidoc b/manual/server-docs/src/docs/dev/rest-api/relationship-types.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/relationship-types.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/relationship-types.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/relationships.asciidoc b/manual/server-docs/src/docs/dev/rest-api/relationships.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/relationships.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/relationships.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/security.asciidoc b/manual/server-docs/src/docs/dev/rest-api/security.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/security.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/security.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/service-root.asciidoc b/manual/server-docs/src/docs/dev/rest-api/service-root.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/service-root.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/service-root.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/transactional-status-codes.asciidoc b/manual/server-docs/src/docs/dev/rest-api/transactional-status-codes.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/transactional-status-codes.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/transactional-status-codes.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/transactional.asciidoc b/manual/server-docs/src/docs/dev/rest-api/transactional.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/transactional.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/transactional.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/traversals.asciidoc b/manual/server-docs/src/docs/dev/rest-api/traversals.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/traversals.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/traversals.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/wadl.asciidoc b/manual/server-docs/src/docs/dev/rest-api/wadl.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/wadl.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/wadl.asciidoc
diff --git a/community/server/src/docs/dev/rest-api/weblogic.asciidoc b/manual/server-docs/src/docs/dev/rest-api/weblogic.asciidoc
similarity index 100%
rename from community/server/src/docs/dev/rest-api/weblogic.asciidoc
rename to manual/server-docs/src/docs/dev/rest-api/weblogic.asciidoc
diff --git a/manual/server-docs/src/test/java/org/dummy/web/service/DummyPluginInitializer.java b/manual/server-docs/src/test/java/org/dummy/web/service/DummyPluginInitializer.java
new file mode 100644
index 0000000000000..9eeeedba8c5c4
--- /dev/null
+++ b/manual/server-docs/src/test/java/org/dummy/web/service/DummyPluginInitializer.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2002-2016 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package org.dummy.web.service;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.apache.commons.configuration.Configuration;
+import org.neo4j.graphdb.GraphDatabaseService;
+import org.neo4j.server.plugins.Injectable;
+import org.neo4j.server.plugins.PluginLifecycle;
+
+public class DummyPluginInitializer implements PluginLifecycle
+{
+ public DummyPluginInitializer()
+ {
+ }
+
+ @Override
+ public Collection> start( GraphDatabaseService graphDatabaseService, Configuration config )
+ {
+ return Collections.>singleton( new Injectable()
+ {
+ @Override
+ public Long getValue()
+ {
+ return 42L;
+
+ }
+
+ @Override
+ public Class getType()
+ {
+ return Long.class;
+ }
+ } );
+ }
+
+ @Override
+ public void stop()
+ {
+ }
+}
diff --git a/manual/server-docs/src/test/java/org/dummy/web/service/DummyThirdPartyWebService.java b/manual/server-docs/src/test/java/org/dummy/web/service/DummyThirdPartyWebService.java
new file mode 100644
index 0000000000000..c23893e720d0b
--- /dev/null
+++ b/manual/server-docs/src/test/java/org/dummy/web/service/DummyThirdPartyWebService.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2002-2016 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package org.dummy.web.service;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.neo4j.graphdb.GraphDatabaseService;
+import org.neo4j.graphdb.Node;
+import org.neo4j.graphdb.Transaction;
+
+@Path( "/" )
+public class DummyThirdPartyWebService
+{
+
+ public static final String DUMMY_WEB_SERVICE_MOUNT_POINT = "/dummy";
+
+ @GET
+ @Produces( MediaType.TEXT_PLAIN )
+ public Response sayHello()
+ {
+ return Response.ok()
+ .entity( "hello" )
+ .build();
+ }
+
+
+ @GET
+ @Path("/{something}/{somethingElse}")
+ @Produces( MediaType.TEXT_PLAIN )
+ public Response forSecurityTesting() {
+ return Response.ok().entity("you've reached a dummy service").build();
+ }
+
+ @GET
+ @Path( "inject-test" )
+ @Produces( MediaType.TEXT_PLAIN )
+ public Response countNodes( @Context GraphDatabaseService db )
+ {
+ try (Transaction transaction = db.beginTx())
+ {
+ return Response.ok()
+ .entity( String.valueOf( countNodesIn( db ) ) )
+ .build();
+ }
+ }
+
+ @GET
+ @Path( "needs-auth-header" )
+ @Produces( MediaType.APPLICATION_JSON )
+ public Response authHeader( @Context HttpHeaders headers )
+ {
+ StringBuilder theEntity = new StringBuilder( "{" );
+ Iterator>> headerIt = headers.getRequestHeaders().entrySet().iterator();
+ while ( headerIt.hasNext() )
+ {
+ Map.Entry> header = headerIt.next();
+ if (header.getValue().size() != 1)
+ {
+ throw new IllegalArgumentException( "Mutlivalued header: "
+ + header.getKey() );
+ }
+ theEntity.append( "\"" ).append( header.getKey() ).append( "\":\"" )
+ .append( header.getValue().get( 0 ) ).append( "\"" );
+ if ( headerIt.hasNext() )
+ {
+ theEntity.append( ", " );
+ }
+ }
+ theEntity.append( "}" );
+ return Response.ok().entity( theEntity.toString() ).build();
+ }
+
+ private int countNodesIn( GraphDatabaseService db )
+ {
+ int count = 0;
+ for ( @SuppressWarnings("unused") Node node : db.getAllNodes() )
+ {
+ count++;
+ }
+ return count;
+ }
+}
diff --git a/manual/server-docs/src/test/java/org/neo4j/server/BatchOperationHeaderDocIT.java b/manual/server-docs/src/test/java/org/neo4j/server/BatchOperationHeaderDocIT.java
new file mode 100644
index 0000000000000..de9346d832d35
--- /dev/null
+++ b/manual/server-docs/src/test/java/org/neo4j/server/BatchOperationHeaderDocIT.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2002-2016 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package org.neo4j.server;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import org.neo4j.server.rest.JaxRsResponse;
+import org.neo4j.server.rest.PrettyJSON;
+import org.neo4j.server.rest.RestRequest;
+import org.neo4j.test.server.ExclusiveServerTestBase;
+
+import static org.dummy.web.service.DummyThirdPartyWebService.DUMMY_WEB_SERVICE_MOUNT_POINT;
+import static org.junit.Assert.assertEquals;
+
+import static org.neo4j.server.helpers.CommunityServerBuilder.server;
+import static org.neo4j.server.rest.domain.JsonHelper.jsonToList;
+
+public class BatchOperationHeaderDocIT extends ExclusiveServerTestBase
+{
+ private NeoServer server;
+
+ @Rule
+ public TemporaryFolder folder = new TemporaryFolder();
+
+ @Before
+ public void cleanTheDatabase() throws IOException
+ {
+ server = server().withThirdPartyJaxRsPackage( "org.dummy.web.service",
+ DUMMY_WEB_SERVICE_MOUNT_POINT ).usingDataDir( folder.getRoot().getAbsolutePath() ).build();
+ server.start();
+ }
+
+ @After
+ public void stopServer()
+ {
+ if ( server != null )
+ {
+ server.stop();
+ }
+ }
+
+ @Test
+ public void shouldPassHeaders() throws Exception
+ {
+ String jsonData = new PrettyJSON()
+ .array()
+ .object()
+ .key( "method" ).value( "GET" )
+ .key( "to" ).value( "../.." + DUMMY_WEB_SERVICE_MOUNT_POINT + "/needs-auth-header" )
+ .key( "body" ).object().endObject()
+ .endObject()
+ .endArray()
+ .toString();
+
+ JaxRsResponse response = new RestRequest( null, "user", "pass" )
+ .post( "http://localhost:7474/db/data/batch", jsonData );
+
+ assertEquals( 200, response.getStatus() );
+
+ final List