|
From: <fg...@us...> - 2008-01-20 16:50:14
|
Revision: 530
http://openutils.svn.sourceforge.net/openutils/?rev=530&view=rev
Author: fgiust
Date: 2008-01-20 08:50:15 -0800 (Sun, 20 Jan 2008)
Log Message:
-----------
new skin
Modified Paths:
--------------
trunk/openutils-backup/src/site/site.xml
trunk/openutils-bshd5/pom.xml
trunk/openutils-bshd5/src/site/site.xml
trunk/openutils-configuration-dataobjects/pom.xml
trunk/openutils-configuration-dataobjects/src/site/site.xml
trunk/openutils-configuration-services/pom.xml
trunk/openutils-configuration-services/src/site/site.xml
trunk/openutils-dbmigration/src/site/site.xml
trunk/openutils-deployment/pom.xml
trunk/openutils-deployment/src/site/site.xml
trunk/openutils-hibernate-security/pom.xml
trunk/openutils-hibernate-security/src/site/site.xml
trunk/openutils-log4j/src/site/apt/index.apt
trunk/openutils-log4j/src/site/site.xml
trunk/openutils-mgnlspring/pom.xml
trunk/openutils-mgnlspring/src/site/site.xml
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java
trunk/openutils-spring/pom.xml
trunk/openutils-spring/src/site/site.xml
trunk/openutils-spring-rmibernate/pom.xml
trunk/openutils-tags-spring/pom.xml
trunk/openutils-tags-spring/src/site/site.xml
trunk/openutils-testing/pom.xml
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-junit/src/site/site.xml
trunk/openutils-testing-junit-dwr/pom.xml
trunk/openutils-testing-junit-dwr/src/site/site.xml
trunk/openutils-testing-testng/pom.xml
trunk/openutils-testing-testng/src/site/site.xml
trunk/openutils-testing-testng-dwr/pom.xml
trunk/openutils-testing-testng-dwr/src/site/site.xml
trunk/openutils-usermanagement/pom.xml
trunk/openutils-usermanagement/src/site/site.xml
trunk/openutils-usermanagement-dataobjects/pom.xml
trunk/openutils-usermanagement-dataobjects/src/site/site.xml
trunk/openutils-web/src/site/site.xml
trunk/pom.xml
trunk/src/site/site.xml
Added Paths:
-----------
trunk/openutils-maven-skin/
trunk/openutils-maven-skin/pom.xml
trunk/openutils-maven-skin/src/
trunk/openutils-maven-skin/src/main/
trunk/openutils-maven-skin/src/main/resources/
trunk/openutils-maven-skin/src/main/resources/META-INF/
trunk/openutils-maven-skin/src/main/resources/META-INF/maven/
trunk/openutils-maven-skin/src/main/resources/META-INF/maven/site.vm
trunk/openutils-maven-skin/src/main/resources/css/
trunk/openutils-maven-skin/src/main/resources/css/site.css
trunk/openutils-maven-skin/src/main/resources/images/
trunk/openutils-maven-skin/src/main/resources/images/back.png
trunk/openutils-maven-skin/src/main/resources/images/breadcrumbs.png
trunk/openutils-maven-skin/src/main/resources/images/favicon.ico
trunk/openutils-maven-skin/src/main/resources/images/footer-background.png
trunk/openutils-maven-skin/src/main/resources/images/header-background.png
trunk/openutils-maven-skin/src/main/resources/images/ico_collapsed.png
trunk/openutils-maven-skin/src/main/resources/images/ico_expanded.png
trunk/openutils-maven-skin/src/main/resources/images/ico_external.png
trunk/openutils-maven-skin/src/main/resources/images/ico_file_pdf.png
trunk/openutils-maven-skin/src/main/resources/images/ico_newwindow.png
trunk/openutils-maven-skin/src/main/resources/images/list.png
trunk/openutils-maven-skin/src/main/resources/images/openmind-logo.png
trunk/openutils-maven-skin/src/main/resources/images/openutils-logo.png
trunk/openutils-mgnlstripes/src/site/site.xml
trunk/openutils-testing/src/site/
trunk/openutils-testing/src/site/apt/
trunk/openutils-testing-testng/derby.log
Removed Paths:
-------------
trunk/openutils-bshd5/src/site/resources/
trunk/openutils-deployment/src/site/resources/
trunk/openutils-log4j/src/site/resources/css/
trunk/openutils-spring/src/site/resources/
trunk/src/site/resources/css/
trunk/src/site/resources/favicon.ico
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- openutils-springjsp
target
+ openutils-springjsp
target
eclipse.log
Modified: trunk/openutils-backup/src/site/site.xml
===================================================================
--- trunk/openutils-backup/src/site/site.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-backup/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -13,7 +13,11 @@
<menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
<head>
- <style type="text/css" media="all">@import url(../css/site.css);</style>
+ <link rel="icon" href="images/favicon.ico" />
</head>
</body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ </skin>
</project>
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-bshd5/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -110,6 +110,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5</spring.version>
+ <spring.version>2.5.1</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-bshd5/src/site/site.xml
===================================================================
--- trunk/openutils-bshd5/src/site/site.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-bshd5/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -1,19 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils bshd5">
+ <publishDate position="left" format="yyyy-MM-dd" />
<bannerRight>
<name>Openutils</name>
+ <src>http://openutils.sourceforge.net/images/openutils-logo.png</src>
<href>http://openutils.sourceforge.net</href>
</bannerRight>
<bannerLeft>
<name>Sourceforge</name>
<src>http://sourceforge.net/sflogo.php?group_id=150467&amp;type=2</src>
- <href>http://openutils.sourceforge.net</href>
+ <href>http://www.sourceforge.net/projects/openutils</href>
</bannerLeft>
<body>
<menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
<head>
- <style type="text/css" media="all">@import url(../css/site.css);</style>
+ <link rel="icon" href="images/favicon.ico" />
</head>
</body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ </skin>
</project>
Modified: trunk/openutils-configuration-dataobjects/pom.xml
===================================================================
--- trunk/openutils-configuration-dataobjects/pom.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-configuration-dataobjects/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -9,7 +9,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-configuration-dataobjects</artifactId>
<packaging>jar</packaging>
- <name>openutils-configuration-dataobjects</name>
+ <name>openutils configuration dataobjects</name>
<version>0.2-SNAPSHOT</version>
<description>Configuration dataobjects</description>
<dependencies>
Modified: trunk/openutils-configuration-dataobjects/src/site/site.xml
===================================================================
--- trunk/openutils-configuration-dataobjects/src/site/site.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-configuration-dataobjects/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -13,7 +13,11 @@
<menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
<head>
- <style type="text/css" media="all">@import url(../css/site.css);</style>
+ <link rel="icon" href="images/favicon.ico" />
</head>
</body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ </skin>
</project>
Modified: trunk/openutils-configuration-services/pom.xml
===================================================================
--- trunk/openutils-configuration-services/pom.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-configuration-services/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -10,7 +10,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-configuration-services</artifactId>
<packaging>jar</packaging>
- <name>openutils-configuration</name>
+ <name>openutils configuration services</name>
<version>0.2-SNAPSHOT</version>
<description>Configuration services</description>
<build>
@@ -27,23 +27,23 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-spring</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-configuration-dataobjects</artifactId>
- <version>0.1</version>
+ <version>0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-bshd5</artifactId>
- <version>1.0.10-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing-testng</artifactId>
- <version>1.1.4-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -99,30 +99,6 @@
<version>2.3</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.2.2.0</version>
@@ -150,6 +126,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5</spring.version>
+ <spring.version>2.5.1</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-configuration-services/src/site/site.xml
===================================================================
--- trunk/openutils-configuration-services/src/site/site.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-configuration-services/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -13,7 +13,11 @@
<menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
<head>
- <style type="text/css" media="all">@import url(../css/site.css);</style>
+ <link rel="icon" href="images/favicon.ico" />
</head>
</body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ </skin>
</project>
Modified: trunk/openutils-dbmigration/src/site/site.xml
===================================================================
--- trunk/openutils-dbmigration/src/site/site.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-dbmigration/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -13,7 +13,11 @@
<menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
<head>
- <style type="text/css" media="all">@import url(../css/site.css);</style>
+ <link rel="icon" href="images/favicon.ico" />
</head>
</body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ </skin>
</project>
Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-deployment/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -9,7 +9,7 @@
</parent>
<artifactId>openutils-deployment</artifactId>
<name>openutils deployment tools</name>
- <version>1.0.11-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<description />
<dependencies>
<dependency>
@@ -66,6 +66,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5</spring.version>
+ <spring.version>2.5.1</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-deployment/src/site/site.xml
===================================================================
--- trunk/openutils-deployment/src/site/site.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-deployment/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -13,7 +13,11 @@
<menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
<head>
- <style type="text/css" media="all">@import url(../css/site.css);</style>
+ <link rel="icon" href="images/favicon.ico" />
</head>
</body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ </skin>
</project>
Modified: trunk/openutils-hibernate-security/pom.xml
===================================================================
--- trunk/openutils-hibernate-security/pom.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-hibernate-security/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-hibernate-security</artifactId>
- <name>openutils-hibernate-security</name>
+ <name>openutils hibernate security</name>
<version>0.0.3-SNAPSHOT</version>
<description>Hibernate Security classes</description>
<dependencies>
@@ -96,22 +96,22 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-usermanagement</artifactId>
- <version>1.1.1</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-usermanagement-dataobjects</artifactId>
- <version>1.1.1</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-bshd5</artifactId>
- <version>1.0.9</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing-junit</artifactId>
- <version>1.1.3</version>
+ <version>2.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -173,7 +173,7 @@
<dependency>
<groupId>org.acegisecurity</groupId>
<artifactId>acegi-security</artifactId>
- <version>1.0.3</version>
+ <version>1.0.6</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -191,14 +191,6 @@
<artifactId>spring-support</artifactId>
<groupId>org.springframework</groupId>
</exclusion>
- <exclusion>
- <artifactId>logkit</artifactId>
- <groupId>logkit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>avalon-framework</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -221,7 +213,7 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5</spring.version>
+ <spring.version>2.5.1</spring.version>
<aspectj.version>1.5.3</aspectj.version>
</properties>
</project>
Modified: trunk/openutils-hibernate-security/src/site/site.xml
===================================================================
--- trunk/openutils-hibernate-security/src/site/site.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-hibernate-security/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -13,7 +13,11 @@
<menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
<head>
- <style type="text/css" media="all">@import url(../css/site.css);</style>
+ <link rel="icon" href="images/favicon.ico" />
</head>
</body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ </skin>
</project>
Modified: trunk/openutils-log4j/src/site/apt/index.apt
===================================================================
--- trunk/openutils-log4j/src/site/apt/index.apt 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-log4j/src/site/apt/index.apt 2008-01-20 16:50:15 UTC (rev 530)
@@ -27,6 +27,6 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-log4j</artifactId>
- <version>1.0</version>
+ <version>${project.version}</version>
</dependency>
+----------------------------------------------+
\ No newline at end of file
Modified: trunk/openutils-log4j/src/site/site.xml
===================================================================
--- trunk/openutils-log4j/src/site/site.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-log4j/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils log4j">
+ <publishDate position="left" format="yyyy-MM-dd" />
<bannerRight>
<name>Openutils</name>
+ <src>http://openutils.sourceforge.net/images/openutils-logo.png</src>
<href>http://openutils.sourceforge.net</href>
</bannerRight>
<bannerLeft>
@@ -10,14 +12,22 @@
<href>http://www.sourceforge.net/projects/openutils</href>
</bannerLeft>
<body>
- <menu name="Guide">
- <item name="smtp appender" href="smtpappender.html" />
- <item name="filtered layout" href="filteredlayout.html" />
- <item name="configuration servlet" href="servlet.html" />
+ <head>
+ <link rel="icon" href="images/favicon.ico" />
+ </head>
+ <menu name="openutils-log4j">
+ <item name="Usage" href="index.html">
+ <item name="smtp appender" href="smtpappender.html" />
+ <item name="filtered layout" href="filteredlayout.html" />
+ <item name="configuration servlet" href="servlet.html" />
+ </item>
</menu>
+ <menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
- <head>
- <style type="text/css" media="all">@import url(../css/site.css);</style>
- </head>
</body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </skin>
</project>
Property changes on: trunk/openutils-maven-skin
___________________________________________________________________
Name: svn:ignore
+ .settings
.checkstyle
target
.classpath
.project
Added: trunk/openutils-maven-skin/pom.xml
===================================================================
--- trunk/openutils-maven-skin/pom.xml (rev 0)
+++ trunk/openutils-maven-skin/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>5</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-maven-skin</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>maven skin for openutils site</name>
+ <description>maven skin for openutils site</description>
+</project>
Property changes on: trunk/openutils-maven-skin/pom.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/openutils-maven-skin/src/main/resources/META-INF/maven/site.vm
===================================================================
--- trunk/openutils-maven-skin/src/main/resources/META-INF/maven/site.vm (rev 0)
+++ trunk/openutils-maven-skin/src/main/resources/META-INF/maven/site.vm 2008-01-20 16:50:15 UTC (rev 530)
@@ -0,0 +1,376 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+#macro ( link $href $name )
+ #if ( ( $href.toLowerCase().startsWith("http") || $href.toLowerCase().startsWith("https") ) )
+ <a href="$href" class="externalLink">$name</a>
+ #else
+ <a href="$href">$name</a>
+ #end
+#end
+
+#macro ( banner $banner $id )
+ #if ( $banner )
+ #if( $banner.href )
+ <a href="$banner.href" id="$id" #if( $banner.alt ) title="$banner.alt" #end >
+ #else
+ <div id="$id">
+ #end
+
+ #if( $banner.src )
+ #set ( $src = $banner.src )
+ #if ( ! ( $src.toLowerCase().startsWith("http") || $src.toLowerCase().startsWith("https") ) )
+ #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
+ #set ( $src = $src.replaceAll( "\\", "/" ) )
+ #end
+ #if ( $banner.alt )
+ #set ( $alt = $banner.alt )
+ #else
+ #set ( $alt = $banner.name )
+ #end
+ <img src="$src" alt="$alt" />
+ #else
+ $banner.name
+ #end
+
+ #if( $banner.href )
+ </a>
+ #else
+ </div>
+ #end
+ #end
+#end
+
+#macro ( links $links )
+ #set ( $counter = 0 )
+ #foreach( $item in $links )
+ #set ( $counter = $counter + 1 )
+ #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+ #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+ #link( $currentItemHref $item.name )
+ #if ( $links.size() > $counter )
+ |
+ #end
+ #end
+#end
+
+#macro ( breadcrumbs $breadcrumbs )
+ #set ( $counter = 0 )
+ #foreach( $item in $breadcrumbs )
+ #set ( $counter = $counter + 1 )
+ #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+ #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+
+ #if ( $currentItemHref == $alignedFileName || $currentItemHref == "" )
+ $item.name
+ #else
+ #link( $currentItemHref $item.name )
+ #end
+ #if ( $breadcrumbs.size() > $counter )
+ >
+ #end
+ #end
+#end
+
+#macro ( displayTree $display $item )
+ #if ( $item && $item.items && $item.items.size() > 0 )
+ #foreach( $subitem in $item.items )
+ #set ( $subitemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
+ #set ( $subitemHref = $subitemHref.replaceAll( "\\", "/" ) )
+ #set ( $display = false )
+ #if ( $alignedFileName == $subitemHref )
+ #set ( $display = true )
+ #end
+
+ #displayTree( $display $subitem )
+ #end
+ #end
+#end
+
+#macro ( menuItem $item )
+ #set ( $collapse = "none" )
+ #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+ #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+
+ #if ( $item && $item.items && $item.items.size() > 0 )
+ #if ( $item.collapse == false )
+ #set ( $collapse = "expanded" )
+ #else
+ ## @fgiust
+ ## By default expanded
+ #set ( $collapse = "expanded" )
+ #end
+
+ #set ( $display = false )
+ #displayTree( $display $item )
+
+ #if ( $alignedFileName == $currentItemHref || $display )
+ #set ( $collapse = "expanded" )
+ #end
+ #end
+ <li class="$collapse">
+ #if ( $item.img )
+ #if ( ! ( $item.img.toLowerCase().startsWith("http") || $item.img.toLowerCase().startsWith("https") ) )
+ #set ( $src = $PathTool.calculateLink( $item.img, $relativePath ) )
+ #set ( $src = $src.replaceAll( "\\", "/" ) )
+ <img src="$src"/>
+ #else
+ <img src="$item.img" align="absbottom" style="border-width: 0"/>
+ #end
+ #end
+ #if ( $alignedFileName == $currentItemHref )
+ <strong>$item.name</strong>
+ #else
+ #link( $currentItemHref $item.name )
+ #end
+ #if ( $item && $item.items && $item.items.size() > 0 )
+ #if ( $collapse == "expanded" )
+ <ul>
+ #foreach( $subitem in $item.items )
+ #menuItem( $subitem )
+ #end
+ </ul>
+ #end
+ #end
+ </li>
+#end
+
+#macro ( mainMenu $menus )
+ #foreach( $menu in $menus )
+ #if ( $menu.name )
+ <h5>$menu.name</h5>
+ #end
+ #if ( $menu.items && $menu.items.size() > 0 )
+ <ul>
+ #foreach( $item in $menu.items )
+ #menuItem( $item )
+ #end
+ </ul>
+ #end
+ #end
+#end
+
+#macro ( copyright )
+ #if ( $project )
+ #set ( $currentYear = ${currentDate.year} + 1900 )
+
+ #if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
+ ${project.inceptionYear}-${currentYear}
+ #else
+ ${currentYear}
+ #end
+
+ #if ( ${project.organization} && ${project.organization.name} )
+ ${project.organization.name}
+ #end
+ #end
+#end
+
+#macro ( publishDate $position $publishDate $version )
+ #if ( $publishDate && $publishDate.format )
+ #set ( $format = $publishDate.format )
+ #else
+ #set ( $format = "yyyy-MM-dd" )
+ #end
+
+ $dateFormat.applyPattern( $format )
+
+ #set ( $dateToday = $dateFormat.format( $currentDate ) )
+
+ #if ( $publishDate && $publishDate.position )
+ #set ( $datePosition = $publishDate.position )
+ #else
+ #set ( $datePosition = "left" )
+ #end
+
+ #if ( $version )
+ #if ( $version.position )
+ #set ( $versionPosition = $version.position )
+ #else
+ #set ( $versionPosition = "left" )
+ #end
+ #else
+ #set ( $version = "" )
+ #set ( $versionPosition = "left" )
+ #end
+
+ #set ( $breadcrumbs = $decoration.body.breadcrumbs )
+ #set ( $links = $decoration.body.links )
+
+ #if ( $datePosition.equalsIgnoreCase( "right" ) && $links && $links.size() > 0 )
+ #set ( $prefix = " |" )
+ #else
+ #set ( $prefix = "" )
+ #end
+
+ #if ( $datePosition.equalsIgnoreCase( $position ) )
+ #if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
+ $prefix $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
+ #if ( $versionPosition.equalsIgnoreCase( $position ) )
+ | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ #end
+ #elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $datePosition.equalsIgnoreCase( "navigation-top" ) ) )
+ <div id="lastPublished">
+ $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
+ #if ( $versionPosition.equalsIgnoreCase( $position ) )
+ | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ #end
+ </div>
+ #elseif ( $datePosition.equalsIgnoreCase("left") )
+ <div class="xleft">
+ $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
+ #if ( $versionPosition.equalsIgnoreCase( $position ) )
+ | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ #end
+ #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+ | #breadcrumbs( $breadcrumbs )
+ #end
+ </div>
+ #end
+ #elseif ( $versionPosition.equalsIgnoreCase( $position ) )
+ #if ( ( $versionPosition.equalsIgnoreCase( "right" ) ) || ( $versionPosition.equalsIgnoreCase( "bottom" ) ) )
+ $prefix $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ #elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
+ <div id="lastPublished">
+ $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ </div>
+ #elseif ( $versionPosition.equalsIgnoreCase("left") )
+ <div class="xleft">
+ $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+ | #breadcrumbs( $breadcrumbs )
+ #end
+ </div>
+ #end
+ #elseif ( $position.equalsIgnoreCase( "left" ) )
+ #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+ <div class="xleft">
+ #breadcrumbs( $breadcrumbs )
+ </div>
+ #end
+ #end
+#end
+
+#macro ( poweredByLogo $poweredBy )
+ #if( $poweredBy )
+ #foreach ($item in $poweredBy)
+ #if( $item.href )
+ #set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
+ #set ( $href = $href.replaceAll( "\\", "/" ) )
+ #else
+ #set ( $href="http://maven.apache.org/" )
+ #end
+
+ #if( $item.name )
+ #set ( $name = $item.name )
+ #else
+ #set ( $name = $i18n.getString( "site-renderer", $locale, "template.builtby" ) )
+ #set ( $name = "${name} Maven" )
+ #end
+
+ #if( $item.img )
+ #set ( $img = $item.img )
+ #else
+ #set ( $img = "images/logos/maven-feather.png" )
+ #end
+
+ <a href="$href" title="$name" class="poweredBy">
+ #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
+ #set ( $img = $img.replaceAll( "\\", "/" ) )
+ <img class="poweredBy"
+ alt="$name"
+ src="$img"
+ width="90"
+ height="30"
+ />
+ </a>
+ #end
+ #if( $poweredBy.isEmpty() )
+ <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
+ <img class="poweredBy"
+ alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven"
+ src="$relativePath/images/logos/maven-feather.png"
+ width="90"
+ height="30"
+ border="1" />
+ </a>
+ #end
+ #else
+ <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
+ <img class="poweredBy"
+ alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven"
+ src="$relativePath/images/logos/maven-feather.png"
+ width="90"
+ height="30"
+ border="1"
+ />
+ </a>
+ #end
+#end
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>$title</title>
+ <style type="text/css" media="all">
+ @import url("$relativePath/css/maven-base.css");
+ @import url("$relativePath/css/maven-theme.css");
+ @import url("$relativePath/css/site.css");
+ </style>
+ <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" />
+ #foreach( $author in $authors )
+ <meta name="author" content="$author" />
+ #end
+ <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
+ #if ( $decoration.body.head )
+ #foreach( $item in $decoration.body.head.getChildren() )
+ ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
+ ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
+ ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
+ #set ( $documentHeader = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" )
+ #set ( $documentHeader = $documentHeader.replaceAll( "\\", "" ) )
+ #if ( $item.name == "script" )
+ $StringUtils.replace( $item.toUnescapedString(), $documentHeader, "" )
+ #else
+ $StringUtils.replace( $item.toString(), $documentHeader, "" )
+ #end
+ #end
+ #end
+ </head>
+ <body class="composite">
+ <div id="banner">
+ #banner( $decoration.bannerLeft "bannerLeft" )
+ #banner( $decoration.bannerRight "bannerRight" )
+ <div class="clear">
+ <hr/>
+ </div>
+ </div>
+ <div id="breadcrumbs">
+ #publishDate( "left" $decoration.publishDate $decoration.version )
+ <div class="xright">#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate $decoration.version )</div>
+ <div class="clear">
+ <hr/>
+ </div>
+ </div>
+ <div id="leftColumn">
+ <div id="navcolumn">
+ #publishDate( "navigation-top" $decoration.publishDate $decoration.version )
+ #mainMenu( $decoration.body.menus )
+ #poweredByLogo( $decoration.poweredBy )
+ #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
+ </div>
+ </div>
+ <div id="bodyColumn">
+ <div id="contentBox">
+ $bodyContent
+ </div>
+ </div>
+ <div class="clear">
+ <hr/>
+ </div>
+ <div id="footer">
+ <div class="xright">©#copyright()#publishDate( "bottom" $decoration.publishDate $decoration.version )</div>
+ <div class="clear">
+ <hr/>
+ </div>
+ </div>
+ </body>
+</html>
Added: trunk/openutils-maven-skin/src/main/resources/css/site.css
===================================================================
--- trunk/openutils-maven-skin/src/main/resources/css/site.css (rev 0)
+++ trunk/openutils-maven-skin/src/main/resources/css/site.css 2008-01-20 16:50:15 UTC (rev 530)
@@ -0,0 +1,306 @@
+body {
+ background-color: #1B87CA;
+ font-family: Verdana, Helvetica, Arial, sans-serif;
+ margin-left: auto;
+ margin-right: auto;
+ background-repeat: repeat-y;
+ font-size: 13px;
+ padding: 0px;
+}
+
+#leftColumn {
+ width: 170px;
+ float: left;
+}
+
+#bodyColumn {
+ margin-right: 0 !important;
+ margin-left: 0;
+ min-height: 600px;
+ background-color: #fff;
+ padding-left: 207px;
+ padding-right: 10px;
+}
+
+td,select,input,li {
+ font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-size: 12px;
+ color: #333;
+}
+
+code {
+ font-size: 12px;
+}
+
+a {
+ text-decoration: underline;
+}
+
+#leftColumn a {
+ text-decoration: none;
+}
+
+a:link {
+ color: #47a;
+}
+
+a:visited {
+ color: #666;
+}
+
+a:active,a:hover {
+ color: #900;
+}
+
+#legend li.externalLink {
+ background: url(../images/ico_external.png) left top no-repeat;
+ padding-left: 10px;
+}
+
+a.externalLink,a.externalLink:link,a.externalLink:visited,a.externalLink:active,a.externalLink:hover {
+ background: url(../images/ico_external.png) right center no-repeat;
+ padding-right: 10px;
+}
+
+#legend li.newWindow {
+ background: url(../images/ico_newwindow.png) left top no-repeat;
+ padding-left: 10px;
+}
+
+a.newWindow,a.newWindow:link,a.newWindow:visited,a.newWindow:active,a.newWindow:hover {
+ background: url(../images/ico_newwindow.png) right center no-repeat;
+ padding-right: 10px;
+}
+
+h2 {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 28px;
+ color: #666;
+ background: none;
+ font-weight: normal;
+ padding-left: 0;
+ border: none;
+ border-bottom: 1px dotted #ccc;
+}
+
+h3 {
+ font-family: Arial, Helvetica, sans-serif;
+ padding: 4px 4px 4px 0;
+ color: #999 !important;
+ background: none;
+ font-weight: none;
+ font-size: 20px;
+ border: none;
+ border-bottom: 1px dotted #ccc;
+}
+
+p {
+ line-height: 1.3em;
+ font-size: 12px;
+ color: #000;
+}
+
+#breadcrumbs {
+ overflow: hidden;
+ padding: 4px 10px 4px 20px;
+ background-image: url(../images/breadcrumbs.png);
+ background-repeat: repeat-x;
+ border: none;
+ background-color: #fff !important;
+}
+
+#breadcrumbs a {
+ font-weight: bold;
+ color: #999;
+ text-decoration: underline;
+}
+
+#leftColumn {
+ margin: 10px 0 10px 10px;
+ border: 1px solid #6bb521;
+ padding-right: 0;
+ padding-left: 0;
+ width: 180px;
+ background-color: #efc;
+}
+
+#navcolumn {
+ margin: 0 !important;
+ padding: 0 !important;
+}
+
+#navcolumn h5 {
+ font-size: 11px;
+ padding: 1px 0 1px 12px;
+ color: #fff;
+ background-position: left 5px;
+ font-variant: small-caps;
+ border: none;
+ border-bottom: 1px solid #ccc;
+ background-color: #6bb521;
+}
+
+table.bodyTable th {
+ color: white;
+ background-color: #1B87CA;
+ text-align: left;
+ font-weight: normal;
+}
+
+table.bodyTable th,table.bodyTable td {
+ font-size: 11px;
+}
+
+table.bodyTable tr.a {
+ background-color: #ddd;
+}
+
+table.bodyTable tr.b {
+ background-color: #eee;
+}
+
+.source {
+ border: 1px solid #999;
+ overflow: auto;
+ background-color: #eee;
+}
+
+dt {
+ padding: 4px 4px 4px 24px;
+ color: #333333;
+ background-color: #ccc;
+ font-weight: bold;
+ font-size: 14px;
+}
+
+.subsectionTitle {
+ font-size: 13px;
+ font-weight: bold;
+ color: #666;
+}
+
+table {
+ font-size: 10px;
+}
+
+.xright a:link,.xright a:visited,.xright a:active {
+ color: #666;
+}
+
+.xright a:hover {
+ color: #003300;
+}
+
+#banner {
+ height: 93px;
+ background-color: #fff;
+ background-image: url(../images/header-background.png);
+}
+
+#banner a#bannerRight img {
+ margin: 10px 10px 0 0 !important;
+}
+
+#banner a#bannerLeft img {
+ margin: 10px 0 0 10px !important;
+}
+
+#navcolumn ul {
+ margin: 3px 0 5px -0em;
+}
+
+#navcolumn ul a {
+ color: #333333;
+}
+
+#navcolumn ul a:hover {
+ color: red;
+}
+
+#navcolumn ul li {
+ background-image: url(../images/list.png);
+ background-position: top left;
+}
+
+#navcolumn ul li.expanded {
+ background-image: none;
+ font-weight: bold;
+ color: #666;
+}
+
+#navcolumn ul li.expanded ul {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+
+#navcolumn ul li.expanded ul li {
+ font-weight: normal;
+}
+
+#intro {
+ border: solid #ccc 1px;
+ margin: 6px 0px 0px 0px;
+ padding: 10px 40px 10px 40px;
+}
+
+.subsection {
+ margin-left: 3px;
+ color: #333333;
+}
+
+.subsection p {
+ font-size: 12px;
+}
+
+#footer {
+ padding: 10px;
+ margin: 0 0px 20px 0px;
+ border-top: solid #ccc 1px;
+ color: #fff;
+ background-color: #1B87CA;
+ background-image: url(../images/footer-background.png);
+ background-repeat: repeat-x;
+}
+
+#footer div {
+ color: #fff;
+}
+
+dl {
+ border: 1px dotted #ccc;
+ background-color: transparent;
+}
+
+dt {
+ background-color: transparent;
+ font-family: Arial, Helvetica, sans-serif;
+ color: #999 !important;
+ font-weight: bold;
+ font-size: 16px;
+}
+
+hr {
+ border: none;
+ border-bottom: 1px solid #ccc;
+ background-color: transparent;
+ height: 1px;
+}
+
+#breadcrumbs,#footer,#navcolumn li {
+ font-size: 10px;
+}
+
+a.poweredBy {
+ margin-left: 20px;
+}
+
+.source {
+ margin: 10px 0;
+ padding: 12px;
+ border: 1px solid #1B87CA;
+}
+
+#navcolumn li.collapsed {
+ background-image: url(../images/ico-collapsed.png);
+}
+
Property changes on: trunk/openutils-maven-skin/src/main/resources/css/site.css
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/openutils-maven-skin/src/main/resources/images/back.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-maven-skin/src/main/resources/images/back.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/openutils-maven-skin/src/main/resources/images/breadcrumbs.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-maven-skin/src/main/resources/images/breadcrumbs.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/openutils-maven-skin/src/main/resources/images/favicon.ico
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-maven-skin/src/main/resources/images/favicon.ico
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/openutils-maven-skin/src/main/resources/images/footer-background.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-maven-skin/src/main/resources/images/footer-background.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/openutils-maven-skin/src/main/resources/images/header-background.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-maven-skin/src/main/resources/images/header-background.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/openutils-maven-skin/src/main/resources/images/ico_collapsed.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-maven-skin/src/main/resources/images/ico_collapsed.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/openutils-maven-skin/src/main/resources/images/ico_expanded.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-maven-skin/src/main/resources/images/ico_expanded.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/openutils-maven-skin/src/main/resources/images/ico_external.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-maven-skin/src/main/resources/images/ico_external.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/openutils-maven-skin/src/main/resources/images/ico_file_pdf.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-maven-skin/src/main/resources/images/ico_file_pdf.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/openutils-maven-skin/src/main/resources/images/ico_newwindow.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-maven-skin/src/main/resources/images/ico_newwindow.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/openutils-maven-skin/src/main/resources/images/list.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-maven-skin/src/main/resources/images/list.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/openutils-maven-skin/src/main/resources/images/openmind-logo.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-maven-skin/src/main/resources/images/openmind-logo.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ image/png
Added: trunk/openutils-maven-skin/src/main/resources/images/openutils-logo.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-maven-skin/src/main/resources/images/openutils-logo.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ image/png
Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-mgnlspring/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -46,6 +46,17 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
<version>3.0.2</version>
@@ -97,6 +108,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5</spring.version>
+ <spring.version>2.5.1</spring.version>
</properties>
</project>
Modified: trunk/openutils-mgnlspring/src/site/site.xml
===================================================================
--- trunk/openutils-mgnlspring/src/site/site.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-mgnlspring/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -13,7 +13,11 @@
<menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
<head>
- <style type="text/css" media="all">@import url(../css/site.css);</style>
+ <link rel="icon" href="images/favicon.ico" />
</head>
</body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ </skin>
</project>
Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java 2008-01-20 16:50:15 UTC (rev 530)
@@ -6,8 +6,11 @@
import info.magnolia.voting.Voter;
import info.magnolia.voting.Voting;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
+import net.sourceforge.stripes.config.Configuration;
import net.sourceforge.stripes.controller.StripesFilter;
import net.sourceforge.stripes.controller.StripesRequestWrapper;
import net.sourceforge.stripes.exception.StripesServletException;
@@ -17,7 +20,7 @@
/**
* @author fgiust
- * @version $Id: $
+ * @version $Id$
*/
public class StripesMagnoliaFilter extends StripesFilter implements MgnlFilter
{
@@ -72,6 +75,16 @@
}
/**
+ * {@inheritDoc}
+ */
+ @Override
+ public void init(FilterConfig filterConfig) throws ServletException
+ {
+ super.init(filterConfig);
+ filterConfig.getServletContext().setAttribute(Configuration.class.getName(), getConfiguration());
+ }
+
+ /**
* Wraps the HttpServletRequest with a StripesServletRequest. This is done to ensure that any form posts that
* contain file uploads get handled appropriately.
* @param servletRequest the HttpServletRequest handed to the dispatcher by the container
Added: trunk/openutils-mgnlstripes/src/site/site.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/site/site.xml (rev 0)
+++ trunk/openutils-mgnlstripes/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Openutils">
+ <bannerRight>
+ <name>Openutils</name>
+ <href>http://openutils.sourceforge.net</href>
+ </bannerRight>
+ <bannerLeft>
+ <name>Sourceforge</name>
+ <src>http://sourceforge.net/sflogo.php?group_id=150467&amp;type=2</src>
+ <href>http://openutils.sourceforge.net</href>
+ </bannerLeft>
+ <body>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
+ <head>
+ <link rel="icon" href="images/favicon.ico" />
+ </head>
+ </body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ </skin>
+</project>
Property changes on: trunk/openutils-mgnlstripes/src/site/site.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-spring/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -145,6 +145,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5</spring.version>
+ <spring.version>2.5.1</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-spring/src/site/site.xml
===================================================================
--- trunk/openutils-spring/src/site/site.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-spring/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -13,7 +13,11 @@
<menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
<head>
- <style type="text/css" media="all">@import url(../css/site.css);</style>
+ <link rel="icon" href="images/favicon.ico" />
</head>
</body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ </skin>
</project>
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-spring-rmibernate/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -8,7 +8,7 @@
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-spring-rmibernate</artifactId>
- <name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
+ <name>hibernate RMI remote lazy loading</name>
<version>1.0.4-SNAPSHOT</version>
<description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
<dependencies>
@@ -107,6 +107,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5</spring.version>
+ <spring.version>2.5.1</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-tags-spring/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-tags-spring/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -19,7 +19,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>jstl</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.1.2</version>
</dependency>
@@ -98,6 +98,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5</spring.version>
+ <spring.version>2.5.1</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-tags-spring/src/site/site.xml
===================================================================
--- trunk/openutils-tags-spring/src/site/site.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-tags-spring/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -13,7 +13,11 @@
<menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
<head>
- <style type="text/css" media="all">@import url(../css/site.css);</style>
+ <link rel="icon" href="images/favicon.ico" />
</head>
</body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ </skin>
</project>
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-testing/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -60,6 +60,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5</spring.version>
+ <spring.version>2.5.1</spring.version>
</properties>
</project>
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-testing-junit/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -117,6 +117,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5</spring.version>
+ <spring.version>2.5.1</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-testing-junit/src/site/site.xml
===================================================================
--- trunk/openutils-testing-junit/src/site/site.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-testing-junit/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -13,7 +13,11 @@
<menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
<head>
- <style type="text/css" media="all">@import url(../css/site.css);</style>
+ <link rel="icon" href="images/favicon.ico" />
</head>
</body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ </skin>
</project>
Modified: trunk/openutils-testing-junit-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-junit-dwr/pom.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-testing-junit-dwr/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -137,6 +137,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5</spring.version>
+ <spring.version>2.5.1</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-testing-junit-dwr/src/site/site.xml
===================================================================
--- trunk/openutils-testing-junit-dwr/src/site/site.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-testing-junit-dwr/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -13,7 +13,11 @@
<menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
<head>
- <style type="text/css" media="all">@import url(../css/site.css);</style>
+ <link rel="icon" href="images/favicon.ico" />
</head>
</body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ </skin>
</project>
Added: trunk/openutils-testing-testng/derby.log
===================================================================
--- trunk/openutils-testing-testng/derby.log (rev 0)
+++ trunk/openutils-testing-testng/derby.log 2008-01-20 16:50:15 UTC (rev 530)
@@ -0,0 +1,12 @@
+----------------------------------------------------------------
+2008-01-09 22:30:08.630 GMT:
+ Booting Derby version The Apache Software Foundation - Apache Derby - 10.2.2.0 - (485682): instance c013800d-0117-60ac-bb18-00000229e5c0
+on database directory /data/apps/openmind/openutils-trunk/openutils-testing-testng/target/test-db1
+
+Database Class Loader started - derby.database.classpath=''
+----------------------------------------------------------------
+2008-01-09 22:30:09.498 GMT:
+ Booting Derby version The Apache Software Foundation - Apache Derby - 10.2.2.0 - (485682): instance f81e0010-0117-60ac-bb18-00000229e5c0
+on database directory /data/apps/openmind/openutils-trunk/openutils-testing-testng/target/test-db2
+
+Database Class Loader started - derby.database.classpath=''
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-testing-testng/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -180,6 +180,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5</spring.version>
+ <spring.version>2.5.1</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-testing-testng/src/site/site.xml
===================================================================
--- trunk/openutils-testing-testng/src/site/site.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-testing-testng/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -13,7 +13,11 @@
<menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
<head>
- <style type="text/css" media="all">@import url(../css/site.css);</style>
+ <link rel="icon" href="images/favicon.ico" />
</head>
</body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ </skin>
</project>
Modified: trunk/openutils-testing-testng-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-testng-dwr/pom.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-testing-testng-dwr/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -138,6 +138,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5</spring.version>
+ <spring.version>2.5.1</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-testing-testng-dwr/src/site/site.xml
===================================================================
--- trunk/openutils-testing-testng-dwr/src/site/site.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-testing-testng-dwr/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -13,7 +13,11 @@
<menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
<head>
- <style type="text/css" media="all">@import url(../css/site.css);</style>
+ <link rel="icon" href="images/favicon.ico" />
</head>
</body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ </skin>
</project>
Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml 2008-01-20 08:58:09 UTC (rev 529)
+++ trunk/openutils-usermanagement/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
@@ -11,29 +11,29 @@
<artifactId>openutils-usermanagement</artifactId>
<packaging>jar</packaging>
<name>openutils-usermanagement</name>
- <version>1.1.2-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<description>Usermanagement classes</description>
<dependencies>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-spring</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-usermanagement-dataobjects</artifactId>
- <version>1.1.1</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-bshd5</artifactId>
- <version>1.0.10-SNAPSHOT</version>
...
[truncated message content] |