Author: gk
Date: Mon Jun 15 13:50:26 2015
New Revision: 1685581
URL: http://svn.apache.org/r1685581
Log:
- Fix AL, Javadoc and Doc Index
Modified:
turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/CacheService.java
turbine/fulcrum/trunk/json/xdocs/index.xml
Modified:
turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java?rev=1685581&r1=1685580&r2=1685581&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java
(original)
+++
turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java
Mon Jun 15 13:50:26 2015
@@ -177,11 +177,9 @@ public interface JsonService {
* Serialize all object properties excluding provided filters attributes.
If no filter is set, all attributes should be returned.
*
* @param src
- * The Java object to serialize
+ * The Java object to serialize. By default the filtering is
applied for this class. By default the class of the src object is the key for
the filter object cached.
* @param filterClass
- * The class to which the filtering should be applied. If its
the
- * same class, just the filterAttributes get applied. If not,
the
- * class is filtered out, if found as a property type. By
default filterClass is the key in the filter object cached.
+ * The class, which should be filtered out, if found as a
property type.
* @param cleanFilter
* If <code>true </code> cleans filter (clean cache and custom
filter for this filterClass) after serialization.
* @param filterAttr
Modified:
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/CacheService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/CacheService.java?rev=1685581&r1=1685580&r2=1685581&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/CacheService.java
(original)
+++
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/CacheService.java
Mon Jun 15 13:50:26 2015
@@ -1,5 +1,24 @@
package org.apache.fulcrum.json.jackson;
+/*
+ * 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.
+ */
+
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Modified: turbine/fulcrum/trunk/json/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/xdocs/index.xml?rev=1685581&r1=1685580&r2=1685581&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/json/xdocs/index.xml Mon Jun 15 13:50:26 2015
@@ -168,7 +168,7 @@ JsonService jsonService = (JsonService)T
<p>
</p>
</subsection>
- <subsection name="Usage in Velocity Template" id="velocity">
+ <subsection name="Usage in Velocity Template: Serialization Example"
id="velocity">
<p>
A lot of client data is nowadays provided by javascript and usage of
Model-View-View Model (MVVM) frameworks is very popular. Having the required
data in JSON format would be of some help.
Velocity provides the integration of Java objects into templates (HTML).
To generate in this context
@@ -189,14 +189,14 @@ JsonService jsonService = (JsonService)T
return result;
}
]]></source>
- You could then call the json method from this tool in a velocity template
like this:
+ You could then call the JSON method from this tool in a velocity template
like this:
<source><![CDATA[
#set ($json = $!pullTool.getJson($items, "x.y.z.Item", true, "prop1",
"prop2", "prop3" ) )
## parse json in javascript ....
]]></source>
- What you get is the JSON data populated with all fields you provided
(starting with the fourth parameter). Th result format may the vary depending
on serialization parameters. The third parameter being true will cache not the
result, but the call characteristics i.e. the parameters used for the
serialization of the provided class.
+ What you get is the JSON data populated with all fields you provided
(starting with the fourth parameter). Th result format may vary depending on
the serialization parameters. The third parameter being true will cache not the
result, but the call characteristics i.e. the parameters used for the
serialization of the provided class.
<h4>Configuration Requirements</h4>
<p>
