You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2014/02/26 23:23:00 UTC
svn commit: r1572299 - in /turbine/fulcrum/trunk/json: ./ api/pom.xml
gson/pom.xml gson/xdocs/index.xml jackson/pom.xml jackson2/pom.xml
jackson2/xdocs/index.xml pom.xml src/ src/site/ src/site/site.xml
xdocs/index.xml
Author: gk
Date: Wed Feb 26 22:23:00 2014
New Revision: 1572299
URL: http://svn.apache.org/r1572299
Log:
Prepare site publishing as master module.
Added:
turbine/fulcrum/trunk/json/src/
turbine/fulcrum/trunk/json/src/site/
turbine/fulcrum/trunk/json/src/site/site.xml (with props)
Removed:
turbine/fulcrum/trunk/json/gson/xdocs/index.xml
turbine/fulcrum/trunk/json/jackson2/xdocs/index.xml
Modified:
turbine/fulcrum/trunk/json/ (props changed)
turbine/fulcrum/trunk/json/api/pom.xml
turbine/fulcrum/trunk/json/gson/pom.xml
turbine/fulcrum/trunk/json/jackson/pom.xml
turbine/fulcrum/trunk/json/jackson2/pom.xml
turbine/fulcrum/trunk/json/pom.xml
turbine/fulcrum/trunk/json/xdocs/index.xml
Propchange: turbine/fulcrum/trunk/json/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 26 22:23:00 2014
@@ -0,0 +1 @@
+target
Modified: turbine/fulcrum/trunk/json/api/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/api/pom.xml?rev=1572299&r1=1572298&r2=1572299&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/api/pom.xml (original)
+++ turbine/fulcrum/trunk/json/api/pom.xml Wed Feb 26 22:23:00 2014
@@ -31,11 +31,11 @@
<description>Fulcrum JSON Basic API</description>
<url>http://turbine.apache.org/fulcrum/fulcrum-json/fulcrum-json-api</url>
- <!--scm>
+ <scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/api/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/api/</developerConnection>
<url>http://svn.apache.org/viewcvs/turbine/fulcrum/trunk/json/api/</url>
- </scm-->
+ </scm>
<dependencies>
<dependency>
Modified: turbine/fulcrum/trunk/json/gson/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/pom.xml?rev=1572299&r1=1572298&r2=1572299&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/gson/pom.xml (original)
+++ turbine/fulcrum/trunk/json/gson/pom.xml Wed Feb 26 22:23:00 2014
@@ -28,12 +28,12 @@
<name>Fulcrum JSON GSON Impl</name>
<version>1.0.0-SNAPSHOT</version>
- <!--url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-json-gson</url>
+ <url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-json-gson</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/gson/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/gson/</developerConnection>
<url>http://svn.apache.org/viewcvs/turbine/fulcrum/trunk/json/gson/</url>
- </scm-->
+ </scm>
<build>
<sourceDirectory>${basedir}/src/java/</sourceDirectory>
Modified: turbine/fulcrum/trunk/json/jackson/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/pom.xml?rev=1572299&r1=1572298&r2=1572299&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson/pom.xml Wed Feb 26 22:23:00 2014
@@ -28,12 +28,12 @@
<name>Fulcrum JSON Jackson Impl</name>
<version>1.0.0-SNAPSHOT</version>
- <!--url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-json-jackson</url>
+ <url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-json-jackson</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/jackson/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/jackson/</developerConnection>
<url>http://svn.apache.org/viewcvs/turbine/fulcrum/trunk/json/jackson/</url>
- </scm-->
+ </scm>
<build>
<sourceDirectory>${basedir}/src/java/</sourceDirectory>
Modified: turbine/fulcrum/trunk/json/jackson2/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/pom.xml?rev=1572299&r1=1572298&r2=1572299&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson2/pom.xml Wed Feb 26 22:23:00 2014
@@ -28,12 +28,12 @@
<name>Fulcrum JSON Jackson 2.x Impl</name>
<version>1.0.0-SNAPSHOT</version>
- <!--url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-json-jackson</url>
+ <url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-json-jackson2</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/jackson/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/jackson/</developerConnection>
- <url>http://svn.apache.org/viewcvs/turbine/fulcrum/trunk/json/jackson/</url>
- </scm-->
+ <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/jackson2/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json/jackson2/</developerConnection>
+ <url>http://svn.apache.org/viewcvs/turbine/fulcrum/trunk/json/jackson2/</url>
+ </scm>
<build>
<sourceDirectory>${basedir}/src/java/</sourceDirectory>
Modified: turbine/fulcrum/trunk/json/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/pom.xml?rev=1572299&r1=1572298&r2=1572299&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/pom.xml (original)
+++ turbine/fulcrum/trunk/json/pom.xml Wed Feb 26 22:23:00 2014
@@ -42,9 +42,9 @@
<!-- Required for staging to work -->
<distributionManagement>
<site>
- <id>apache.website</id>
+ <id>turbine.apache.org</id>
<name>Fulcrum JSON Website</name>
- <url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-json/</url>
+ <url>http://turbine.apache.org/fulcrum/fulcrum-json/</url>
</site>
</distributionManagement>
@@ -82,6 +82,56 @@
<build>
<sourceDirectory>${basedir}/src/java</sourceDirectory>
<testSourceDirectory>${basedir}/src/test</testSourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <content>${siteContent.path}</content>
+ <tryUpdate>false</tryUpdate>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- build the source and binary distribution packages -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>fulcrum-source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptorRefs>
+ <descriptorRef>bin</descriptorRef>
+ <descriptorRef>project</descriptorRef>
+ <descriptorRef>src</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileFormat>gnu</tarLongFileFormat>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ <properties>
+ <turbine.site.path>fulcrum/fulcrum-json</turbine.site.path>
+ <turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/json</turbine.scmPubCheckoutDirectory>
+ <turbine.site.cache>${project.build.directory}/turbine-sites</turbine.site.cache>
+ <siteContent.path>${project.build.directory}/staging</siteContent.path><!-- default stagingSiteURL -->
+ </properties>
+
</project>
Added: turbine/fulcrum/trunk/json/src/site/site.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/src/site/site.xml?rev=1572299&view=auto
==============================================================================
--- turbine/fulcrum/trunk/json/src/site/site.xml (added)
+++ turbine/fulcrum/trunk/json/src/site/site.xml Wed Feb 26 22:23:00 2014
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/DECORATION/1.4.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"
+ name="Fulcrum JSON Component Service">
+
+<body>
+ <menu name="Overview" inherit="top">
+ <item name="Main" href="index.html" collapse="false"/>
+ </menu>
+
+ <menu ref="modules" />
+
+</body>
+</project>
Propchange: turbine/fulcrum/trunk/json/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: turbine/fulcrum/trunk/json/xdocs/index.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/xdocs/index.xml?rev=1572299&r1=1572298&r2=1572299&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/json/xdocs/index.xml Wed Feb 26 22:23:00 2014
@@ -43,25 +43,32 @@
</p>
</section>
- <section name="JSON Service with Jackson 2 API">
+ <section name="JSON Service Component with Jackson API">
<subsection name="Overview">
<p>
- This Service serves as a JSON serializer or deserializer using <a href="http://jackson.codehaus.org/">Jackson</a>.
+ This Service serves as a JSON serializer or deserializer using <a href="https://github.com/FasterXML/jackson">Jackson</a> Version 2 or Version 1.
</p>
<p>
- It is written
- for use in Turbine but it can be used in any container compatible
+ It is written for use in Turbine but it can be used in any container compatible
with Avalon's ECM container.
</p>
</subsection>
<subsection name="Role Configuration">
+ <p>Jackson Version 2.2.1</p>
<source><![CDATA[
<role
name="org.apache.fulcrum.json.JsonService"
shorthand="json"
default-class="org.apache.fulcrum.json.jackson.Jackson2MapperService"/>
]]></source>
+ <p>Jackson Version 1.9.13</p>
+ <source><![CDATA[
+ <role
+ name="org.apache.fulcrum.json.JsonService"
+ shorthand="json"
+ default-class="org.apache.fulcrum.json.jackson.JacksonMapperService"/>
+]]></source>
</subsection>
<subsection name="Component Configuration">
<table>
@@ -149,7 +156,7 @@ JsonService jsonService = (JsonService)T
the data which should be exposed into Javascript you could integrate the provided serialization methods here, in the velocity context. As an example, you could provide it via the Turbine Pull service:
</p>
<source><![CDATA[
- public Object getJson(Object src, String className, boolean refresh, String... props ) {
+ public Object getJson(Object src, String className, Boolean refresh, String... props ) {
String result= null;
try
{
@@ -205,7 +212,7 @@ JsonService jsonService = (JsonService)T
</section>
- <section name="JSON Service with GSO API">
+ <section name="JSON Service Component with GSON API">
<subsection name="Role Configuration">
<source><![CDATA[
<role
@@ -214,9 +221,59 @@ JsonService jsonService = (JsonService)T
default-class="org.apache.fulcrum.json.gson.GSONBuilderService"/>
]]></source>
</subsection>
+ <subsection name="Component Configuration">
+ <table>
+ <tr>
+ <th>Item</th>
+ <th>Datatype</th>
+ <th>Cardinality</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>globalAdapters</td>
+ <td>Complex</td>
+ <td>[0|1]</td>
+ <td>
+ If not set no adapter is set. Otherwise provide for each sub element <code>adapter</code> the class name of the adapter and set the attribute <code>forClass</code> to the class name the adapter should be applied. See the configuration example below.
+ </td>
+ </tr>
+ <tr>
+ <td>dateFormat</td>
+ <td>String</td>
+ <td>[0|*]</td>
+ <td>
+ If set changes the date format. Provided string should be in a Format acceptable to the class <code>java.text.SimpleDateFormat.SimpleDateFormat(String)</code>. The default value is
+ <code>MM/dd/yyyy</code>.
+ </td>
+ </tr>
+ </table>
+ </subsection>
+
+ <subsection name="Component Configuration Example">
+ <source><![CDATA[
+ <json>
+ <dateFormat>MM/dd/yyyy</dateFormat>
+ <globalAdapters>>
+ <adapter forClass="x.y.z.Class">a.b.c.d.AdapterForClassXYZ</adapter-->
+ </globalAdapters>
+ </json>
+]]></source>
+ </subsection>
+
+ <subsection name="Usage">
+ <p>
+ You get a JSON service from the service like this:
+ </p>
+
+ <source><![CDATA[
+JsonService jsonService = (JsonService)TurbineServices
+ .getInstance().getService(JsonService.ROLE);
+]]></source>
+
+ <p>
+ </p>
+ </subsection>
- <subsection name="jackson2">
- </subsection>
</section>