You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by sa...@apache.org on 2014/11/23 20:47:08 UTC
incubator-johnzon git commit: Site fixes,
First step towards proper site archiving
Repository: incubator-johnzon
Updated Branches:
refs/heads/master 787e919eb -> 4dabbb17f
Site fixes, First step towards proper site archiving
Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/4dabbb17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/4dabbb17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/4dabbb17
Branch: refs/heads/master
Commit: 4dabbb17fd2fccccf4a9181ebe6b549c9dbf8c98
Parents: 787e919
Author: Hendrik Saly <he...@gmail.com>
Authored: Sun Nov 23 20:47:03 2014 +0100
Committer: Hendrik Saly <he...@gmail.com>
Committed: Sun Nov 23 20:47:03 2014 +0100
----------------------------------------------------------------------
pom.xml | 26 +++++++----
src/site/markdown/index.md | 89 --------------------------------------
src/site/markdown/index.md.vm | 89 ++++++++++++++++++++++++++++++++++++++
src/site/site.xml | 30 ++++++++++---
4 files changed, 130 insertions(+), 104 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/4dabbb17/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 67ae69c..381aff3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,14 @@
<inceptionYear>2014</inceptionYear>
<url>http://incubator.apache.org/projects/johnzon.html</url>
+ <properties>
+ <jsonspecversion>1.0-alpha-1</jsonspecversion>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <johnzon.site.url>https://svn.apache.org/repos/asf/incubator/johnzon/site/publish/</johnzon.site.url>
+ <pubsub.url>scm:svn:${johnzon.site.url}</pubsub.url>
+ <staging.directory>${project.build.directory}/site</staging.directory>
+ </properties>
+
<modules>
<module>johnzon-core</module>
<module>johnzon-mapper</module>
@@ -49,7 +57,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-json_1.0_spec</artifactId>
- <version>1.0-alpha-1</version>
+ <version>${jsonspecversion}</version>
<scope>provided</scope>
</dependency>
@@ -269,6 +277,15 @@
<configuration>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <ignorePathsToDelete>
+ <ignorePathToDelete>archives**</ignorePathToDelete>
+ </ignorePathsToDelete>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -327,13 +344,6 @@
<url>${pubsub.url}</url>
</site>
</distributionManagement>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <johnzon.site.url>https://svn.apache.org/repos/asf/incubator/johnzon/site/publish/</johnzon.site.url>
- <pubsub.url>scm:svn:${johnzon.site.url}</pubsub.url>
- <staging.directory>${project.build.directory}/site</staging.directory>
- </properties>
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-johnzon.git</connection>
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/4dabbb17/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
deleted file mode 100644
index 44d3072..0000000
--- a/src/site/markdown/index.md
+++ /dev/null
@@ -1,89 +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 and some JAX-RS providers.
-
-## Get started
-
-Johnzon comes with three main modules.
-
-### Core
-
-<pre class="prettyprint linenums"><![CDATA[
-<dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-core</artifactId>
- <version>${johnzon.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>${json-processing.version}</version>
- <scope>provided</scope> <!-- or compile if your environment doesn't provide it -->
-</dependency>
-]]></pre>
-
-### Mapper
-
-<pre class="prettyprint linenums"><![CDATA[
-<dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-mapper</artifactId>
- <version>${johnzon.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
-
-<pre class="prettyprint linenums"><![CDATA[
-<dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jaxrs</artifactId>
- <version>${johnzon.version}</version>
-</dependency>
-]]></pre>
-
-JAX-RS module provides two providers (and underlying MessageBodyReaders and MessageBodyWriters):
-
-* org.apache.johnzon.jaxrs.JohnzonProvider: use Johnzon Mapper to map Object to Json and the opposite
-* org.apache.johnzon.jaxrs.ConfigurableJohnzonProvider: same as JohnzonProvider but with setters to ease the configuration of the provider in most servers/containers
-* org.apache.johnzon.jaxrs.JsrProvider: allows you to use JsrArray, JsrObject (more generally JsonStructure)
-
-## 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/4dabbb17/src/site/markdown/index.md.vm
----------------------------------------------------------------------
diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm
new file mode 100644
index 0000000..944b612
--- /dev/null
+++ b/src/site/markdown/index.md.vm
@@ -0,0 +1,89 @@
+<!---
+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 and some JAX-RS providers.
+
+## Get started
+
+Johnzon comes with three main modules.
+
+### Core
+
+<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
+
+<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
+
+<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.JohnzonProvider: use Johnzon Mapper to map Object to Json and the opposite
+* org.apache.johnzon.jaxrs.ConfigurableJohnzonProvider: same as JohnzonProvider but with setters to ease the configuration of the provider in most servers/containers
+* org.apache.johnzon.jaxrs.JsrProvider: allows you to use JsrArray, JsrObject (more generally JsonStructure)
+
+## 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/4dabbb17/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 9adf8e6..38c8ad9 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -20,21 +20,28 @@
xmlns="http://maven.apache.org/DECORATION/1.0.1"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.1
http://maven.apache.org/xsd/decoration-1.0.1.xsd">
- <bannerLeft>
+ <bannerLeft>
<name>Apache Johnzon</name>
- <alt>Apache Johnzon logo</alt>
+ <alt>Apache Johnzon</alt>
<href>/index.html</href>
- </bannerLeft>
- <bannerRight>
+ </bannerLeft><!--
+
+<bannerRight>
<src>http://incubator.apache.org/images/egg-logo.png</src>
<href>http://incubator.apache.org/</href>
- </bannerRight>
+ </bannerRight>-->
<custom>
<fluidoSkin>
<topBarEnabled>true</topBarEnabled>
<sideBarEnabled>true</sideBarEnabled>
<sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ <topBarIcon>
+ <name>Apache Johnzon</name>
+ <alt>Apache Johnzon</alt>
+ <!-- <src>http://incubator.apache.org/images/egg-logo.png</src> -->
+ <href>/index.html</href>
+ </topBarIcon>
<ohloh>
<projectId>apache-johnzon</projectId>
<widget>stats</widget>
@@ -45,7 +52,7 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.3.0</version>
+ <version>1.3.1</version>
</skin>
<body>
@@ -68,6 +75,15 @@
<menu name="User Guide">
<item name="Home" href="/index.html"/>
+ <item name="Download" href="http://incubator.apache.org/projects/johnzon.html"/>
+ <item name="Javadoc" href="/apidocs/index.html"/>
+ <item name="Source Code" href="/source-repository.html"/>
+ <item name="Changelog" href="/changelog.html"/>
+ <item name="Mailing Lists" href="/mail-lists.html"/>
+ </menu>
+
+ <menu name="Site Archives">
+ <item name="Johnzon 0.2-incubating" href="/archives/0.2-incubating/index.html"/>
</menu>
<menu ref="reports" inherit="bottom"/>
@@ -78,7 +94,7 @@
<item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html"/>
<item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
</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.
All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>