Author: gk
Date: Tue Jun 15 08:33:26 2021
New Revision: 1890800
URL: http://svn.apache.org/viewvc?rev=1890800&view=rev
Log:
- update layout/skin
- update raw exceptions in JSON component
- fix format error in changes.xml
Modified:
turbine/fulcrum/trunk/cache/src/changes/changes.xml
turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java
turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java
turbine/fulcrum/trunk/json/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
turbine/fulcrum/trunk/localization/src/site/site.xml
turbine/fulcrum/trunk/parser/src/site/site.xml
turbine/fulcrum/trunk/pool/src/site/site.xml
turbine/fulcrum/trunk/quartz/src/site/site.xml
turbine/fulcrum/trunk/security/api/src/site/site.xml
turbine/fulcrum/trunk/site/src/site/site.xml
turbine/fulcrum/trunk/testcontainer/src/site/site.xml
turbine/fulcrum/trunk/upload/src/site/site.xml
turbine/fulcrum/trunk/yaafi-crypto/src/site/site.xml
Modified: turbine/fulcrum/trunk/cache/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/src/changes/changes.xml?rev=1890800&r1=1890799&r2=1890800&view=diff
==============================================================================
--- turbine/fulcrum/trunk/cache/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/cache/src/changes/changes.xml Tue Jun 15 08:33:26 2021
@@ -26,7 +26,7 @@
<body>
<release version="2.0.1" date="in subversion">
</release>
- <release version="2.0.0." date="2021-06-08">
+ <release version="2.0.0" date="2021-06-08">
<action dev="gk" type="update">
Backward-incompatible change: Global default cache frequency setting
is now in milliseconds,
as already the ehcache and the JCS.
Modified:
turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java?rev=1890800&r1=1890799&r2=1890800&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java
(original)
+++
turbine/fulcrum/trunk/json/gson/src/java/org/apache/fulcrum/json/gson/GSONBuilderService.java
Tue Jun 15 08:33:26 2021
@@ -299,8 +299,8 @@ public class GSONBuilderService extends
adapterClass);
} catch (Exception e) {
- throw new Exception(
- "JsonMapperService: Error instantiating "
+ throw new InstantiationException(
+ "JsonMapperService: Error instantiating one of
the adapters: "
+ avClass + " for " + forClass);
}
}
Modified:
turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java?rev=1890800&r1=1890799&r2=1890800&view=diff
==============================================================================
---
turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java
(original)
+++
turbine/fulcrum/trunk/json/jackson/src/java/org/apache/fulcrum/json/jackson/JacksonMapperService.java
Tue Jun 15 08:33:26 2021
@@ -409,7 +409,7 @@ public class JacksonMapperService extend
primary = (AnnotationIntrospector)
Class.forName(avClass).getConstructor()
.newInstance();
} catch (Exception e) {
- throw new Exception(
+ throw new InstantiationException(
"JsonMapperService: Error instantiating " + avClass
+ " for " + key);
}
@@ -418,7 +418,7 @@ public class JacksonMapperService extend
secondary = (AnnotationIntrospector)
Class.forName(avClass).getConstructor()
.newInstance();
} catch (Exception e) {
- throw new Exception(
+ throw new InstantiationException(
"JsonMapperService: Error instantiating " + avClass
+ " for " + key);
}
@@ -458,7 +458,7 @@ public class JacksonMapperService extend
assert mapper.getSerializationConfig().isEnabled(
feature) == featureValue;
} catch (Exception e) {
- throw new Exception(
+ throw new AssertionError(
"JsonMapperService: Error instantiating
feature "
+ featureKey + " with " +
featureValue,
e);
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=1890800&r1=1890799&r2=1890800&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
Tue Jun 15 08:33:26 2021
@@ -219,7 +219,7 @@ public class Jackson2MapperService exten
"registering module " + module );
mapper.registerModule((Module) module);
} else {
- throw new Exception("expecting module type" + Module.class);
+ throw new ClassCastException("expecting module type " +
Module.class);
}
return this;
}
@@ -428,7 +428,7 @@ public class Jackson2MapperService exten
pf = SimpleBeanPropertyFilter.filterOutAllExcept("dummy");
}
if (filterClasses == null)
- throw new Exception("You have to provide some class to apply the
filtering!");
+ throw new AssertionError("You have to provide some class to apply
the filtering!");
return filter(src, filterClasses, null, pf, refresh);
}
@@ -673,7 +673,7 @@ public class Jackson2MapperService exten
try {
characterEscapes = (CharacterEscapes)
Class.forName(escapeCharsClass).getConstructor().newInstance();
} catch (Exception e) {
- throw new Exception(
+ throw new InstantiationException(
"JsonMapperService: Error instantiating " +
escapeCharsClass + " for " + ESCAPE_CHAR_CLASS);
}
}
@@ -700,7 +700,7 @@ public class Jackson2MapperService exten
djpw = new DefaultJsonPathWrapper(this.mapper);
getLogger().debug("******** initialized new jsonPath defaults:
" + djpw.getJsonPathDefault());
} catch (Exception e) {
- throw new Exception(
+ throw new AssertionError(
"JsonMapperService: Error instantiating " + djpw + "
using useJsonPath=" + useJsonPath);
}
@@ -725,12 +725,13 @@ public class Jackson2MapperService exten
try {
getLogger().debug("initializing featureType: " +
featureType);
configFeature = loadClass(featureType);
- } catch (Exception e) {
- throw new RuntimeException("JsonMapperService: Error
instantiating " + featureType + " for " + featureKey, e);
+ } catch (ClassNotFoundException e) {
+ throw new AssertionError("JsonMapperService: Error
instantiating " + featureType + " for " + featureKey, e);
}
ConfigFeature feature = null;
if (!StringUtils.isEmpty(featureKey) && featureValue != null) {
- try {
+ try
+ {
if (configFeature.equals(SerializationFeature.class)) {
feature = SerializationFeature.valueOf(featureKey);
mapper.configure((SerializationFeature) feature,
featureValue);
@@ -764,10 +765,11 @@ public class Jackson2MapperService exten
getLogger().info("initializing parser feature: " +
genFeature + " with " + featureValue);
mapper.configure(genFeature, featureValue);
}
- } catch (Exception e) {
- throw new RuntimeException("JsonMapperService: Error
instantiating feature " + featureKey + " with "
- + featureValue, e);
- }
+ } catch (Exception e) {
+ throw new RuntimeException("JsonMapperService: Error
instantiating feature " + featureKey + " with "
+ + featureValue , e);
+ }
+
}
});
}
@@ -781,13 +783,13 @@ public class Jackson2MapperService exten
try {
primary = (AnnotationIntrospector)
Class.forName(avClass).getConstructor().newInstance();
} catch (Exception e) {
- throw new Exception("JsonMapperService: Error
instantiating " + avClass + " for " + key);
+ throw new InstantiationException("JsonMapperService: Error
instantiating " + avClass + " for " + key);
}
} else if (key.equals("secondary") && avClass != null) {
try {
secondary = (AnnotationIntrospector)
Class.forName(avClass).getConstructor().newInstance();
} catch (Exception e) {
- throw new Exception("JsonMapperService: Error
instantiating " + avClass + " for " + key);
+ throw new InstantiationException("JsonMapperService: Error
instantiating " + avClass + " for " + key);
}
}
}
Modified: turbine/fulcrum/trunk/localization/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/localization/src/site/site.xml?rev=1890800&r1=1890799&r2=1890800&view=diff
==============================================================================
--- turbine/fulcrum/trunk/localization/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/localization/src/site/site.xml Tue Jun 15 08:33:26
2021
@@ -22,9 +22,22 @@
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0
http://maven.apache.org/xsd/decoration-1.4.0.xsd";
name="Fulcrum Localization">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.9</version>
+ </skin>
+
<body>
<menu name="Overview">
<item name="Main" href="/index.html"/>
</menu>
</body>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>false</topBarEnabled>
+ <sideBarEnabled>true</sideBarEnabled>
+ </fluidoSkin>
+ </custom>
</project>
Modified: turbine/fulcrum/trunk/parser/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/site/site.xml?rev=1890800&r1=1890799&r2=1890800&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/parser/src/site/site.xml Tue Jun 15 08:33:26 2021
@@ -25,7 +25,7 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
</skin>
<body>
Modified: turbine/fulcrum/trunk/pool/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pool/src/site/site.xml?rev=1890800&r1=1890799&r2=1890800&view=diff
==============================================================================
--- turbine/fulcrum/trunk/pool/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/pool/src/site/site.xml Tue Jun 15 08:33:26 2021
@@ -21,9 +21,23 @@
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 Pool">
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.9</version>
+ </skin>
+
<body>
<menu name="Overview">
<item name="Main" href="/index.html"/>
</menu>
</body>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>false</topBarEnabled>
+ <sideBarEnabled>true</sideBarEnabled>
+ </fluidoSkin>
+ </custom>
</project>
Modified: turbine/fulcrum/trunk/quartz/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/src/site/site.xml?rev=1890800&r1=1890799&r2=1890800&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/quartz/src/site/site.xml Tue Jun 15 08:33:26 2021
@@ -21,11 +21,25 @@
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 Quartz Service">
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.9</version>
+ </skin>
+
<body>
<menu name="Overview">
- <item name="About" href="/index.html"/>
- <item name="Configuration" href="/configuration.html"/>
- <item name="Cron Samples" href="/cronsamples.html"/>
+ <item name="About" href="index.html"/>
+ <item name="Configuration" href="configuration.html"/>
+ <item name="Cron Samples" href="cronsamples.html"/>
</menu>
- </body>
+ </body>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>false</topBarEnabled>
+ <sideBarEnabled>true</sideBarEnabled>
+ </fluidoSkin>
+ </custom>
</project>
Modified: turbine/fulcrum/trunk/security/api/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/site/site.xml?rev=1890800&r1=1890799&r2=1890800&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/security/api/src/site/site.xml Tue Jun 15 08:33:26
2021
@@ -18,20 +18,21 @@
under the License.
-->
<project name="Fulcrum Security API">
- <skin>
+
+ <skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.9</version>
</skin>
-<body>
-</body>
+ <body>
+ </body>
-<custom>
- <fluidoSkin>
- <topBarEnabled>false</topBarEnabled>
- <sideBarEnabled>true</sideBarEnabled>
- </fluidoSkin>
- </custom>
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>false</topBarEnabled>
+ <sideBarEnabled>true</sideBarEnabled>
+ </fluidoSkin>
+ </custom>
</project>
Modified: turbine/fulcrum/trunk/site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/site/src/site/site.xml?rev=1890800&r1=1890799&r2=1890800&view=diff
==============================================================================
--- turbine/fulcrum/trunk/site/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/site/src/site/site.xml Tue Jun 15 08:33:26 2021
@@ -32,7 +32,7 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
</skin>
<body>
@@ -86,12 +86,12 @@
<item name="Configuration" href="/fulcrum-configuration-impl/"/>
<item name="DVSL" href="/fulcrum-dvsl/"/>
<item name="Groovy" href="/fulcrum-groovy/"/>
- <item name="Jetty" href="/fulcrum-jetty/"/>
- <item name="Naming" href="/fulcrum-naming/"/>
- <item name="OSWorkflow" href="/sites/osworkflow.html"
collapse="true">
- <item name="OSWorkflow" href="/fulcrum-osworkflow/"/>
- <item name="OSWorkflow Example"
href="/fulcrum-osworkflow-example/"/>
- </item>
+ <item name="Jetty" href="/fulcrum-jetty/"/>
+ <item name="Naming" href="/fulcrum-naming/"/>
+ <item name="OSWorkflow" href="/sites/osworkflow.html"
collapse="true">
+ <item name="OSWorkflow" href="/fulcrum-osworkflow/"/>
+ <item name="OSWorkflow Example"
href="/fulcrum-osworkflow-example/"/>
+ </item>
<item name="XMLRPC" href="/fulcrum-xmlrpc/"/>
</menu>
Modified: turbine/fulcrum/trunk/testcontainer/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/site/site.xml?rev=1890800&r1=1890799&r2=1890800&view=diff
==============================================================================
--- turbine/fulcrum/trunk/testcontainer/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/testcontainer/src/site/site.xml Tue Jun 15 08:33:26
2021
@@ -21,7 +21,7 @@
<version position="left" />
<publishDate format="dd MMM yyyy"/>
- <skin>
+ <skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.9</version>
Modified: turbine/fulcrum/trunk/upload/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/upload/src/site/site.xml?rev=1890800&r1=1890799&r2=1890800&view=diff
==============================================================================
--- turbine/fulcrum/trunk/upload/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/upload/src/site/site.xml Tue Jun 15 08:33:26 2021
@@ -21,10 +21,24 @@
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 Upload">
-
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.9</version>
+ </skin>
+
+
<body>
<menu name="Overview">
<item name="Main" href="/index.html"/>
</menu>
</body>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>false</topBarEnabled>
+ <sideBarEnabled>true</sideBarEnabled>
+ </fluidoSkin>
+ </custom>
</project>
Modified: turbine/fulcrum/trunk/yaafi-crypto/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi-crypto/src/site/site.xml?rev=1890800&r1=1890799&r2=1890800&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi-crypto/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/yaafi-crypto/src/site/site.xml Tue Jun 15 08:33:26
2021
@@ -21,6 +21,13 @@
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 YAAFI Crypto Library">
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.9</version>
+ </skin>
+
<body>
<menu name="Overview">
<item name="Overview" href="/index.html"/>
@@ -29,4 +36,11 @@
</menu>
<menu ref="reports"></menu>
</body>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>false</topBarEnabled>
+ <sideBarEnabled>true</sideBarEnabled>
+ </fluidoSkin>
+ </custom>
</project>
