Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:gentics/mesh into dev-versioning-gra…
Browse files Browse the repository at this point in the history
…phql
  • Loading branch information
Johannes Schüth committed Mar 27, 2017
2 parents b3039c8 + 63cd7af commit 70e8fcd
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 5 deletions.
16 changes: 15 additions & 1 deletion CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ New structure:
----
____

== 0.7.0 (SNAPSHOT)
== 0.7.0

icon:bullhorn[] Content releases support

Expand Down Expand Up @@ -155,6 +155,20 @@ icon:check[] The search index mapping of fields of type "list" were incorrect an

icon:check[] Various issues with the schema node migration process have been fixed.

== 0.6.29 (07.03.2017)

icon:plus[] The documentation has been enhanced.

icon:check[] Missing fields could cause error responses. Instead the missing fields will now be set to null instead.

== 0.6.28 (21.10.2016)

icon:check[] Missing fields could cause error responses. Instead the missing fields will now be set to null instead.

== 0.6.27 (07.10.2016)

icon:check[] Various issues with the schema node migration process have been fixed.

== 0.6.26 (05.10.2016)

icon:plus[] The maximum transformation depth limit was raised from 2 to 3.
Expand Down
2 changes: 2 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ node('dockerRoot') {
stage("Docker Build") {
if (Boolean.valueOf(runDocker)) {
withEnv(["DOCKER_HOST=" + dockerHost ]) {
sh "rm demo/target/*sources.jar"
sh "rm server/target/*sources.jar"
sh "captain build"
}
} else {
Expand Down
50 changes: 50 additions & 0 deletions doc/src/main/docs/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -1709,6 +1709,56 @@ The mesh-ui can be configured using the mesh-ui-config.js file.
The mesh ui will provide a preview button when editing nodes. A post request to a configureable url is being dispatchen when the button will be triggered.
The post request will contain the node JSON data of the current editing state. This way a preview page can be easily rendered by custom frontend implementations.

== JAVA REST client

You can add the following maven dependency and repository to your project to get the mesh rest client.

[source,xml]
----
<dependency>
<artifactId>mesh-rest-client</artifactId>
<groupId>com.gentics.mesh</groupId>
<version>${mesh.version}</version>
</dependency>
<repositories>
<repository>
<id>maven.gentics.com</id>
<name>Gentics Maven Repository</name>
<url>https://maven.gentics.com/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
----

Usage:

[source,java]
----
MeshRestClient client = MeshRestClient.create("localhost", 8080, vertx, BASIC_AUTH);
client.setLogin("username", "password");
client.login().toCompletable().await();
client.findNodes("demo", new NodeRequestParameter().setExpandAll(true).setLanguages("en")).setHandler(rh -> {
if (rh.succeeded()) {
NodeListResponse list = rh.result();
for(NodeResponse nodeResponse : list.getData()) {
System.out.println(nodeResponse.getUuid());
System.out.println(nodeResponse.getFields().getStringField("name").getString());
}
} else {
rh.cause().printStackTrace();
}
});
----

== License

* Gentics Mesh is published under a commercial license. http://getmesh.io/Terms[License Terms]
Expand Down
4 changes: 0 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,6 @@
</excludes>
</configuration>
</plugin>
<!-- <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> <version>1.4.0</version> <executions> <execution> <goals> <goal>check</goal> </goals> </execution>
</executions> </plugin> -->
</plugins>
</build>

Expand All @@ -267,8 +265,6 @@
<enabled>true</enabled>
</snapshots>
</repository>
<!-- <repository> <id>sonatype-nexus-snapshots</id> <name>Sonatype Nexus Snapshots</name> <url>https://oss.sonatype.org/content/repositories/snapshots</url> <snapshots> <enabled>true</enabled>
</snapshots> </repository> -->
</repositories>

<pluginRepositories>
Expand Down

0 comments on commit 70e8fcd

Please sign in to comment.