You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by st...@apache.org on 2016/05/11 16:04:03 UTC
incubator-johnzon git commit: fix site build for new maven versions
Repository: incubator-johnzon
Updated Branches:
refs/heads/master d75e94d45 -> a126a080d
fix site build for new maven versions
and whoops, should be a snapshot version of course
Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/a126a080
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/a126a080
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/a126a080
Branch: refs/heads/master
Commit: a126a080d9f69786f32f49eac4f117924577b86e
Parents: d75e94d
Author: Mark Struberg <st...@apache.org>
Authored: Wed May 11 18:01:29 2016 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Wed May 11 18:03:30 2016 +0200
----------------------------------------------------------------------
johnzon-core/pom.xml | 2 +-
johnzon-distribution/pom.xml | 3 +-
johnzon-jaxrs/pom.xml | 2 +-
johnzon-jsonb/pom.xml | 2 +-
johnzon-mapper/pom.xml | 2 +-
johnzon-maven-plugin/pom.xml | 11 +-
johnzon-websocket/pom.xml | 2 +-
jsonb-api/pom.xml | 2 +-
pom.xml | 20 +++-
src/site/markdown/index.md | 194 ++++++++++++++++++++++++++++++++++
src/site/markdown/index.md.vm | 194 ----------------------------------
src/site/markdown/security.md | 39 +++++++
src/site/markdown/security.md.vm | 39 -------
src/site/site.xml | 38 +++----
14 files changed, 280 insertions(+), 270 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a126a080/johnzon-core/pom.xml
----------------------------------------------------------------------
diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml
index b621522..5089c74 100644
--- a/johnzon-core/pom.xml
+++ b/johnzon-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>0.9.4</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a126a080/johnzon-distribution/pom.xml
----------------------------------------------------------------------
diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml
index 8a35723..d7e438c 100644
--- a/johnzon-distribution/pom.xml
+++ b/johnzon-distribution/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>0.9.4</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -224,7 +224,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
<configuration>
<skip>true</skip>
<skipDeploy>true</skipDeploy>
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a126a080/johnzon-jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml
index bb2ec95..30a1294 100644
--- a/johnzon-jaxrs/pom.xml
+++ b/johnzon-jaxrs/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>0.9.4</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a126a080/johnzon-jsonb/pom.xml
----------------------------------------------------------------------
diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml
index 3610001..f0eb2cf 100644
--- a/johnzon-jsonb/pom.xml
+++ b/johnzon-jsonb/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>0.9.4</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a126a080/johnzon-mapper/pom.xml
----------------------------------------------------------------------
diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml
index f2fb7cd..c54a15f 100644
--- a/johnzon-mapper/pom.xml
+++ b/johnzon-mapper/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>0.9.4</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a126a080/johnzon-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml
index b71daa4..b64e60e 100644
--- a/johnzon-maven-plugin/pom.xml
+++ b/johnzon-maven-plugin/pom.xml
@@ -23,13 +23,18 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>0.9.4</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<artifactId>johnzon-maven-plugin</artifactId>
<name>Johnzon :: Maven Plugin</name>
<packaging>maven-plugin</packaging>
+ <properties>
+ <maven.version>3.0.5</maven.version>
+ </properties>
+
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -66,10 +71,6 @@
</dependency>
</dependencies>
- <properties>
- <maven.version>3.0.5</maven.version>
- </properties>
-
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a126a080/johnzon-websocket/pom.xml
----------------------------------------------------------------------
diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml
index 69dded0..b319669 100644
--- a/johnzon-websocket/pom.xml
+++ b/johnzon-websocket/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>0.9.4</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a126a080/jsonb-api/pom.xml
----------------------------------------------------------------------
diff --git a/jsonb-api/pom.xml b/jsonb-api/pom.xml
index c4fa9e2..8c48689 100644
--- a/jsonb-api/pom.xml
+++ b/jsonb-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>johnzon</artifactId>
<groupId>org.apache.johnzon</groupId>
- <version>0.9.4</version>
+ <version>0.9.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a126a080/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6817751..7f5dab8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon</artifactId>
<packaging>pom</packaging>
- <version>0.9.4</version>
+ <version>0.9.4-SNAPSHOT</version>
<name>Apache Johnzon</name>
<description>Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing).</description>
<inceptionYear>2014</inceptionYear>
@@ -150,15 +150,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
+ <version>3.5.1</version>
<configuration>
<stagingDirectory>${staging.directory}</stagingDirectory>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-markdown</artifactId>
- <version>1.3</version>
+ <version>1.7</version>
</dependency>
</dependencies>
</plugin>
@@ -400,6 +405,11 @@
<reporting>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.5.1</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.0</version>
@@ -412,12 +422,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.2</version>
+ <version>3.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9</version>
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a126a080/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
new file mode 100644
index 0000000..d8a2c01
--- /dev/null
+++ b/src/site/markdown/index.md
@@ -0,0 +1,194 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+# Apache Johnzon
+
+Apache Johnzon is a project providing an implementation of JsonProcessing (aka jsr-353) and a set of useful extension
+for this specification like an Object mapper, some JAX-RS providers and a WebSocket module provides a basic integration with Java WebSocket API (JSR 356).
+
+## Status
+
+
+Apache Johnzon is a Top Level Project at the Apache Software Foundation (ASF).
+It fully implements the JSON-P_1.0 specification (JSR-353).
+Johnzon also targets the upcoming JSON-P_1.1 and JSON-B_1.0 specifications.
+
+
+## Get started
+
+Johnzon comes with four main modules.
+
+### Core (stable)
+
+<pre class="prettyprint linenums"><![CDATA[
+<dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-core</artifactId>
+ <version>${project.version}</version>
+</dependency>
+]]></pre>
+
+This is the implementation of the specification. You'll surely want to add the API as dependency too:
+
+<pre class="prettyprint linenums"><![CDATA[
+<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-json_1.0_spec</artifactId>
+ <version>${jsonspecversion}</version>
+ <scope>provided</scope> <!-- or compile if your environment doesn't provide it -->
+</dependency>
+]]></pre>
+
+### Mapper (stable)
+
+<pre class="prettyprint linenums"><![CDATA[
+<dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-mapper</artifactId>
+ <version>${project.version}</version>
+</dependency>
+]]></pre>
+
+The mapper module allows you to use the implementation you want of Json Processing specification to map
+Json to Object and the opposite.
+
+<pre class="prettyprint linenums"><![CDATA[
+final MySuperObject object = createObject();
+
+final Mapper mapper = new MapperBuilder().build();
+mapper.writeObject(object, outputStream);
+
+final MySuperObject otherObject = mapper.readObject(inputStream, MySuperObject.class);
+]]></pre>
+
+### JAX-RS (stable)
+
+<pre class="prettyprint linenums"><![CDATA[
+<dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-jaxrs</artifactId>
+ <version>${project.version}</version>
+</dependency>
+]]></pre>
+
+JAX-RS module provides two providers (and underlying MessageBodyReaders and MessageBodyWriters):
+
+* org.apache.johnzon.jaxrs.[Wildcard]JohnzonProvider: use Johnzon Mapper to map Object to Json and the opposite
+* org.apache.johnzon.jaxrs.[Wildcard]ConfigurableJohnzonProvider: same as JohnzonProvider but with setters to ease the configuration of the provider in most servers/containers
+* org.apache.johnzon.jaxrs.[Wildcard]JsrProvider: allows you to use JsrArray, JsrObject (more generally JsonStructure)
+
+Note: Wildcard providers are basically the same as other provider but instead of application/json they support */json, */*+json, */x-json, */javascript, */x-javascript. This
+split makes it easier to mix json and other MediaType in the same resource (like text/plain, xml etc since JAX-RS API always matches as true wildcard type in some version whatever the subtype is).
+
+### Websocket (beta)
+
+<pre class="prettyprint linenums"><![CDATA[
+<dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-websocket</artifactId>
+ <version>${project.version}</version>
+</dependency>
+]]></pre>
+
+WebSocket module provides a basic integration with Java WebSocket API (JSR 356).
+
+Integration is at codec level (encoder/decoder). There are two families of codecs:
+
+* The ones based on JSON-P (JsonObject, JsonArray, JsonStructure)
+* The ones based on Johnzon Mapper
+
+#### JSON-P integration
+
+Encoders:
+
+* �`org.apache.johnzon.websocket.jsr.JsrObjectEncoder`
+* �`org.apache.johnzon.websocket.jsr.JsrArrayEncoder`
+* �`org.apache.johnzon.websocket.jsr.JsrStructureEncoder`
+
+Decoders:
+
+* �`org.apache.johnzon.websocket.jsr.JsrObjectDecoder`
+* �`org.apache.johnzon.websocket.jsr.JsrArrayDecoder`
+* �`org.apache.johnzon.websocket.jsr.JsrStructureDecoder`
+
+#### Mapper integration
+
+Encoder:
+
+* �`org.apache.johnzon.websocket.mapper.JohnzonTextEncoder`
+
+Decoder:
+
+* �`org.apache.johnzon.websocket.mapper.JohnzonTextDecoder`
+
+#### Sample
+
+##### JSON-P Samples
+
+On server and client side configuration is easy: just provide the `encoders` and `decoders` parameters to `@[Server|Client]Endpoint`
+(or `EndpointConfig` if you use programmatic API)):
+
+ @ClientEndpoint(encoders = JsrObjectEncoder.class, decoders = JsrObjectDecoder.class)
+ public class JsrClientEndpointImpl {
+ @OnMessage
+ public void on(final JsonObject message) {
+ // ...
+ }
+ }
+
+ @ServerEndpoint(value = "/my-server", encoders = JsrObjectEncoder.class, decoders = JsrObjectDecoder.class)
+ public class JsrClientEndpointImpl {
+ @OnMessage
+ public void on(final JsonObject message) {
+ // ...
+ }
+ }
+
+##### Mapper Samples
+
+Server configuration is as simple as providing `encoders` and `decoders` parameters to `@ServerEndpoint`:
+
+ @ServerEndpoint(value = "/server", encoders = JohnzonTextEncoder.class, decoders = JohnzonTextDecoder.class)
+ public class ServerEndpointImpl {
+ @OnMessage
+ public void on(final Session session, final Message message) {
+ // ...
+ }
+ }
+
+Client configuration is almost the same excepted in this case it is not possible for Johnzon
+to guess the type you expect so you'll need to provide it. In next sample it is done just extending `JohnzonTextDecoder`
+in `MessageDecoder`.
+
+ @ClientEndpoint(encoders = JohnzonTextEncoder.class, decoders = ClientEndpointImpl.MessageDecoder.class)
+ public class ClientEndpointImpl {
+ @OnMessage
+ public void on(final Message message) {
+ // ...
+ }
+
+ public static class MessageDecoder extends JohnzonTextDecoder {
+ public MessageDecoder() {
+ super(Message.class);
+ }
+ }
+ }
+
+## Thanks
+
+We would like to thank ej-technologies for their [Java profiler JProfiler](http://www.ej-technologies.com/products/jprofiler/overview.html) which helped us a lot optimizing memory footprint and speed. 
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a126a080/src/site/markdown/index.md.vm
----------------------------------------------------------------------
diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm
deleted file mode 100644
index d8a2c01..0000000
--- a/src/site/markdown/index.md.vm
+++ /dev/null
@@ -1,194 +0,0 @@
-<!---
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you 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.
--->
-# Apache Johnzon
-
-Apache Johnzon is a project providing an implementation of JsonProcessing (aka jsr-353) and a set of useful extension
-for this specification like an Object mapper, some JAX-RS providers and a WebSocket module provides a basic integration with Java WebSocket API (JSR 356).
-
-## Status
-
-
-Apache Johnzon is a Top Level Project at the Apache Software Foundation (ASF).
-It fully implements the JSON-P_1.0 specification (JSR-353).
-Johnzon also targets the upcoming JSON-P_1.1 and JSON-B_1.0 specifications.
-
-
-## Get started
-
-Johnzon comes with four main modules.
-
-### Core (stable)
-
-<pre class="prettyprint linenums"><![CDATA[
-<dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-core</artifactId>
- <version>${project.version}</version>
-</dependency>
-]]></pre>
-
-This is the implementation of the specification. You'll surely want to add the API as dependency too:
-
-<pre class="prettyprint linenums"><![CDATA[
-<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
- <version>${jsonspecversion}</version>
- <scope>provided</scope> <!-- or compile if your environment doesn't provide it -->
-</dependency>
-]]></pre>
-
-### Mapper (stable)
-
-<pre class="prettyprint linenums"><![CDATA[
-<dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-mapper</artifactId>
- <version>${project.version}</version>
-</dependency>
-]]></pre>
-
-The mapper module allows you to use the implementation you want of Json Processing specification to map
-Json to Object and the opposite.
-
-<pre class="prettyprint linenums"><![CDATA[
-final MySuperObject object = createObject();
-
-final Mapper mapper = new MapperBuilder().build();
-mapper.writeObject(object, outputStream);
-
-final MySuperObject otherObject = mapper.readObject(inputStream, MySuperObject.class);
-]]></pre>
-
-### JAX-RS (stable)
-
-<pre class="prettyprint linenums"><![CDATA[
-<dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jaxrs</artifactId>
- <version>${project.version}</version>
-</dependency>
-]]></pre>
-
-JAX-RS module provides two providers (and underlying MessageBodyReaders and MessageBodyWriters):
-
-* org.apache.johnzon.jaxrs.[Wildcard]JohnzonProvider: use Johnzon Mapper to map Object to Json and the opposite
-* org.apache.johnzon.jaxrs.[Wildcard]ConfigurableJohnzonProvider: same as JohnzonProvider but with setters to ease the configuration of the provider in most servers/containers
-* org.apache.johnzon.jaxrs.[Wildcard]JsrProvider: allows you to use JsrArray, JsrObject (more generally JsonStructure)
-
-Note: Wildcard providers are basically the same as other provider but instead of application/json they support */json, */*+json, */x-json, */javascript, */x-javascript. This
-split makes it easier to mix json and other MediaType in the same resource (like text/plain, xml etc since JAX-RS API always matches as true wildcard type in some version whatever the subtype is).
-
-### Websocket (beta)
-
-<pre class="prettyprint linenums"><![CDATA[
-<dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-websocket</artifactId>
- <version>${project.version}</version>
-</dependency>
-]]></pre>
-
-WebSocket module provides a basic integration with Java WebSocket API (JSR 356).
-
-Integration is at codec level (encoder/decoder). There are two families of codecs:
-
-* The ones based on JSON-P (JsonObject, JsonArray, JsonStructure)
-* The ones based on Johnzon Mapper
-
-#### JSON-P integration
-
-Encoders:
-
-* �`org.apache.johnzon.websocket.jsr.JsrObjectEncoder`
-* �`org.apache.johnzon.websocket.jsr.JsrArrayEncoder`
-* �`org.apache.johnzon.websocket.jsr.JsrStructureEncoder`
-
-Decoders:
-
-* �`org.apache.johnzon.websocket.jsr.JsrObjectDecoder`
-* �`org.apache.johnzon.websocket.jsr.JsrArrayDecoder`
-* �`org.apache.johnzon.websocket.jsr.JsrStructureDecoder`
-
-#### Mapper integration
-
-Encoder:
-
-* �`org.apache.johnzon.websocket.mapper.JohnzonTextEncoder`
-
-Decoder:
-
-* �`org.apache.johnzon.websocket.mapper.JohnzonTextDecoder`
-
-#### Sample
-
-##### JSON-P Samples
-
-On server and client side configuration is easy: just provide the `encoders` and `decoders` parameters to `@[Server|Client]Endpoint`
-(or `EndpointConfig` if you use programmatic API)):
-
- @ClientEndpoint(encoders = JsrObjectEncoder.class, decoders = JsrObjectDecoder.class)
- public class JsrClientEndpointImpl {
- @OnMessage
- public void on(final JsonObject message) {
- // ...
- }
- }
-
- @ServerEndpoint(value = "/my-server", encoders = JsrObjectEncoder.class, decoders = JsrObjectDecoder.class)
- public class JsrClientEndpointImpl {
- @OnMessage
- public void on(final JsonObject message) {
- // ...
- }
- }
-
-##### Mapper Samples
-
-Server configuration is as simple as providing `encoders` and `decoders` parameters to `@ServerEndpoint`:
-
- @ServerEndpoint(value = "/server", encoders = JohnzonTextEncoder.class, decoders = JohnzonTextDecoder.class)
- public class ServerEndpointImpl {
- @OnMessage
- public void on(final Session session, final Message message) {
- // ...
- }
- }
-
-Client configuration is almost the same excepted in this case it is not possible for Johnzon
-to guess the type you expect so you'll need to provide it. In next sample it is done just extending `JohnzonTextDecoder`
-in `MessageDecoder`.
-
- @ClientEndpoint(encoders = JohnzonTextEncoder.class, decoders = ClientEndpointImpl.MessageDecoder.class)
- public class ClientEndpointImpl {
- @OnMessage
- public void on(final Message message) {
- // ...
- }
-
- public static class MessageDecoder extends JohnzonTextDecoder {
- public MessageDecoder() {
- super(Message.class);
- }
- }
- }
-
-## Thanks
-
-We would like to thank ej-technologies for their [Java profiler JProfiler](http://www.ej-technologies.com/products/jprofiler/overview.html) which helped us a lot optimizing memory footprint and speed. 
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a126a080/src/site/markdown/security.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/security.md b/src/site/markdown/security.md
new file mode 100644
index 0000000..f072a33
--- /dev/null
+++ b/src/site/markdown/security.md
@@ -0,0 +1,39 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+# Reporting New Security Problems with Apache Johnzon
+
+The Apache Software Foundation takes a very active stance in eliminating security problems and denial of service attacks against Apache projects.
+
+We strongly encourage folks to report such problems to the [private security mailing list](http://www.apache.org/security/) first, before disclosing them in a public forum.
+
+Please note that the security mailing list should only be used for reporting undisclosed security vulnerabilities in Apache projects and managing the process of fixing such vulnerabilities.
+We cannot accept regular bug reports or other queries at this address. All mail sent to this address that does not relate to an undisclosed security problem will be ignored.
+
+If you need to report a bug that isn't an undisclosed security vulnerability, please use the [bug reporting](https://issues.apache.org/jira/browse/JOHNZON) system.
+
+###Questions about:
+
+* how to configure Johnzon securely
+* if a vulnerability applies to your particular application
+* obtaining further information on a published vulnerability
+* availability of patches and/or new releases
+
+should be addressed to the [mailing list](http://johnzon.apache.org/mail-lists.html).
+
+The private security mailing address is: security (at) apache (dot) org
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a126a080/src/site/markdown/security.md.vm
----------------------------------------------------------------------
diff --git a/src/site/markdown/security.md.vm b/src/site/markdown/security.md.vm
deleted file mode 100644
index f072a33..0000000
--- a/src/site/markdown/security.md.vm
+++ /dev/null
@@ -1,39 +0,0 @@
-<!---
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you 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.
--->
-# Reporting New Security Problems with Apache Johnzon
-
-The Apache Software Foundation takes a very active stance in eliminating security problems and denial of service attacks against Apache projects.
-
-We strongly encourage folks to report such problems to the [private security mailing list](http://www.apache.org/security/) first, before disclosing them in a public forum.
-
-Please note that the security mailing list should only be used for reporting undisclosed security vulnerabilities in Apache projects and managing the process of fixing such vulnerabilities.
-We cannot accept regular bug reports or other queries at this address. All mail sent to this address that does not relate to an undisclosed security problem will be ignored.
-
-If you need to report a bug that isn't an undisclosed security vulnerability, please use the [bug reporting](https://issues.apache.org/jira/browse/JOHNZON) system.
-
-###Questions about:
-
-* how to configure Johnzon securely
-* if a vulnerability applies to your particular application
-* obtaining further information on a published vulnerability
-* availability of patches and/or new releases
-
-should be addressed to the [mailing list](http://johnzon.apache.org/mail-lists.html).
-
-The private security mailing address is: security (at) apache (dot) org
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a126a080/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 8ac609d..6d26284 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -21,14 +21,14 @@
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.1
http://maven.apache.org/xsd/decoration-1.0.1.xsd">
<bannerLeft>
- <name>Apache Johnzon</name>
- <alt>Apache Johnzon</alt>
- <href>/index.html</href>
- </bannerLeft>
+ <name>Apache Johnzon</name>
+ <alt>Apache Johnzon</alt>
+ <href>/index.html</href>
+ </bannerLeft>
<bannerRight>
- <src>/images/johnzon_logo.png</src>
- <width>180</width>
+ <src>/images/johnzon_logo.png</src>
+ <width>180</width>
</bannerRight>
<custom>
@@ -51,24 +51,22 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.3.1</version>
+ <version>1.5</version>
</skin>
<body>
<head>
- <script type="text/javascript">
-
- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
- ga('create', 'UA-3211522-15', 'apache.org');
- ga('send', 'pageview');
+ <![CDATA[<script type="text/javascript">
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+ })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
- </script>
+ ga('create', 'UA-3211522-15', 'apache.org');
+ ga('send', 'pageview');
+ </script>]]>
</head>
@@ -103,10 +101,12 @@
</menu>
<footer>
- <div class="row span16"><div>Apache Johnzon, Apache, the Apache feather logo, and the Apache Johnzon project logos are trademarks of The Apache Software Foundation.
+ <![CDATA[
+ <div class="row span16"><div>Apache Johnzon, Apache, the Apache feather logo, and the Apache Johnzon project logos are trademarks of The Apache Software Foundation.
All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
<a href="${project.url}/privacy-policy.html">Privacy Policy</a>
- </div>
+ </div>
+ ]]>
</footer>
</body>