Author: gk
Date: Fri Jun 12 10:57:08 2015
New Revision: 1685062
URL: http://svn.apache.org/r1685062
Log:
- Bugfixes for warnings
- Exclude hidden folders in assemblies
- Cleanup pom.xml
Modified:
turbine/fulcrum/trunk/json/api/src/java/org/apache/fulcrum/json/JsonService.java
turbine/fulcrum/trunk/json/dist/pom.xml
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/CacheService.java
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/SimpleNameIntrospector.java
turbine/fulcrum/trunk/json/pom.xml
turbine/fulcrum/trunk/json/src/assembly/project.xml
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=1685062&r1=1685061&r2=1685062&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
Fri Jun 12 10:57:08 2015
@@ -81,7 +81,7 @@ public interface JsonService {
*
* @param src
* @param type
- * @param refreshCache
+ * @param cleanCache
* If <code>true</code>, try to clean cache after serialization
*
* For other attributes @see {@link #ser(Object, Class)}
@@ -243,7 +243,7 @@ public interface JsonService {
/**
* Add an adapter (mixin, serializer,..) for the target class depending on
* the JsonService implementation. Adapters could by default not
deregistered. If you want
- * to get rid of them, you have to (@see {@link #reInitService()} (or
overwrite with the same target type, depending on
+ * to get rid of them, you may try to reinit the service (or overwrite
with the same target type, depending on
* implementation)
*
* @param name
Modified: turbine/fulcrum/trunk/json/dist/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/dist/pom.xml?rev=1685062&r1=1685061&r2=1685062&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/dist/pom.xml (original)
+++ turbine/fulcrum/trunk/json/dist/pom.xml Fri Jun 12 10:57:08 2015
@@ -70,7 +70,9 @@
</goals>
<configuration>
<descriptors>
+ <!-- binaries -->
<descriptor>src/assembly/dist.xml</descriptor>
+ <!-- sources -->
<descriptor>src/assembly/src.xml</descriptor>
</descriptors>
</configuration>
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=1685062&r1=1685061&r2=1685062&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
Fri Jun 12 10:57:08 2015
@@ -17,7 +17,7 @@ public class CacheService implements Log
AnnotationIntrospector primary;
Map<String, FilterProvider> filters = new ConcurrentHashMap<String,
FilterProvider>();;
- private Logger logger;
+ private static Logger logger;
public CacheService(AnnotationIntrospector primary) {
this.primary = primary;
Modified:
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java?rev=1685062&r1=1685061&r2=1685062&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
(original)
+++
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
Fri Jun 12 10:57:08 2015
@@ -313,6 +313,7 @@ public class Jackson2MapperService exten
getLogger().warn("no filter attributes set!");
pf = SimpleBeanPropertyFilter.filterOutAllExcept("dummy");
}
+ if (filterClasses == null) throw new Exception("You have to provide
some class to apply the filtering!");
return filter(src, filterClasses, null, pf, refresh);
}
@@ -387,24 +388,21 @@ public class Jackson2MapperService exten
return serialized;
}
- private <T> SimpleFilterProvider retrieveFilter(PropertyFilter pf,
Class<?> cachefilterClass,
+ private <T> SimpleFilterProvider retrieveFilter(PropertyFilter pf,
Class<?> filterClass,
Class<T>[] excludeClasses ) {
SimpleFilterProvider filter = null;
if (pf != null) {
filter = new SimpleFilterProvider();
filter.setDefaultFilter(pf);
}
- if
(!cacheService.getFilters().containsKey(cachefilterClass.getName())) {
- getLogger().debug("add filter for cache filter Class " +
cachefilterClass.getName());
- if (cachefilterClass != null) {
- getLogger().debug("filter classe:" + cachefilterClass);
- setCustomIntrospectorWithExternalFilterId(cachefilterClass,
excludeClasses); // filter class
- }
+ if (!cacheService.getFilters().containsKey(filterClass.getName())) {
+ getLogger().debug("add filter for cache filter Class " +
filterClass.getName());
+ setCustomIntrospectorWithExternalFilterId(filterClass,
excludeClasses); // filter class
if (pf != null) {
- cacheService.getFilters().put(cachefilterClass.getName(),
(FilterProvider) filter);
+ cacheService.getFilters().put(filterClass.getName(),
(FilterProvider) filter);
}
} else {
- filter =
(SimpleFilterProvider)cacheService.getFilters().get(cachefilterClass
+ filter =
(SimpleFilterProvider)cacheService.getFilters().get(filterClass
.getName());
//setCustomIntrospectorWithExternalFilterId(filterClass); // filter
// class
Modified:
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/SimpleNameIntrospector.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/SimpleNameIntrospector.java?rev=1685062&r1=1685061&r2=1685062&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/SimpleNameIntrospector.java
(original)
+++
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/SimpleNameIntrospector.java
Fri Jun 12 10:57:08 2015
@@ -53,7 +53,7 @@ public class SimpleNameIntrospector exte
private List<String> externalFilterIncludeClasses = new
CopyOnWriteArrayList<String>();
private AtomicBoolean isExludeType = new AtomicBoolean(false);
- private Logger logger;
+ private static Logger logger;
/**
* Filtering on method types.
Modified: turbine/fulcrum/trunk/json/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/pom.xml?rev=1685062&r1=1685061&r2=1685062&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/pom.xml (original)
+++ turbine/fulcrum/trunk/json/pom.xml Fri Jun 12 10:57:08 2015
@@ -115,7 +115,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4.1</version>
<executions>
<execution>
<id>fulcrum-source-release-assembly</id>
@@ -132,18 +131,18 @@
</configuration>
</execution>
</executions>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>site</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
Modified: turbine/fulcrum/trunk/json/src/assembly/project.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/src/assembly/project.xml?rev=1685062&r1=1685061&r2=1685062&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/src/assembly/project.xml (original)
+++ turbine/fulcrum/trunk/json/src/assembly/project.xml Fri Jun 12 10:57:08 2015
@@ -53,7 +53,7 @@
<include>%regex[(api|gson|jackson|jackson2|dist)/.*]</include>
</includes>
<excludes>
- <exclude>%regex[.*/target.*]</exclude>
+ <exclude>%regex[.*/target.*|.*/\..*]</exclude>
</excludes>
</fileSet>
<fileSet>
Modified: turbine/fulcrum/trunk/json/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/xdocs/index.xml?rev=1685062&r1=1685061&r2=1685062&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/json/xdocs/index.xml Fri Jun 12 10:57:08 2015
@@ -200,7 +200,7 @@ JsonService jsonService = (JsonService)T
<h4>Configuration Requirements</h4>
<p>
- Add <code>org.apache.fulcrum.json.jackson.SimpleNameIntrospector</code> to
the annotation inspectors as primary or secondary inspector. <strong>[CHANGE in
Version 1.0.1]</strong> SimpleNameIntrospector now extends from <a
href="https://github.com/FasterXML/jackson-databind/blob/master/src/main/java/com/fasterxml/jackson/databind/introspect/NopAnnotationIntrospector.java";>NopAnnotationIntrospector</a>
to cleary divide responsibilities. Default introspector e.g.
JacksonAnnotationIntrospector could be provided as a primary/secondary
introspector in <a href="#compconf">Component Configuration</a>.
+ Add <code>org.apache.fulcrum.json.jackson.SimpleNameIntrospector</code> to
the annotation inspectors as primary or secondary inspector. <strong>[CHANGE in
Version 1.1.0]</strong> SimpleNameIntrospector now extends from <a
href="https://github.com/FasterXML/jackson-databind/blob/master/src/main/java/com/fasterxml/jackson/databind/introspect/NopAnnotationIntrospector.java";>NopAnnotationIntrospector</a>
to cleary divide responsibilities. Default introspector e.g.
JacksonAnnotationIntrospector could be provided as a primary/secondary
introspector in <a href="#compconf">Component Configuration</a>.
</p>
</subsection>
