Menu
▾
▴
openutils-svn
|
From: <fg...@us...> - 2007-08-14 12:33:42
|
Revision: 405
http://openutils.svn.sourceforge.net/openutils/?rev=405&view=rev
Author: fgiust
Date: 2007-08-14 05:33:10 -0700 (Tue, 14 Aug 2007)
Log Message:
-----------
cleaning up site and reports
Modified Paths:
--------------
trunk/openutils-bshd5/src/site/site.xml
trunk/openutils-deployment/src/site/site.xml
trunk/openutils-mgnlstripes/pom.xml
trunk/openutils-mgnlstripes/src/site/apt/index.apt
trunk/openutils-spring/src/site/site.xml
trunk/pom.xml
trunk/src/site/apt/index.apt
Added Paths:
-----------
trunk/openutils-backup/src/site/
trunk/openutils-configuration-dataobjects/src/site/
trunk/openutils-configuration-services/src/site/
trunk/openutils-dbmigration/src/site/
trunk/openutils-hibernate-security/src/site/
trunk/openutils-mgnlspring/src/site/
trunk/openutils-mgnlstripes/src/site/changes/
trunk/openutils-tags-spring/src/site/
trunk/openutils-testing-junit/src/site/
trunk/openutils-testing-junit-dwr/src/site/
trunk/openutils-testing-testng/src/site/
trunk/openutils-testing-testng-dwr/src/site/
trunk/openutils-usermanagement/src/site/
trunk/openutils-usermanagement-dataobjects/src/site/
trunk/openutils-web/src/site/
Property Changed:
----------------
trunk/openutils-mgnlstripes/src/site/
Modified: trunk/openutils-bshd5/src/site/site.xml
===================================================================
--- trunk/openutils-bshd5/src/site/site.xml 2007-08-14 07:52:25 UTC (rev 404)
+++ trunk/openutils-bshd5/src/site/site.xml 2007-08-14 12:33:10 UTC (rev 405)
@@ -7,7 +7,13 @@
<bannerLeft>
<name>Sourceforge</name>
<src>http://sourceforge.net/sflogo.php?group_id=150467&amp;type=2</src>
- <href>http://www.sourceforge.net/projects/openutils</href>
+ <href>http://openutils.sourceforge.net</href>
</bannerLeft>
- <body>${reports}</body>
+ <body>
+ <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>
</project>
Modified: trunk/openutils-deployment/src/site/site.xml
===================================================================
--- trunk/openutils-deployment/src/site/site.xml 2007-08-14 07:52:25 UTC (rev 404)
+++ trunk/openutils-deployment/src/site/site.xml 2007-08-14 12:33:10 UTC (rev 405)
@@ -7,7 +7,13 @@
<bannerLeft>
<name>Sourceforge</name>
<src>http://sourceforge.net/sflogo.php?group_id=150467&amp;type=2</src>
- <href>http://www.sourceforge.net/projects/openutils</href>
+ <href>http://openutils.sourceforge.net</href>
</bannerLeft>
- <body>${reports}</body>
+ <body>
+ <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>
</project>
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2007-08-14 07:52:25 UTC (rev 404)
+++ trunk/openutils-mgnlstripes/pom.xml 2007-08-14 12:33:10 UTC (rev 405)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>3</version>
+ <version>4</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Property changes on: trunk/openutils-mgnlstripes/src/site
___________________________________________________________________
Name: svn:ignore
+ site.xml
Modified: trunk/openutils-mgnlstripes/src/site/apt/index.apt
===================================================================
--- trunk/openutils-mgnlstripes/src/site/apt/index.apt 2007-08-14 07:52:25 UTC (rev 404)
+++ trunk/openutils-mgnlstripes/src/site/apt/index.apt 2007-08-14 12:33:10 UTC (rev 405)
@@ -24,7 +24,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlstripes</artifactId>
- <version>0.1</version>
+ <version>0.2</version>
</dependency>
+----------------------------------------------+
Modified: trunk/openutils-spring/src/site/site.xml
===================================================================
--- trunk/openutils-spring/src/site/site.xml 2007-08-14 07:52:25 UTC (rev 404)
+++ trunk/openutils-spring/src/site/site.xml 2007-08-14 12:33:10 UTC (rev 405)
@@ -7,7 +7,13 @@
<bannerLeft>
<name>Sourceforge</name>
<src>http://sourceforge.net/sflogo.php?group_id=150467&amp;type=2</src>
- <href>http://www.sourceforge.net/projects/openutils</href>
+ <href>http://openutils.sourceforge.net</href>
</bannerLeft>
- <body>${reports}</body>
+ <body>
+ <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>
</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-08-14 07:52:25 UTC (rev 404)
+++ trunk/pom.xml 2007-08-14 12:33:10 UTC (rev 405)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
<packaging>pom</packaging>
- <version>3</version>
+ <version>4</version>
<name>openutils</name>
<description>openutils parent POM</description>
<url>http://openutils.sourceforge.net</url>
@@ -156,6 +156,16 @@
</plugin>
<plugin>
<artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <xmlPath>${basedir}/src/site/changes/changes.xml</xmlPath>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
Modified: trunk/src/site/apt/index.apt
===================================================================
--- trunk/src/site/apt/index.apt 2007-08-14 07:52:25 UTC (rev 404)
+++ trunk/src/site/apt/index.apt 2007-08-14 12:33:10 UTC (rev 405)
@@ -11,7 +11,7 @@
Most of the code comes from projects developed at
- [images/openmind-logo.png] openmind
+[images/openmind-logo.png] openmind
{{{http://www.openmindonline.it}http://www.openmindonline.it}}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-08-14 12:35:13
|
Revision: 406
http://openutils.svn.sourceforge.net/openutils/?rev=406&view=rev
Author: fgiust
Date: 2007-08-14 05:35:15 -0700 (Tue, 14 Aug 2007)
Log Message:
-----------
adding site.xml for subprojects
Added Paths:
-----------
trunk/openutils-backup/src/site/site.xml
trunk/openutils-configuration-dataobjects/src/site/site.xml
trunk/openutils-configuration-services/src/site/site.xml
trunk/openutils-dbmigration/src/site/site.xml
trunk/openutils-hibernate-security/src/site/site.xml
trunk/openutils-mgnlspring/src/site/site.xml
trunk/openutils-mgnlstripes/src/site/changes/changes.xml
trunk/openutils-tags-spring/src/site/site.xml
trunk/openutils-testing-junit/src/site/site.xml
trunk/openutils-testing-junit-dwr/src/site/site.xml
trunk/openutils-testing-testng/src/site/site.xml
trunk/openutils-testing-testng-dwr/src/site/site.xml
trunk/openutils-usermanagement/src/site/site.xml
trunk/openutils-usermanagement-dataobjects/src/site/site.xml
trunk/openutils-web/src/site/site.xml
Added: trunk/openutils-backup/src/site/site.xml
===================================================================
--- trunk/openutils-backup/src/site/site.xml (rev 0)
+++ trunk/openutils-backup/src/site/site.xml 2007-08-14 12:35:15 UTC (rev 406)
@@ -0,0 +1,19 @@
+<?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>
+ <style type="text/css" media="all">@import url(../css/site.css);</style>
+ </head>
+ </body>
+</project>
Added: trunk/openutils-configuration-dataobjects/src/site/site.xml
===================================================================
--- trunk/openutils-configuration-dataobjects/src/site/site.xml (rev 0)
+++ trunk/openutils-configuration-dataobjects/src/site/site.xml 2007-08-14 12:35:15 UTC (rev 406)
@@ -0,0 +1,19 @@
+<?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>
+ <style type="text/css" media="all">@import url(../css/site.css);</style>
+ </head>
+ </body>
+</project>
Added: trunk/openutils-configuration-services/src/site/site.xml
===================================================================
--- trunk/openutils-configuration-services/src/site/site.xml (rev 0)
+++ trunk/openutils-configuration-services/src/site/site.xml 2007-08-14 12:35:15 UTC (rev 406)
@@ -0,0 +1,19 @@
+<?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>
+ <style type="text/css" media="all">@import url(../css/site.css);</style>
+ </head>
+ </body>
+</project>
Added: trunk/openutils-dbmigration/src/site/site.xml
===================================================================
--- trunk/openutils-dbmigration/src/site/site.xml (rev 0)
+++ trunk/openutils-dbmigration/src/site/site.xml 2007-08-14 12:35:15 UTC (rev 406)
@@ -0,0 +1,19 @@
+<?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>
+ <style type="text/css" media="all">@import url(../css/site.css);</style>
+ </head>
+ </body>
+</project>
Added: trunk/openutils-hibernate-security/src/site/site.xml
===================================================================
--- trunk/openutils-hibernate-security/src/site/site.xml (rev 0)
+++ trunk/openutils-hibernate-security/src/site/site.xml 2007-08-14 12:35:15 UTC (rev 406)
@@ -0,0 +1,19 @@
+<?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>
+ <style type="text/css" media="all">@import url(../css/site.css);</style>
+ </head>
+ </body>
+</project>
Added: trunk/openutils-mgnlspring/src/site/site.xml
===================================================================
--- trunk/openutils-mgnlspring/src/site/site.xml (rev 0)
+++ trunk/openutils-mgnlspring/src/site/site.xml 2007-08-14 12:35:15 UTC (rev 406)
@@ -0,0 +1,19 @@
+<?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>
+ <style type="text/css" media="all">@import url(../css/site.css);</style>
+ </head>
+ </body>
+</project>
Added: trunk/openutils-mgnlstripes/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/site/changes/changes.xml (rev 0)
+++ trunk/openutils-mgnlstripes/src/site/changes/changes.xml 2007-08-14 12:35:15 UTC (rev 406)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+ "type" attribute can be: add, remove, update or fix.
+-->
+<document>
+ <properties>
+ <title>Changes</title>
+ <author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
+ </properties>
+ <body>
+ <release version="0.2" date="2007-08-14" description="">
+ <action type="update" dev="fgiust">
+ Added support for indexed parameters by replacing "{}" with "[]" in parameter names (hack). With Stripes you can
+ use indexed parameters, but square brakets are not allowed in jcr node names and can't be used in paragraph
+ attributes. You can now use "list{1}" in attribute names for that.
+ </action>
+ <action type="fix" dev="fgiust">
+ Excluded commons-logging dependency from stripes in pom.xml. Magnolia already imports jcl104-over-slf4j, which
+ is a replacement over the standard commons-logging jar.
+ </action>
+ </release>
+ <release version="0.1" date="2007-08-13" description="Initial release">
+ <action type="add" dev="fgiust" due-to="">Initial release with support for stripes paragraphs.</action>
+ </release>
+ </body>
+</document>
\ No newline at end of file
Added: trunk/openutils-tags-spring/src/site/site.xml
===================================================================
--- trunk/openutils-tags-spring/src/site/site.xml (rev 0)
+++ trunk/openutils-tags-spring/src/site/site.xml 2007-08-14 12:35:15 UTC (rev 406)
@@ -0,0 +1,19 @@
+<?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>
+ <style type="text/css" media="all">@import url(../css/site.css);</style>
+ </head>
+ </body>
+</project>
Added: trunk/openutils-testing-junit/src/site/site.xml
===================================================================
--- trunk/openutils-testing-junit/src/site/site.xml (rev 0)
+++ trunk/openutils-testing-junit/src/site/site.xml 2007-08-14 12:35:15 UTC (rev 406)
@@ -0,0 +1,19 @@
+<?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>
+ <style type="text/css" media="all">@import url(../css/site.css);</style>
+ </head>
+ </body>
+</project>
Added: trunk/openutils-testing-junit-dwr/src/site/site.xml
===================================================================
--- trunk/openutils-testing-junit-dwr/src/site/site.xml (rev 0)
+++ trunk/openutils-testing-junit-dwr/src/site/site.xml 2007-08-14 12:35:15 UTC (rev 406)
@@ -0,0 +1,19 @@
+<?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>
+ <style type="text/css" media="all">@import url(../css/site.css);</style>
+ </head>
+ </body>
+</project>
Added: trunk/openutils-testing-testng/src/site/site.xml
===================================================================
--- trunk/openutils-testing-testng/src/site/site.xml (rev 0)
+++ trunk/openutils-testing-testng/src/site/site.xml 2007-08-14 12:35:15 UTC (rev 406)
@@ -0,0 +1,19 @@
+<?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>
+ <style type="text/css" media="all">@import url(../css/site.css);</style>
+ </head>
+ </body>
+</project>
Added: trunk/openutils-testing-testng-dwr/src/site/site.xml
===================================================================
--- trunk/openutils-testing-testng-dwr/src/site/site.xml (rev 0)
+++ trunk/openutils-testing-testng-dwr/src/site/site.xml 2007-08-14 12:35:15 UTC (rev 406)
@@ -0,0 +1,19 @@
+<?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>
+ <style type="text/css" media="all">@import url(../css/site.css);</style>
+ </head>
+ </body>
+</project>
Added: trunk/openutils-usermanagement/src/site/site.xml
===================================================================
--- trunk/openutils-usermanagement/src/site/site.xml (rev 0)
+++ trunk/openutils-usermanagement/src/site/site.xml 2007-08-14 12:35:15 UTC (rev 406)
@@ -0,0 +1,19 @@
+<?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>
+ <style type="text/css" media="all">@import url(../css/site.css);</style>
+ </head>
+ </body>
+</project>
Added: trunk/openutils-usermanagement-dataobjects/src/site/site.xml
===================================================================
--- trunk/openutils-usermanagement-dataobjects/src/site/site.xml (rev 0)
+++ trunk/openutils-usermanagement-dataobjects/src/site/site.xml 2007-08-14 12:35:15 UTC (rev 406)
@@ -0,0 +1,19 @@
+<?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>
+ <style type="text/css" media="all">@import url(../css/site.css);</style>
+ </head>
+ </body>
+</project>
Added: trunk/openutils-web/src/site/site.xml
===================================================================
--- trunk/openutils-web/src/site/site.xml (rev 0)
+++ trunk/openutils-web/src/site/site.xml 2007-08-14 12:35:15 UTC (rev 406)
@@ -0,0 +1,19 @@
+<?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>
+ <style type="text/css" media="all">@import url(../css/site.css);</style>
+ </head>
+ </body>
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-09-20 10:16:18
|
Revision: 445
http://openutils.svn.sourceforge.net/openutils/?rev=445&view=rev
Author: fgiust
Date: 2007-09-20 03:16:22 -0700 (Thu, 20 Sep 2007)
Log Message:
-----------
update slf4j dependencies
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
trunk/openutils-deployment/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2007-09-20 10:16:01 UTC (rev 444)
+++ trunk/openutils-bshd5/pom.xml 2007-09-20 10:16:22 UTC (rev 445)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -15,24 +16,59 @@
</properties>
<dependencies>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <!-- replaces commons-logging -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-hibernate3</artifactId>
<version>${spring.version}</version>
+ <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>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
<version>3.2.1.ga</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -40,11 +76,6 @@
<version>2.3</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2007-09-20 10:16:01 UTC (rev 444)
+++ trunk/openutils-deployment/pom.xml 2007-09-20 10:16:22 UTC (rev 445)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -26,13 +27,9 @@
<optional>true</optional>
<exclusions>
<exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2007-10-16 11:00:27
|
Revision: 466
http://openutils.svn.sourceforge.net/openutils/?rev=466&view=rev
Author: molaschi
Date: 2007-10-16 04:00:26 -0700 (Tue, 16 Oct 2007)
Log Message:
-----------
Adding module for rmi hibernate lazy loading in spring context
Modified Paths:
--------------
trunk/pom.xml
Added Paths:
-----------
trunk/openutils-spring-rmibernate/
trunk/openutils-spring-rmibernate/.checkstyle
trunk/openutils-spring-rmibernate/.classpath
trunk/openutils-spring-rmibernate/.project
trunk/openutils-spring-rmibernate/.settings/
trunk/openutils-spring-rmibernate/.settings/org.eclipse.jdt.core.prefs
trunk/openutils-spring-rmibernate/.settings/org.eclipse.wst.common.component
trunk/openutils-spring-rmibernate/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/openutils-spring-rmibernate/pom.xml
trunk/openutils-spring-rmibernate/src/
trunk/openutils-spring-rmibernate/src/main/
trunk/openutils-spring-rmibernate/src/main/java/
trunk/openutils-spring-rmibernate/src/main/java/it/
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/pagination/
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/util/
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/util/EntitySerializer.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/exporter/
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/exporter/HibernateRmiServiceExporter.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/managers/
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/managers/HibernateLazyService.java
trunk/openutils-spring-rmibernate/src/test/
trunk/openutils-spring-rmibernate/src/test/java/
Added: trunk/openutils-spring-rmibernate/.checkstyle
===================================================================
--- trunk/openutils-spring-rmibernate/.checkstyle (rev 0)
+++ trunk/openutils-spring-rmibernate/.checkstyle 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,6 @@
+<fileset-config file-format-version="1.2.0" simple-config="true">
+ <fileset name="all" enabled="true" check-config-name="project" local="false">
+ <file-match-pattern match-pattern="." include-pattern="true" />
+ </fileset>
+ <filter name="NonSrcDirs" enabled="true" />
+</fileset-config>
\ No newline at end of file
Added: trunk/openutils-spring-rmibernate/.classpath
===================================================================
--- trunk/openutils-spring-rmibernate/.classpath (rev 0)
+++ trunk/openutils-spring-rmibernate/.classpath 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/2.2.3/asm-2.2.3.jar" sourcepath="M2_REPO/asm/asm/2.2.3/asm-2.2.3-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.0.6/spring-beans-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-dao/2.0.6/spring-dao-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/2.0.6/spring-aop-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-remoting/2.0.6/spring-remoting-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/2.0.6/spring-web-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.1/slf4j-api-1.4.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.4.1/slf4j-api-1.4.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-hibernate3/2.0.6/spring-hibernate3-2.0.6.jar" sourcepath="/M2_REPO/org/springframework/spring-hibernate3/2.0.1/spring-hibernate3-2.0.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar" sourcepath="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.ga/hibernate-3.2.4.ga.jar" sourcepath="M2_REPO/org/hibernate/hibernate/3.2.4.ga/hibernate-3.2.4.ga-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/2.0.6/spring-jdbc-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar" sourcepath="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.0.6/spring-core-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl104-over-slf4j/1.4.1/jcl104-over-slf4j-1.4.1.jar" sourcepath="M2_REPO/org/slf4j/jcl104-over-slf4j/1.4.1/jcl104-over-slf4j-1.4.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.0.6/spring-context-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.1/slf4j-log4j12-1.4.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.4.1/slf4j-log4j12-1.4.1-sources.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: trunk/openutils-spring-rmibernate/.project
===================================================================
--- trunk/openutils-spring-rmibernate/.project (rev 0)
+++ trunk/openutils-spring-rmibernate/.project 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,26 @@
+<projectDescription>
+ <name>openutils-spring-rmibernate</name>
+ <comment>openutils base Spring-Hibernate RMI remote lazy loading support</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Added: trunk/openutils-spring-rmibernate/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/openutils-spring-rmibernate/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/openutils-spring-rmibernate/.settings/org.eclipse.jdt.core.prefs 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,5 @@
+#Tue Oct 16 10:42:53 CEST 2007
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
Added: trunk/openutils-spring-rmibernate/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/openutils-spring-rmibernate/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/openutils-spring-rmibernate/.settings/org.eclipse.wst.common.component 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,5 @@
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="openutils-spring-rmibernate">
+ <wb-resource deploy-path="/" source-path="src/main/java"/>
+ </wb-module>
+</project-modules>
\ No newline at end of file
Added: trunk/openutils-spring-rmibernate/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/openutils-spring-rmibernate/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/openutils-spring-rmibernate/.settings/org.eclipse.wst.common.project.facet.core.xml 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,6 @@
+<faceted-project>
+ <fixed facet="jst.java"/>
+ <fixed facet="jst.utility"/>
+ <installed facet="jst.utility" version="1.0"/>
+ <installed facet="jst.java" version="5.0"/>
+</faceted-project>
\ No newline at end of file
Added: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml (rev 0)
+++ trunk/openutils-spring-rmibernate/pom.xml 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,122 @@
+<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>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-spring-rmibernate</artifactId>
+ <name>openutils base Spring-Hibernate RMI remote lazy loading support</name>
+ <version>1.0.0-SNAPSHOT</version>
+ <description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
+ <properties>
+ <spring.version>2.0.6</spring.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <!-- replaces commons-logging -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-hibernate3</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-remoting</artifactId>
+ <version>${spring.version}</version>
+ <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>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.4.ga</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java (rev 0)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/HibernateRmiProxyFactoryBean.java 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,54 @@
+package it.openutils.spring.rmibernate.client;
+
+import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.remoting.rmi.RmiProxyFactoryBean;
+
+
+/**
+ * ProxyFactoryBean for automatic injection of remote lazy loading proxies
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public class HibernateRmiProxyFactoryBean extends RmiProxyFactoryBean
+{
+
+ /**
+ * Store the hibernate lazy service to be used by remote lazy loading
+ */
+ public static ThreadLocal<HibernateLazyService> hibernateLazyServiceTL = new ThreadLocal<HibernateLazyService>();
+
+ private HibernateLazyService hibernateLazyService;
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Object invoke(MethodInvocation invocation) throws Throwable
+ {
+ // store the lazy service for this thread
+ if (hibernateLazyService == null)
+ {
+ // if hibernateLazyService is null this means that this service IS hibernateLazyService
+ hibernateLazyServiceTL.set((HibernateLazyService)this.getObject());
+ }
+ else
+ {
+ hibernateLazyServiceTL.set(hibernateLazyService);
+ }
+
+ // proceed with rmi call
+ return super.invoke(invocation);
+ }
+
+ /**
+ * Sets the hibernateLazyService.
+ * @param hibernateLazyService the hibernateLazyService to set
+ */
+ public void setHibernateLazyService(HibernateLazyService hibernateLazyService)
+ {
+ this.hibernateLazyService = hibernateLazyService;
+ }
+
+}
Added: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java (rev 0)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/aspects/HibernateLazyLoaderAspect.java 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,75 @@
+package it.openutils.spring.rmibernate.client.aspects;
+
+import it.openutils.spring.rmibernate.client.HibernateRmiProxyFactoryBean;
+import it.openutils.spring.rmibernate.client.pagination.Paginator;
+import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
+
+import java.io.Serializable;
+
+import net.sf.cglib.proxy.LazyLoader;
+
+
+/**
+ * Aspect that does remote lazy loading on cglib proxy
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public class HibernateLazyLoaderAspect implements LazyLoader, Serializable
+{
+
+ private static ThreadLocal<Paginator> paginator = new ThreadLocal<Paginator>();
+
+ private String className;
+
+ private String fieldName;
+
+ private Serializable id;
+
+ /**
+ * Constructor
+ * @param className parent class name
+ * @param fieldName field to be lazy loaded
+ * @param id id of current entity
+ */
+ public HibernateLazyLoaderAspect(String className, String fieldName, Serializable id)
+ {
+ this.className = className;
+ this.fieldName = fieldName;
+ this.id = id;
+ }
+
+ /**
+ * Set pagination for next calls in current thread
+ * @param from starting row number
+ * @param size max number of rows
+ */
+ public static void setPagination(int from, int size)
+ {
+ paginator.set(new Paginator(from, size));
+ }
+
+ /**
+ * Disable pagination for next calls in current thread
+ */
+ public static void resetPagination()
+ {
+ paginator.set(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object loadObject() throws Exception
+ {
+ // Load from remote
+ HibernateLazyService hls = HibernateRmiProxyFactoryBean.hibernateLazyServiceTL.get();
+
+ if (paginator.get() != null)
+ {
+ return hls.invoke(className, fieldName, id, paginator.get().getFrom(), paginator.get().getSize());
+ }
+
+ return hls.invoke(className, fieldName, id);
+ }
+
+}
Added: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java (rev 0)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/client/pagination/Paginator.java 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,68 @@
+package it.openutils.spring.rmibernate.client.pagination;
+
+/**
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public class Paginator
+{
+
+ private int from;
+
+ private int size;
+
+ /**
+ *
+ */
+ public Paginator()
+ {
+
+ }
+
+ /**
+ * @param from starting row number
+ * @param size max rows
+ */
+ public Paginator(int from, int size)
+ {
+ this.from = from;
+ this.size = size;
+ }
+
+ /**
+ * Get starting row number
+ * @return starting row number
+ */
+ public int getFrom()
+ {
+ return from;
+ }
+
+ /**
+ * Set starting row number
+ * @param from starting row number
+ */
+ public void setFrom(int from)
+ {
+ this.from = from;
+ }
+
+ /**
+ * Get max number of rows
+ * @return max number of rows
+ */
+ public int getSize()
+ {
+ return size;
+ }
+
+ /**
+ * Set max number of rows
+ * @param size max number of rows
+ */
+ public void setSize(int size)
+ {
+ this.size = size;
+ }
+
+}
Added: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java (rev 0)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/HibernateLazyRmiInterceptor.java 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,57 @@
+package it.openutils.spring.rmibernate.server.aspects;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import org.hibernate.SessionFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Main server interceptor on rmi calls
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public class HibernateLazyRmiInterceptor implements MethodInterceptor
+{
+
+ /**
+ * log
+ */
+ protected static final Logger logger = LoggerFactory.getLogger(HibernateLazyRmiInterceptor.class);
+
+ private SessionFactory sessionFactory;
+
+ /**
+ * Contructor
+ * @param sessionFactory hibernate session factory
+ */
+ public HibernateLazyRmiInterceptor(SessionFactory sessionFactory)
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object invoke(MethodInvocation invocation) throws Throwable
+ {
+ try
+ {
+ Object retVal = invocation.proceed();
+
+ // Proxy class for serialization work
+ return SerializationInterceptor.getEnhancedObject(retVal, sessionFactory);
+ }
+ catch (Throwable ex)
+ {
+ if (logger.isInfoEnabled())
+ {
+ logger.info("Processing of " + " remote call resulted in exception: ", ex);
+ }
+
+ throw ex;
+ }
+ }
+
+}
Added: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java (rev 0)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/LazyReferenceAspect.java 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,41 @@
+package it.openutils.spring.rmibernate.server.aspects;
+
+import it.openutils.spring.rmibernate.shared.LazyReference;
+
+import java.lang.reflect.Method;
+
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
+
+
+/**
+ * Aspect on lazy fields to intercept writeReplace
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public class LazyReferenceAspect implements MethodInterceptor
+{
+
+ private LazyReference lazyReference;
+
+ public LazyReference getLazyReference()
+ {
+ return lazyReference;
+ }
+
+
+ public void setLazyReference(LazyReference lazyReference)
+ {
+ this.lazyReference = lazyReference;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
+ {
+ // TODO Auto-generated method stub
+ return lazyReference;
+ }
+
+}
Added: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java (rev 0)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/SerializationInterceptor.java 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,292 @@
+package it.openutils.spring.rmibernate.server.aspects;
+
+import it.openutils.spring.rmibernate.server.aspects.util.EntitySerializer;
+import it.openutils.spring.rmibernate.shared.LazyReference;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import net.sf.cglib.proxy.Callback;
+import net.sf.cglib.proxy.CallbackFilter;
+import net.sf.cglib.proxy.Enhancer;
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
+import net.sf.cglib.proxy.NoOp;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections.SetUtils;
+import org.apache.commons.collections.Transformer;
+import org.hibernate.EntityMode;
+import org.hibernate.SessionFactory;
+import org.hibernate.collection.PersistentCollection;
+import org.hibernate.proxy.HibernateProxy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.ReflectionUtils;
+
+
+/**
+ * Proxy object with {@link EntitySerializer} and Intercept writeReplace calls
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public class SerializationInterceptor implements MethodInterceptor
+{
+
+ /**
+ * log
+ */
+ private static Logger log = LoggerFactory.getLogger(SerializationInterceptor.class);
+
+ /**
+ * non proxied object
+ */
+ private Object original;
+
+ /**
+ * hibernate sessionfactory
+ */
+ private SessionFactory sessionFactory;
+
+ /**
+ * Constructor
+ * @param o object to be proxied
+ * @param sessionFactory hibernate sessionfactory
+ */
+ private SerializationInterceptor(Object o, SessionFactory sessionFactory)
+ {
+ this.original = o;
+ this.sessionFactory = sessionFactory;
+ }
+
+ /**
+ * Get proxy object intercepting writeReplace calls
+ * @param o object to be proxied
+ * @param sessionFactory hibernate sessionfactory
+ * @return proxied object
+ */
+ public static Object getEnhancedObject(Object o, SessionFactory sessionFactory)
+ {
+ return getEnhancedObject(o, sessionFactory, null);
+ }
+
+ /**
+ * Get proxy object intercepting writeReplace calls
+ * @param o object to be proxied
+ * @param sessionFactory hibernate sessionfactory
+ * @param lazyRef reference to a lazy field
+ * @return proxied object
+ */
+ public static Object getEnhancedObject(Object o, SessionFactory sessionFactory, LazyReference lazyRef)
+ {
+ if (o == null)
+ {
+ return null;
+ }
+
+ // check if there is an empty constructor
+ try
+ {
+ o.getClass().getConstructor(new Class[]{});
+ }
+ catch (NoSuchMethodException ex)
+ {
+ return o;
+ }
+
+ // check if object can be subclassed
+ if (Modifier.isFinal(o.getClass().getModifiers()))
+ {
+ return o;
+ }
+
+ try
+ {
+ // get class
+ Class clazz = o.getClass();
+
+ // if it is an hibernateproxy get superclass
+ if (o instanceof HibernateProxy)
+ {
+ clazz = o.getClass().getSuperclass();
+ if (clazz == null)
+ {
+ clazz = o.getClass().getInterfaces()[0];
+ }
+ }
+
+ Callback callback = null;
+
+ // if this is a lazy field user lazyreferenceaspect
+ if (lazyRef != null)
+ {
+ LazyReferenceAspect lra = new LazyReferenceAspect();
+ lra.setLazyReference(lazyRef);
+ callback = lra;
+ }
+ else
+ {
+ // user default interceptor
+ callback = new SerializationInterceptor(o, sessionFactory);
+ }
+
+ // create proxy to listen on writeReplace method calls
+ return Enhancer.create(clazz, new Class[]{EntitySerializer.class }, new CallbackFilter()
+ {
+
+ public int accept(Method method)
+ {
+ if (method.getName().equals("writeReplace"))
+ {
+ return 0;
+ }
+ else
+ {
+ return 1;
+ }
+ }
+
+ }, new Callback[]{callback, NoOp.INSTANCE });
+ }
+ catch (Throwable t)
+ {
+ log.warn(t.getMessage(), t);
+ return o;
+ }
+ }
+
+ /**
+ *
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable
+ {
+
+ try
+ {
+ if (original == null)
+ {
+ return null;
+ }
+ else if (original.getClass().isPrimitive())
+ {
+ return original;
+ }
+ else if (original.getClass().isArray())
+ {
+ // replace array entries with proxied ones
+ Object[] array = (Object[]) original;
+ for (int i = 0; i < array.length; i++)
+ {
+ array[i] = SerializationInterceptor.getEnhancedObject(array[i], sessionFactory);
+ }
+ return array;
+ }
+ else if (original instanceof Collection)
+ {
+ // replace collection entries with proxied ones
+ Collection collection = (Collection) original;
+ CollectionUtils.transform(collection, transformer(sessionFactory));
+ return collection;
+ }
+ else if (original instanceof Map)
+ {
+ // replace map entries with proxied ones
+ Map map = (Map) original;
+ MapUtils.transformedMap(map, transformer(sessionFactory), transformer(sessionFactory));
+ return map;
+ }
+ else if (original instanceof Set)
+ {
+ // replace set entries with proxied ones
+ Set set = (Set) original;
+ SetUtils.transformedSet(set, transformer(sessionFactory));
+ return set;
+ }
+ else
+ {
+ // cycle on bean fields
+ ReflectionUtils.doWithFields(original.getClass(), new ReflectionUtils.FieldCallback()
+ {
+ /**
+ *
+ * {@inheritDoc}
+ */
+ public void doWith(Field field) throws IllegalArgumentException, IllegalAccessException
+ {
+ // set field accessible
+ field.setAccessible(true);
+
+ // get original value
+ Object oldValue = field.get(original);
+
+ // get new value
+ Object newValue = null;
+
+ if ((oldValue instanceof HibernateProxy && ((HibernateProxy) oldValue)
+ .getHibernateLazyInitializer()
+ .isUninitialized())
+ || oldValue instanceof PersistentCollection)
+ {
+ // if this field is a hibernate proxy or a persistent collection store reference
+ LazyReference lazyRef = new LazyReference();
+ lazyRef.setFieldClassName(field.getType().getName());
+ lazyRef.setClassName(original.getClass().getName());
+ lazyRef.setFieldName(field.getName());
+ // load id
+ lazyRef.setId(sessionFactory.getClassMetadata(original.getClass()).getIdentifier(original, EntityMode.POJO));
+
+ // get proxy for lazy
+ newValue = SerializationInterceptor.getEnhancedObject(oldValue, sessionFactory, lazyRef);
+ }
+ else
+ {
+ // get default proxy
+ newValue = SerializationInterceptor.getEnhancedObject(oldValue, sessionFactory);
+ }
+
+ // if there is a variation store it
+ if (newValue != oldValue)
+ {
+ field.set(original, newValue);
+ }
+ }
+
+ });
+ }
+
+ return original;
+
+ }
+ catch (Throwable t)
+ {
+ log.error(t.getMessage(), t);
+ return original;
+ }
+ }
+
+ /**
+ * Get transformer for collection, map or set injection of proxied objects
+ * @param factory hibernate session factory
+ * @return transformer
+ */
+ private Transformer transformer(SessionFactory factory)
+ {
+ return new Transformer()
+ {
+
+ public Object transform(Object input)
+ {
+ return SerializationInterceptor.getEnhancedObject(input, sessionFactory);
+ }
+
+ };
+ }
+
+}
Added: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/util/EntitySerializer.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/util/EntitySerializer.java (rev 0)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/aspects/util/EntitySerializer.java 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,19 @@
+package it.openutils.spring.rmibernate.server.aspects.util;
+
+import java.io.ObjectStreamException;
+
+/**
+ * Interface for intercepting writeReplace method calls
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public interface EntitySerializer
+{
+ /**
+ * Write alternative object on serialization
+ * @return alternative object
+ * @throws ObjectStreamException error writing
+ */
+ Object writeReplace() throws ObjectStreamException;
+
+}
\ No newline at end of file
Added: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/exporter/HibernateRmiServiceExporter.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/exporter/HibernateRmiServiceExporter.java (rev 0)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/exporter/HibernateRmiServiceExporter.java 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,54 @@
+package it.openutils.spring.rmibernate.server.exporter;
+
+import it.openutils.spring.rmibernate.server.aspects.HibernateLazyRmiInterceptor;
+
+import org.hibernate.SessionFactory;
+import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.remoting.rmi.RmiServiceExporter;
+import org.springframework.remoting.support.RemoteInvocationTraceInterceptor;
+import org.springframework.util.ClassUtils;
+
+
+/**
+ * Rmi exporter that checks laziness of bean fields in all object graph
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public class HibernateRmiServiceExporter extends RmiServiceExporter
+{
+
+ /**
+ * hibernate sessionfactory
+ */
+ private SessionFactory sessionFactory;
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected Object getProxyForService()
+ {
+ checkService();
+ checkServiceInterface();
+ ProxyFactory proxyFactory = new ProxyFactory();
+ proxyFactory.addInterface(getServiceInterface());
+ if (isRegisterTraceInterceptor())
+ {
+ proxyFactory.addAdvice(new RemoteInvocationTraceInterceptor(getExporterName()));
+ }
+ // add interceptor for lazy work
+ proxyFactory.addAdvice(new HibernateLazyRmiInterceptor(sessionFactory));
+ proxyFactory.setTarget(getService());
+ return proxyFactory.getProxy(ClassUtils.getDefaultClassLoader());
+ }
+
+ /**
+ * Set hibernate session factory
+ * @param sessionFactory hibernate sessionfactory
+ */
+ public void setSessionFactory(SessionFactory sessionFactory)
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
+}
Added: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java (rev 0)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/managers/HibernateLazyServiceImpl.java 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,287 @@
+package it.openutils.spring.rmibernate.server.managers;
+
+import it.openutils.spring.rmibernate.shared.managers.HibernateLazyService;
+
+import java.io.Serializable;
+import java.rmi.RemoteException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang.StringUtils;
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.collection.PersistentCollection;
+import org.hibernate.collection.PersistentSortedMap;
+import org.hibernate.collection.PersistentSortedSet;
+import org.hibernate.proxy.HibernateProxy;
+import org.springframework.orm.hibernate3.HibernateCallback;
+import org.springframework.orm.hibernate3.HibernateTemplate;
+
+
+/**
+ * Server side implementation of remote lazy loading calls
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public class HibernateLazyServiceImpl implements HibernateLazyService
+{
+
+ /**
+ * hibernate sessionfactory
+ */
+ private SessionFactory sessionFactory;
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public Object invoke(final String className, final String methodName, final Serializable id) throws RemoteException
+ {
+ try
+ {
+ HibernateTemplate ht = new HibernateTemplate(sessionFactory);
+ return ht.execute(new HibernateCallback()
+ {
+
+ public Object doInHibernate(Session session) throws HibernateException, SQLException
+ {
+ try
+ {
+ Object entity = sessionFactory.getCurrentSession().load(Class.forName(className), id);
+ Object retVal = PropertyUtils.getProperty(entity, methodName);
+ Hibernate.initialize(retVal);
+ return retVal;
+ }
+ catch (Exception ex)
+ {
+ throw new HibernateException(ex);
+ }
+ }
+
+ });
+ }
+ catch (HibernateException ex)
+ {
+ throw new RemoteException(ex.getMessage(), ex);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public Object invoke(final String className, final String propertyName, final Serializable id, final int from,
+ final int size) throws RemoteException
+ {
+ try
+ {
+ // get lazy prop
+ final Object lazy = invoke(className, propertyName, id);
+
+ if (lazy == null)
+ {
+ return null;
+ }
+
+ // get class
+ Class fClass = lazy.getClass();
+
+ // if is a single object proxy
+ if (fClass.isAssignableFrom(HibernateProxy.class))
+ {
+ return lazy;
+ }
+ else
+ {
+ // it's a list
+
+ // calculate list size
+ long count = this.count(className, propertyName, id);
+
+ // no row at desired rownum
+ if (from > count)
+ {
+ return null;
+ }
+
+ // the list is already right and can be processed
+ if (from <= 0 && size <= count)
+ {
+ // could be clean and returned
+ if (lazy instanceof List)
+ {
+ return new ArrayList((List) lazy);
+ }
+ if (lazy instanceof SortedSet)
+ {
+ PersistentSortedSet pss = (PersistentSortedSet) lazy;
+ SortedSet ss = new TreeSet(pss.comparator());
+ ss.addAll((Collection) lazy);
+ return ss;
+ }
+ if (lazy instanceof Set)
+ {
+ return new HashSet((Collection) lazy);
+ }
+ if (lazy instanceof SortedMap)
+ {
+ PersistentSortedMap psm = (PersistentSortedMap) lazy;
+ SortedMap sm = new TreeMap(psm.comparator());
+ sm.putAll((Map) lazy);
+ return sm;
+ }
+ if (lazy instanceof Map)
+ {
+ return new HashMap((Map) lazy);
+ }
+
+ // it should never reach this line...
+ return null;
+ }
+ }
+
+ // filter collection
+ HibernateTemplate ht = new HibernateTemplate(sessionFactory);
+ List list = ht.executeFind(new HibernateCallback()
+ {
+
+ public Object doInHibernate(Session session) throws HibernateException, SQLException
+ {
+ Query q = session.createFilter(lazy, "");
+ q.setMaxResults(size);
+ q.setFirstResult(from);
+
+ return q.list();
+ }
+
+ });
+
+ // process list
+ if (list == null || list.size() == 0)
+ {
+ return null;
+ }
+
+ if (fClass.isAssignableFrom(PersistentCollection.class))
+ {
+ if (fClass.isAssignableFrom(List.class))
+ {
+ return list;
+ }
+ if (fClass.isAssignableFrom(SortedSet.class))
+ {
+ PersistentSortedSet pss = (PersistentSortedSet) invoke(className, propertyName, id);
+ SortedSet ss = new TreeSet(pss.comparator());
+ ss.addAll(list);
+ return ss;
+ }
+ if (fClass.isAssignableFrom(Set.class))
+ {
+ return new HashSet(list);
+ }
+ if (fClass.isAssignableFrom(SortedMap.class))
+ {
+ PersistentSortedMap psm = (PersistentSortedMap) invoke(className, propertyName, id);
+ SortedMap sm = new TreeMap(psm.comparator());
+ for (Object o : list)
+ {
+ Object[] array = (Object[]) o;
+ sm.put(array[0], array[1]);
+ }
+ return sm;
+ }
+ if (fClass.isAssignableFrom(Map.class))
+ {
+ Map m = new HashMap();
+ for (Object o : list)
+ {
+ Object[] array = (Object[]) o;
+ m.put(array[0], array[1]);
+ }
+ return m;
+ }
+ }
+
+ // it should never reach this point ?!?!
+ return null;
+ }
+ catch (Exception ex)
+ {
+ throw new RemoteException("Error lazy loading", ex);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public long count(final String className, final String propertyName, final Serializable id) throws RemoteException
+ {
+ HibernateTemplate ht = new HibernateTemplate(sessionFactory);
+ return ((Number) ht.execute(new HibernateCallback()
+ {
+
+ public Object doInHibernate(Session session) throws HibernateException, SQLException
+ {
+ StringBuilder query = getBaseQuery(className, propertyName, true);
+ Query q = session.createQuery(query.toString());
+ q.setParameter(0, id);
+
+ return q.uniqueResult();
+ }
+
+ })).longValue();
+ }
+
+ private StringBuilder getBaseQuery(String className, String propertyName, boolean count)
+ {
+ String entityName = StringUtils.substringAfterLast(className, ".");
+
+ String propertyId = sessionFactory.getClassMetadata(className).getIdentifierPropertyName();
+
+ StringBuilder query = new StringBuilder("select ");
+ if (count)
+ {
+ query.append("count(");
+ }
+ query.append("el");
+ if (count)
+ {
+ query.append(")");
+ }
+ query
+ .append(" from ")
+ .append(entityName)
+ .append(" cl inner join cl.")
+ .append(propertyName)
+ .append(" el ")
+ .append(" where cl.")
+ .append(propertyId)
+ .append(" = ?");
+
+ return query;
+ }
+
+ /**
+ * Sets the factory.
+ * @param factory the factory to set
+ */
+ public void setSessionFactory(SessionFactory factory)
+ {
+ this.sessionFactory = factory;
+ }
+
+}
Added: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java (rev 0)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/LazyReference.java 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,117 @@
+package it.openutils.spring.rmibernate.shared;
+
+import it.openutils.spring.rmibernate.client.aspects.HibernateLazyLoaderAspect;
+
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+
+import net.sf.cglib.proxy.Enhancer;
+
+
+/**
+ * Store lazy reference
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public class LazyReference implements Serializable
+{
+
+ private Serializable id;
+
+ private String fieldName;
+
+ private String className;
+
+ private String fieldClassName;
+
+ /**
+ * default constructor
+ */
+ public LazyReference()
+ {
+
+ }
+
+ /**
+ * Constructor
+ * @param className className
+ * @param fieldName fieldName
+ * @param fieldClassName fieldClassName
+ * @param id id of current entity
+ */
+ public LazyReference(String className, String fieldName, String fieldClassName, Serializable id)
+ {
+ this.className = className;
+ this.fieldName = fieldName;
+ this.fieldClassName = fieldClassName;
+ this.id = id;
+ }
+
+ /**
+ * Called on deserialization, creates proxy for remote lazy loading
+ * @return proxy for remote lazy loading
+ * @throws ObjectStreamException exception reading
+ * @throws ClassNotFoundException class not found
+ */
+ @SuppressWarnings("unchecked")
+ Object readResolve() throws ObjectStreamException, ClassNotFoundException
+ {
+ // get proxy superclass
+ Class superclass = Class.forName(fieldClassName);
+ Class[] interfaces = null;
+ // if superclass is an interface add it to interfaces
+ if (superclass.isInterface())
+ {
+ interfaces = new Class[]{superclass};
+ }
+ // return proxy
+ return Enhancer.create(
+ superclass,
+ interfaces,
+ new HibernateLazyLoaderAspect(className, fieldName, id));
+
+ }
+
+ public String getClassName()
+ {
+ return className;
+ }
+
+ public void setClassName(String className)
+ {
+ this.className = className;
+ }
+
+ public Serializable getId()
+ {
+ return id;
+ }
+
+ public void setId(Serializable id)
+ {
+ this.id = id;
+ }
+
+ public String getFieldName()
+ {
+ return fieldName;
+ }
+
+ public void setFieldName(String fieldName)
+ {
+ this.fieldName = fieldName;
+ }
+
+
+ public String getFieldClassName()
+ {
+ return fieldClassName;
+ }
+
+
+ public void setFieldClassName(String fieldClassName)
+ {
+ this.fieldClassName = fieldClassName;
+ }
+
+}
Added: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/managers/HibernateLazyService.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/managers/HibernateLazyService.java (rev 0)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/shared/managers/HibernateLazyService.java 2007-10-16 11:00:26 UTC (rev 466)
@@ -0,0 +1,45 @@
+package it.openutils.spring.rmibernate.shared.managers;
+
+import java.io.Serializable;
+import java.rmi.RemoteException;
+
+
+/**
+ * Interface for server-side remote lazy loading calls
+ * @author mmolaschi
+ * @version $Id: $
+ */
+public interface HibernateLazyService
+{
+ /**
+ * Invoke remote lazy loading
+ * @param className name of parent class
+ * @param propertyName name of property to load
+ * @param id current entity id
+ * @return loaded object / collection
+ * @throws RemoteException error
+ */
+ Object invoke(String className, String propertyName, Serializable id) throws RemoteException;
+
+ /**
+ * Invoke remote lazy loading
+ * @param className name of parent class
+ * @param propertyName name of property to load
+ * @param id current entity id
+ * @param from starting row number
+ * @param size max rows to return
+ * @return loaded object / collection
+ * @throws RemoteException error
+ */
+ Object invoke(String className, String propertyName, Serializable id, int from, int size) throws RemoteException;
+
+ /**
+ * Get collection size
+ * @param className name of parent class
+ * @param propertyName name of property to load
+ * @param id current entity id
+ * @return loaded object / collection
+ * @throws RemoteException error
+ */
+ long count(String className, String propertyName, Serializable id) throws RemoteException;
+}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-10-11 22:39:15 UTC (rev 465)
+++ trunk/pom.xml 2007-10-16 11:00:26 UTC (rev 466)
@@ -214,5 +214,6 @@
<module>openutils-hibernate-security</module>
<module>openutils-mgnlspring</module>
<module>openutils-mgnlstripes</module>
+ <module>openutils-spring-rmibernate</module>
</modules>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2008-01-04 21:22:26
|
Revision: 515
http://openutils.svn.sourceforge.net/openutils/?rev=515&view=rev
Author: fgiust
Date: 2008-01-04 13:22:28 -0800 (Fri, 04 Jan 2008)
Log Message:
-----------
update spring, ban commons-logging
Modified Paths:
--------------
trunk/openutils-backup/pom.xml
trunk/openutils-bshd5/pom.xml
trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
trunk/openutils-configuration-dataobjects/pom.xml
trunk/openutils-configuration-services/pom.xml
trunk/openutils-configuration-services/src/test/resources/spring-dao.xml
trunk/openutils-configuration-services/src/test/resources/spring-database.xml
trunk/openutils-configuration-services/src/test/resources/spring-hibernate.xml
trunk/openutils-configuration-services/src/test/resources/spring-managers.xml
trunk/openutils-configuration-services/src/test/resources/spring-tests.xml
trunk/openutils-dbmigration/pom.xml
trunk/openutils-deployment/pom.xml
trunk/openutils-hibernate-security/pom.xml
trunk/openutils-log4j/pom.xml
trunk/openutils-mgnlspring/pom.xml
trunk/openutils-mgnlstripes/pom.xml
trunk/openutils-spring/pom.xml
trunk/openutils-spring-rmibernate/pom.xml
trunk/openutils-tags-spring/pom.xml
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-junit-dwr/pom.xml
trunk/openutils-testing-testng/pom.xml
trunk/openutils-testing-testng-dwr/pom.xml
trunk/openutils-usermanagement/pom.xml
trunk/openutils-usermanagement-dataobjects/pom.xml
trunk/openutils-web/pom.xml
Added Paths:
-----------
trunk/openutils-configuration-services/src/test/dbunit/
trunk/openutils-configuration-services/src/test/dbunit/ConfigurationCodeDAOTest-load.xml
trunk/openutils-configuration-services/src/test/dbunit/ConfigurationDomainDAOTest-load.xml
trunk/openutils-configuration-services/src/test/dbunit/ConfigurationManagerTest-load.xml
trunk/openutils-configuration-services/src/test/dbunit/ReferenceCodeDAOTest-load.xml
trunk/openutils-configuration-services/src/test/dbunit/ReferenceDomainDAOTest-load.xml
trunk/openutils-configuration-services/src/test/dbunit/ReferenceManagerTest-load.xml
trunk/openutils-configuration-services/src/test/dbunit/dataset.dtd
Removed Paths:
-------------
trunk/openutils-configuration-services/src/test/resources/ConfigurationCodeDAOTest-load.xml
trunk/openutils-configuration-services/src/test/resources/ConfigurationDomainDAOTest-load.xml
trunk/openutils-configuration-services/src/test/resources/ConfigurationManagerTest-load.xml
trunk/openutils-configuration-services/src/test/resources/ReferenceCodeDAOTest-load.xml
trunk/openutils-configuration-services/src/test/resources/ReferenceDomainDAOTest-load.xml
trunk/openutils-configuration-services/src/test/resources/ReferenceManagerTest-load.xml
trunk/openutils-configuration-services/src/test/resources/dataset.dtd
Modified: trunk/openutils-backup/pom.xml
===================================================================
--- trunk/openutils-backup/pom.xml 2008-01-04 21:21:07 UTC (rev 514)
+++ trunk/openutils-backup/pom.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>3</version>
+ <version>5</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-backup</artifactId>
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2008-01-04 21:21:07 UTC (rev 514)
+++ trunk/openutils-bshd5/pom.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -1,33 +1,30 @@
-<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">
+<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>3</version>
+ <version>5</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-bshd5</artifactId>
<name>openutils base Spring-Hibernate DAO for java 5.0</name>
<version>1.0.10-SNAPSHOT</version>
<description>openutils base Spring-Hibernate DAO for java 5.0</description>
- <properties>
- <spring.version>2.0.6</spring.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.1</version>
+ <version>1.4.3</version>
</dependency>
<dependency>
- <!-- replaces commons-logging -->
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.1</version>
+ <version>1.4.3</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-hibernate3</artifactId>
+ <artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
<exclusions>
<exclusion>
@@ -38,6 +35,17 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>${spring.version}</version>
+ <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>
<exclusions>
@@ -56,9 +64,18 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+ <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
@@ -81,4 +98,7 @@
<optional>true</optional>
</dependency>
</dependencies>
+ <properties>
+ <spring.version>2.5</spring.version>
+ </properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2008-01-04 21:21:07 UTC (rev 514)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2008-01-04 21:22:28 UTC (rev 515)
@@ -26,521 +26,582 @@
import org.springframework.orm.hibernate3.HibernateObjectRetrievalFailureException;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
+
/**
* Base Hibernate DAO.
- *
* @author Fabrizio Giustina
* @version $Id$
- * @param <T>
- * Persistence class
- * @param <K>
- * Object Key
+ * @param <T> Persistence class
+ * @param <K> Object Key
*/
-public abstract class HibernateDAOImpl<T extends Object, K extends Serializable>
- extends HibernateDaoSupport implements HibernateDAO<T, K> {
+public abstract class HibernateDAOImpl<T extends Object, K extends Serializable> extends HibernateDaoSupport
+ implements
+ HibernateDAO<T, K>
+{
- /**
- * @author carone
- * @version $Id$
- */
- private final class HibernateCallbackForExecution implements
- HibernateCallback {
+ private Class<T> referenceClass;
- /**
- *
- */
- private final T filter;
+ private boolean aopenabled;
- /**
- *
- */
- private final int page;
+ public HibernateDAOImpl()
+ {
+ super();
+ }
- /**
- *
- */
- private final int maxResults;
+ /**
+ * @param referenceClass
+ */
+ @SuppressWarnings({"unchecked" })
+ public HibernateDAOImpl(Class referenceClass)
+ {
+ super();
+ this.referenceClass = referenceClass;
+ }
- /**
- *
- */
- private final Map<String, FilterMetadata> metadata;
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public List<T> find(String query)
+ {
+ return getHibernateTemplate().find(query);
+ }
- /**
- *
- */
- private final Order[] orderProperties;
+ /**
+ * {@inheritDoc}
+ */
+ public List<T> findAll()
+ {
+ return findAll(getDefaultOrder());
+ }
- private List<Criterion> additionalCriteria;
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public List<T> findAll(final Order[] orderProperties)
+ {
+ return getThis().findAll(orderProperties, new ArrayList<Criterion>());
+ }
- /**
- * @param filter
- * @param page
- * @param maxResults
- * @param metadata
- * @param orderProperties
- */
- private HibernateCallbackForExecution(T filter, int page,
- int maxResults, Map<String, FilterMetadata> metadata,
- Order[] orderProperties, List<Criterion> additionalCriteria) {
- this.filter = filter;
- this.page = page;
- this.maxResults = maxResults;
- this.metadata = metadata;
- this.orderProperties = orderProperties;
- this.additionalCriteria = additionalCriteria;
- }
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public List<T> findAll(final Order[] orderProperties, final List<Criterion> criteria)
+ {
+ return (List<T>) getHibernateTemplate().execute(new HibernateCallback()
+ {
- public Object doInHibernate(Session ses) throws HibernateException {
- Criteria crit = ses.createCriteria(filter.getClass());
- crit
- .setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
- crit.setMaxResults(maxResults);
- crit.setFirstResult(maxResults * page);
+ public Object doInHibernate(Session ses) throws HibernateException
+ {
+ Criteria crit = ses.createCriteria(getReferenceClass());
+ if (null != orderProperties)
+ {
+ for (int j = 0; j < orderProperties.length; j++)
+ {
+ crit.addOrder(orderProperties[j]);
+ }
- if (orderProperties != null && orderProperties.length > 0) {
- for (Order order : orderProperties) {
- if (order != null) {
- crit.addOrder(order);
- }
- }
- }
- EnhancedExample.create(crit, filter, metadata);
- if (additionalCriteria != null && !additionalCriteria.isEmpty()) {
- for (Criterion criterion : additionalCriteria) {
- crit.add(criterion);
- }
- }
- return crit.list();
- }
- }
+ }
+ if (criteria != null)
+ {
+ for (Criterion criterion : criteria)
+ {
+ crit.add(criterion);
+ }
+ }
+ return crit.list();
+ }
+ });
+ }
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public List<T> find(String query) {
- return getHibernateTemplate().find(query);
- }
+ /**
+ * {@inheritDoc}
+ */
+ public List<T> find(String query, Object obj, Type type)
+ {
+ return find(query, new Object[]{obj }, new Type[]{type });
+ }
- /**
- * {@inheritDoc}
- */
- public List<T> findAll() {
- return findAll(getDefaultOrder());
- }
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public List<T> find(final String query, final Object[] obj, final Type[] type)
+ {
+ return (List<T>) getHibernateTemplate().execute(new HibernateCallback()
+ {
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public List<T> findAll(final Order[] orderProperties) {
- return getThis().findAll(orderProperties, new ArrayList<Criterion>());
- }
+ public Object doInHibernate(Session ses) throws HibernateException
+ {
+ // hibernate 3
+ return ses.createQuery(query).setParameters(obj, type).list();
+ }
+ });
+ }
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public List<T> findAll(final Order[] orderProperties,
- final List<Criterion> criteria) {
- return (List<T>) getHibernateTemplate().execute(
- new HibernateCallback() {
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public T load(K key)
+ {
+ T result = (T) getHibernateTemplate().load(getReferenceClass(), key);
+ Hibernate.initialize(result);
+ return result;
+ }
- public Object doInHibernate(Session ses)
- throws HibernateException {
- Criteria crit = ses.createCriteria(getReferenceClass());
- if (null != orderProperties) {
- for (int j = 0; j < orderProperties.length; j++) {
- crit.addOrder(orderProperties[j]);
- }
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public T loadIfAvailable(K key)
+ {
+ T result;
+ try
+ {
+ result = (T) getHibernateTemplate().load(getReferenceClass(), key);
+ Hibernate.initialize(result);
+ }
+ catch (ObjectNotFoundException e)
+ {
+ // during lazy initialization
+ return null;
+ }
+ catch (HibernateObjectRetrievalFailureException e)
+ {
+ // during load
+ if (e.getCause() instanceof ObjectNotFoundException)
+ {
+ return null;
+ }
+ throw e;
+ }
+ return result;
+ }
- }
- if (criteria != null) {
- for (Criterion criterion : criteria) {
- crit.add(criterion);
- }
- }
- return crit.list();
- }
- });
- }
+ /**
+ * {@inheritDoc}
+ */
+ public void saveOrUpdate(final T obj)
+ {
+ getHibernateTemplate().saveOrUpdate(obj);
+ }
- /**
- * {@inheritDoc}
- */
- public List<T> find(String query, Object obj, Type type) {
- return find(query, new Object[] { obj }, new Type[] { type });
- }
+ /**
+ * {@inheritDoc}
+ */
+ public void update(T obj)
+ {
+ getHibernateTemplate().update(obj);
+ }
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public List<T> find(final String query, final Object[] obj,
- final Type[] type) {
- return (List<T>) getHibernateTemplate().execute(
- new HibernateCallback() {
+ /**
+ * {@inheritDoc}
+ */
+ public boolean delete(final K key)
+ {
- public Object doInHibernate(Session ses)
- throws HibernateException {
- // hibernate 3
- return ses.createQuery(query).setParameters(obj, type)
- .list();
- }
- });
- }
+ return (Boolean) getHibernateTemplate().execute(new HibernateCallback()
+ {
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public T load(K key) {
- T result = (T) getHibernateTemplate().load(getReferenceClass(), key);
- Hibernate.initialize(result);
- return result;
- }
+ public Object doInHibernate(Session ses) throws HibernateException
+ {
+ ses.delete(ses.load(getReferenceClass(), key));
+ return true;
+ }
+ });
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public T loadIfAvailable(K key) {
- T result;
- try {
- result = (T) getHibernateTemplate().load(getReferenceClass(), key);
- Hibernate.initialize(result);
- } catch (ObjectNotFoundException e) {
- // during lazy initialization
- return null;
- } catch (HibernateObjectRetrievalFailureException e) {
- // during load
- if (e.getCause() instanceof ObjectNotFoundException) {
- return null;
- }
- throw e;
- }
- return result;
- }
+ }
- /**
- * {@inheritDoc}
- */
- public void saveOrUpdate(final T obj) {
- getHibernateTemplate().saveOrUpdate(obj);
- }
+ /**
+ * {@inheritDoc}
+ */
+ public void refresh(T obj)
+ {
+ getHibernateTemplate().refresh(obj);
+ }
- /**
- * {@inheritDoc}
- */
- public void update(T obj) {
- getHibernateTemplate().update(obj);
- }
+ /**
+ * {@inheritDoc}
+ */
+ public void evict(T obj)
+ {
+ getHibernateTemplate().evict(obj);
+ }
- /**
- * {@inheritDoc}
- */
- public boolean delete(final K key) {
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public T merge(final T obj)
+ {
+ return (T) getHibernateTemplate().execute(new HibernateCallback()
+ {
- return (Boolean) getHibernateTemplate().execute(
- new HibernateCallback() {
+ public Object doInHibernate(Session ses) throws HibernateException
+ {
+ return ses.merge(obj);
+ }
+ });
- public Object doInHibernate(Session ses)
- throws HibernateException {
- ses.delete(ses.load(getReferenceClass(), key));
- return true;
- }
- });
+ }
- }
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public K save(T obj)
+ {
+ return (K) getHibernateTemplate().save(obj);
+ }
- /**
- * {@inheritDoc}
- */
- public void refresh(T obj) {
- getHibernateTemplate().refresh(obj);
- }
+ /**
+ * {@inheritDoc}
+ */
+ public T findFilteredFirst(final T filter)
+ {
+ return getFirstInCollection(findFiltered(filter, 1, 0));
+ }
- /**
- * {@inheritDoc}
- */
- public void evict(T obj) {
- getHibernateTemplate().evict(obj);
- }
+ /**
+ * {@inheritDoc}
+ */
+ public T findFilteredFirst(final T filter, List<Criterion> criteria)
+ {
+ return getFirstInCollection(findFiltered(filter, null, getDefaultFilterMetadata(), 1, 0, criteria));
+ }
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public T merge(final T obj) {
- return (T) getHibernateTemplate().execute(new HibernateCallback() {
+ /**
+ * {@inheritDoc}
+ */
+ public List<T> findFiltered(final T filter)
+ {
+ return findFiltered(filter, getDefaultFilterMetadata());
+ }
- public Object doInHibernate(Session ses) throws HibernateException {
- return ses.merge(obj);
- }
- });
+ /**
+ * {@inheritDoc}
+ */
+ public List<T> findFiltered(T filter, Order[] orderProperties)
+ {
+ return findFiltered(filter, orderProperties, getDefaultFilterMetadata(), Integer.MAX_VALUE, 0);
+ }
- }
+ /**
+ * {@inheritDoc}
+ */
+ public List<T> findFiltered(final T filter, final Map<String, FilterMetadata> metadata)
+ {
+ return findFiltered(filter, metadata, Integer.MAX_VALUE, 0);
+ }
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public K save(T obj) {
- return (K) getHibernateTemplate().save(obj);
- }
+ /**
+ * {@inheritDoc}
+ */
+ public List<T> findFiltered(final T filter, final int maxResults, final int page)
+ {
+ return findFiltered(filter, getDefaultFilterMetadata(), maxResults, page);
+ }
- /**
- * {@inheritDoc}
- */
- public T findFilteredFirst(final T filter) {
- return getFirstInCollection(findFiltered(filter, 1, 0));
- }
+ /**
+ * {@inheritDoc}
+ */
+ public List<T> findFiltered(final T filter, final Map<String, FilterMetadata> metadata, final int maxResults,
+ final int page)
+ {
+ return findFiltered(filter, null, metadata, maxResults, page);
+ }
- /**
- * {@inheritDoc}
- */
- public T findFilteredFirst(final T filter, List<Criterion> criteria) {
- return getFirstInCollection(findFiltered(filter, null,
- getDefaultFilterMetadata(), 1, 0, criteria));
- }
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public List<T> findFiltered(final T filter, final Order[] customOrder, final Map<String, FilterMetadata> metadata,
+ final int maxResults, final int page)
+ {
+ return getThis().findFiltered(filter, customOrder, metadata, maxResults, page, new ArrayList<Criterion>());
+ }
- /**
- * {@inheritDoc}
- */
- public List<T> findFiltered(final T filter) {
- return findFiltered(filter, getDefaultFilterMetadata());
- }
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public List<T> findFiltered(T filter, Order[] customOrder, Map<String, FilterMetadata> metadata, int maxResults,
+ int page, List<Criterion> additionalCriteria)
+ {
+ final Order[] orderProperties = customOrder != null && customOrder.length > 0 ? customOrder : this
+ .getDefaultOrder();
- /**
- * @return This is needed as for
- * http://opensource.atlassian.com/projects/spring/browse/SPR-2226
- */
- @SuppressWarnings("unchecked")
- private HibernateDAO<T, K> getThis() {
- try {
- return (HibernateDAO<T, K>) AopContext.currentProxy();
- } catch (AspectException exc) {
- logger
- .debug("Not running inside an AOP proxy, so no proxy can be returned: "
- + exc.getMessage());
- return this;
- }
- }
+ return (List<T>) getHibernateTemplate().execute(
+ new HibernateCallbackForExecution(filter, page, maxResults, metadata, orderProperties, additionalCriteria));
+ }
- /**
- * {@inheritDoc}
- */
- public List<T> findFiltered(T filter, Order[] orderProperties) {
- return findFiltered(filter, orderProperties,
- getDefaultFilterMetadata(), Integer.MAX_VALUE, 0);
- }
+ /**
+ * Return the specific Object class that will be used for class-specific implementation of this DAO.
+ * @return the reference Class
+ */
+ protected Class<T> getReferenceClass()
+ {
+ return referenceClass;
+ }
- /**
- * {@inheritDoc}
- */
- public List<T> findFiltered(final T filter,
- final Map<String, FilterMetadata> metadata) {
- return findFiltered(filter, metadata, Integer.MAX_VALUE, 0);
- }
+ public void setReferenceClass(Class<T> referenceClass)
+ {
+ this.referenceClass = referenceClass;
+ }
- /**
- * {@inheritDoc}
- */
- public List<T> findFiltered(final T filter, final int maxResults,
- final int page) {
- return findFiltered(filter, getDefaultFilterMetadata(), maxResults,
- page);
- }
+ /**
+ * Return a list of <code>Order</code> object to be used for the default ordering of the collection.
+ * @return the property name
+ */
+ protected Order[] getDefaultOrder()
+ {
+ return new Order[0];
+ }
- /**
- * {@inheritDoc}
- */
- public List<T> findFiltered(final T filter,
- final Map<String, FilterMetadata> metadata, final int maxResults,
- final int page) {
- return findFiltered(filter, null, metadata, maxResults, page);
- }
+ /**
+ * Obtain an instance of Query for a named query string defined in the mapping file.
+ * @param name the name of a query defined externally
+ * @param maxResults max number of results
+ * @return Query
+ */
+ protected List< ? > getNamedQuery(final String name, final int maxResults)
+ {
+ return (List< ? >) getHibernateTemplate().execute(new HibernateCallback()
+ {
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public List<T> findFiltered(final T filter, final Order[] customOrder,
- final Map<String, FilterMetadata> metadata, final int maxResults,
- final int page) {
- return getThis().findFiltered(filter, customOrder, metadata,
- maxResults, page, new ArrayList<Criterion>());
- }
+ public Object doInHibernate(Session ses) throws HibernateException
+ {
+ Query q = ses.getNamedQuery(name);
+ q.setMaxResults(maxResults);
+ return q.list();
+ }
+ });
+ }
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public List<T> findFiltered(T filter, Order[] customOrder,
- Map<String, FilterMetadata> metadata, int maxResults, int page,
- List<Criterion> additionalCriteria) {
- final Order[] orderProperties = customOrder != null
- && customOrder.length > 0 ? customOrder : this
- .getDefaultOrder();
+ /**
+ * Obtain an instance of Query for a named query string defined in the mapping file. Use the parameters given.
+ * @param name the name of a query defined externally
+ * @param params the parameter array
+ * @param maxResults max number of results
+ * @return Query
+ */
+ protected List< ? > getNamedQuery(final String name, final Serializable[] params, final int maxResults)
+ {
- return (List<T>) getHibernateTemplate().execute(
- new HibernateCallbackForExecution(filter, page, maxResults,
- metadata, orderProperties, additionalCriteria));
- }
+ return (List< ? >) getHibernateTemplate().execute(new HibernateCallback()
+ {
- /**
- * Return the specific Object class that will be used for class-specific
- * implementation of this DAO.
- *
- * @return the reference Class
- */
- protected abstract Class<T> getReferenceClass();
+ public Object doInHibernate(Session ses) throws HibernateException
+ {
+ Query q = ses.getNamedQuery(name);
+ q.setMaxResults(maxResults);
+ if (null != params)
+ {
+ for (int i = 0; i < params.length; i++)
+ {
+ q.setParameter(i, params[i]);
+ }
+ }
+ return q.list();
+ }
+ });
+ }
- /**
- * Return a list of <code>Order</code> object to be used for the default
- * ordering of the collection.
- *
- * @return the property name
- */
- protected Order[] getDefaultOrder() {
- return new Order[0];
- }
+ /**
+ * Obtain an instance of Query for a named query string defined in the mapping file. Use the parameters given.
+ * @param name the name of a query defined externally
+ * @param params the parameter Map
+ * @param maxResults max number of results
+ * @return Query
+ */
+ protected List< ? > getNamedQuery(final String name, final Map<String, Object> params, final int maxResults)
+ {
+ return (List< ? >) getHibernateTemplate().execute(new HibernateCallback()
+ {
- /**
- * Obtain an instance of Query for a named query string defined in the
- * mapping file.
- *
- * @param name
- * the name of a query defined externally
- * @param maxResults
- * max number of results
- * @return Query
- */
- protected List<?> getNamedQuery(final String name, final int maxResults) {
- return (List<?>) getHibernateTemplate().execute(
- new HibernateCallback() {
+ public Object doInHibernate(Session ses) throws HibernateException
+ {
+ Query q = ses.getNamedQuery(name);
+ q.setMaxResults(maxResults);
+ if (params != null)
+ {
+ for (Map.Entry<String, Object> entry : params.entrySet())
+ {
+ setParameterValue(q, entry.getKey(), entry.getValue());
+ }
+ }
+ return q.list();
+ }
+ });
+ }
- public Object doInHibernate(Session ses)
- throws HibernateException {
- Query q = ses.getNamedQuery(name);
- q.setMaxResults(maxResults);
- return q.list();
- }
- });
- }
+ /**
+ * Convenience method to set paramers in the query given based on the actual object type in passed in as the value.
+ * You may need to add more functionaly to this as desired (or not use this at all).
+ * @param query the Query to set
+ * @param key the key name
+ * @param value the object to set as the parameter
+ */
+ protected void setParameterValue(Query query, String key, Object value)
+ {
+ if (null == key || null == value)
+ {
+ return;
+ }
+ query.setParameter(key, value);
+ }
- /**
- * Obtain an instance of Query for a named query string defined in the
- * mapping file. Use the parameters given.
- *
- * @param name
- * the name of a query defined externally
- * @param params
- * the parameter array
- * @param maxResults
- * max number of results
- * @return Query
- */
- protected List<?> getNamedQuery(final String name,
- final Serializable[] params, final int maxResults) {
+ /**
+ * Returns the default set of FilterMetadata that will be applied to any query. The default implementation doesn't
+ * set any default filter, subclasses may override this.
+ * @return map of property name - filter metadata
+ */
+ protected Map<String, FilterMetadata> getDefaultFilterMetadata()
+ {
+ return new HashMap<String, FilterMetadata>(0);
+ }
- return (List<?>) getHibernateTemplate().execute(
- new HibernateCallback() {
+ /**
+ * Returns the first object in the collection or null if the collection is null or empty.
+ * @param list collection
+ * @return first element in the list
+ */
+ @SuppressWarnings("unchecked")
+ private T getFirstInCollection(Collection<T> list)
+ {
+ if (list != null && !list.isEmpty())
+ {
+ Object result = list.iterator().next();
+ Hibernate.initialize(result);
+ return (T) result;
+ }
+ return null;
+ }
- public Object doInHibernate(Session ses)
- throws HibernateException {
- Query q = ses.getNamedQuery(name);
- q.setMaxResults(maxResults);
- if (null != params) {
- for (int i = 0; i < params.length; i++) {
- q.setParameter(i, params[i]);
- }
- }
- return q.list();
- }
- });
- }
+ /**
+ * Sets the aopenabled.
+ * @param aopenabled the aopenabled to set
+ */
+ public void setAopenabled(boolean aopenabled)
+ {
+ this.aopenabled = aopenabled;
+ }
- /**
- * Obtain an instance of Query for a named query string defined in the
- * mapping file. Use the parameters given.
- *
- * @param name
- * the name of a query defined externally
- * @param params
- * the parameter Map
- * @param maxResults
- * max number of results
- * @return Query
- */
- protected List<?> getNamedQuery(final String name,
- final Map<String, Object> params, final int maxResults) {
- return (List<?>) getHibernateTemplate().execute(
- new HibernateCallback() {
+ /**
+ * @return This is needed as for http://opensource.atlassian.com/projects/spring/browse/SPR-2226
+ */
+ @SuppressWarnings("unchecked")
+ private HibernateDAO<T, K> getThis()
+ {
+ if (!aopenabled)
+ {
+ return this;
+ }
- public Object doInHibernate(Session ses)
- throws HibernateException {
- Query q = ses.getNamedQuery(name);
- q.setMaxResults(maxResults);
- if (params != null) {
- for (Map.Entry<String, Object> entry : params
- .entrySet()) {
- setParameterValue(q, entry.getKey(), entry
- .getValue());
- }
- }
- return q.list();
- }
- });
- }
+ try
+ {
+ return (HibernateDAO<T, K>) AopContext.currentProxy();
+ }
+ catch (AspectException exc)
+ {
+ logger.debug("Not running inside an AOP proxy, so no proxy can be returned: " + exc.getMessage());
+ return this;
+ }
+ catch (IllegalStateException e)
+ {
+ logger.warn("Cannot access proxy: " + e.getMessage());
+ aopenabled = false;
+ return this;
+ }
+ }
- /**
- * Convenience method to set paramers in the query given based on the actual
- * object type in passed in as the value. You may need to add more
- * functionaly to this as desired (or not use this at all).
- *
- * @param query
- * the Query to set
- * @param key
- * the key name
- * @param value
- * the object to set as the parameter
- */
- protected void setParameterValue(Query query, String key, Object value) {
- if (null == key || null == value) {
- return;
- }
- query.setParameter(key, value);
- }
+ /**
+ * @author carone
+ * @version $Id$
+ */
+ private final class HibernateCallbackForExecution implements HibernateCallback
+ {
- /**
- * Returns the default set of FilterMetadata that will be applied to any
- * query. The default implementation doesn't set any default filter,
- * subclasses may override this.
- *
- * @return map of property name - filter metadata
- */
- protected Map<String, FilterMetadata> getDefaultFilterMetadata() {
- return new HashMap<String, FilterMetadata>(0);
- }
+ /**
+ *
+ */
+ private final T filter;
- /**
- * Returns the first object in the collection or null if the collection is
- * null or empty.
- *
- * @param list
- * collection
- * @return first element in the list
- */
- @SuppressWarnings("unchecked")
- private T getFirstInCollection(Collection<T> list) {
- if (list != null && !list.isEmpty()) {
- Object result = list.iterator().next();
- Hibernate.initialize(result);
- return (T) result;
- }
- return null;
- }
+ /**
+ *
+ */
+ private final int page;
+ /**
+ *
+ */
+ private final int maxResults;
+
+ /**
+ *
+ */
+ private final Map<String, FilterMetadata> metadata;
+
+ /**
+ *
+ */
+ private final Order[] orderProperties;
+
+ private List<Criterion> additionalCriteria;
+
+ /**
+ * @param filter
+ * @param page
+ * @param maxResults
+ * @param metadata
+ * @param orderProperties
+ */
+ private HibernateCallbackForExecution(
+ T filter,
+ int page,
+ int maxResults,
+ Map<String, FilterMetadata> metadata,
+ Order[] orderProperties,
+ List<Criterion> additionalCriteria)
+ {
+ this.filter = filter;
+ this.page = page;
+ this.maxResults = maxResults;
+ this.metadata = metadata;
+ this.orderProperties = orderProperties;
+ this.additionalCriteria = additionalCriteria;
+ }
+
+ public Object doInHibernate(Session ses) throws HibernateException
+ {
+ Criteria crit = ses.createCriteria(filter.getClass());
+ crit.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
+ crit.setMaxResults(maxResults);
+ crit.setFirstResult(maxResults * page);
+
+ if (orderProperties != null && orderProperties.length > 0)
+ {
+ for (Order order : orderProperties)
+ {
+ if (order != null)
+ {
+ crit.addOrder(order);
+ }
+ }
+ }
+ EnhancedExample.create(crit, filter, metadata);
+ if (additionalCriteria != null && !additionalCriteria.isEmpty())
+ {
+ for (Criterion criterion : additionalCriteria)
+ {
+ crit.add(criterion);
+ }
+ }
+ return crit.list();
+ }
+ }
+
}
\ No newline at end of file
Modified: trunk/openutils-configuration-dataobjects/pom.xml
===================================================================
--- trunk/openutils-configuration-dataobjects/pom.xml 2008-01-04 21:21:07 UTC (rev 514)
+++ trunk/openutils-configuration-dataobjects/pom.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>3</version>
+ <version>5</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-configuration-services/pom.xml
===================================================================
--- trunk/openutils-configuration-services/pom.xml 2008-01-04 21:21:07 UTC (rev 514)
+++ trunk/openutils-configuration-services/pom.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -1,9 +1,10 @@
-<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">
+<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>3</version>
+ <version>5</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -12,11 +13,21 @@
<name>openutils-configuration</name>
<version>0.2-SNAPSHOT</version>
<description>Configuration services</description>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>src/test/dbunit</directory>
+ </testResource>
+ </testResources>
+ </build>
<dependencies>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-spring</artifactId>
- <version>1.0</version>
+ <version>1.0.5-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -27,7 +38,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-bshd5</artifactId>
- <version>1.0.5</version>
+ <version>1.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -38,9 +49,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
+ <version>1.4.3</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.13</version>
@@ -50,6 +66,16 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<version>3.2.1.ga</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
@@ -75,8 +101,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>2.0.6</version>
+ <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>
@@ -89,6 +121,15 @@
<artifactId>dbunit</artifactId>
<version>2.2</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
+ <properties>
+ <spring.version>2.5</spring.version>
+ </properties>
</project>
\ No newline at end of file
Copied: trunk/openutils-configuration-services/src/test/dbunit/ConfigurationCodeDAOTest-load.xml (from rev 513, trunk/openutils-configuration-services/src/test/resources/ConfigurationCodeDAOTest-load.xml)
===================================================================
--- trunk/openutils-configuration-services/src/test/dbunit/ConfigurationCodeDAOTest-load.xml (rev 0)
+++ trunk/openutils-configuration-services/src/test/dbunit/ConfigurationCodeDAOTest-load.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -0,0 +1,39 @@
+<!DOCTYPE dataset SYSTEM "dataset.dtd">
+<dataset>
+ <table name="APP_CONFIGURATION_DOMAIN">
+ <column>ID_CONFIGURATIONDOMAIN</column>
+ <column>DESCRIPTION</column>
+ <row>
+ <value>DOMINIO1</value>
+ <value>DESCRIZIONE</value>
+ </row>
+ <row>
+ <value>APPLTEST</value>
+ <value>Application server configuration</value>
+ </row>
+ </table>
+ <table name="APP_CONFIGURATION_CODE">
+ <column>ID_CONFIGURATIONCODE</column>
+ <column>ID_CONFIGURATIONDOMAIN</column>
+ <column>CODE</column>
+ <column>DESCRIPTION</column>
+ <column>TYPE</column>
+ <column>VALUE</column>
+ <row>
+ <value>1</value>
+ <value>DOMINIO1</value>
+ <value>CODE1</value>
+ <value>DESCRIZIONE</value>
+ <value>TIPO</value>
+ <value>VALORE</value>
+ </row>
+ <row>
+ <value>2</value>
+ <value>APPLTEST</value>
+ <value>CURVE_SEARCH_LIMIT</value>
+ <value>Maximum number of curves returned by a search operation.</value>
+ <value>INT</value>
+ <value>500</value>
+ </row>
+ </table>
+</dataset>
\ No newline at end of file
Copied: trunk/openutils-configuration-services/src/test/dbunit/ConfigurationDomainDAOTest-load.xml (from rev 513, trunk/openutils-configuration-services/src/test/resources/ConfigurationDomainDAOTest-load.xml)
===================================================================
--- trunk/openutils-configuration-services/src/test/dbunit/ConfigurationDomainDAOTest-load.xml (rev 0)
+++ trunk/openutils-configuration-services/src/test/dbunit/ConfigurationDomainDAOTest-load.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -0,0 +1,11 @@
+<!DOCTYPE dataset SYSTEM "dataset.dtd">
+<dataset>
+ <table name="APP_CONFIGURATION_DOMAIN">
+ <column>ID_CONFIGURATIONDOMAIN</column>
+ <column>DESCRIPTION</column>
+ <row>
+ <value>DOMINIO1</value>
+ <value>DESCRIZIONE</value>
+ </row>
+ </table>
+</dataset>
\ No newline at end of file
Copied: trunk/openutils-configuration-services/src/test/dbunit/ConfigurationManagerTest-load.xml (from rev 513, trunk/openutils-configuration-services/src/test/resources/ConfigurationManagerTest-load.xml)
===================================================================
--- trunk/openutils-configuration-services/src/test/dbunit/ConfigurationManagerTest-load.xml (rev 0)
+++ trunk/openutils-configuration-services/src/test/dbunit/ConfigurationManagerTest-load.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -0,0 +1,39 @@
+<!DOCTYPE dataset SYSTEM "dataset.dtd">
+<dataset>
+ <table name="APP_CONFIGURATION_DOMAIN">
+ <column>ID_CONFIGURATIONDOMAIN</column>
+ <column>DESCRIPTION</column>
+ <row>
+ <value>CONFIG_DOMAIN</value>
+ <value>DESCRIZIONE</value>
+ </row>
+ <row>
+ <value>CONFIG_DOMAIN_2</value>
+ <value>DESCRIZIONE_2</value>
+ </row>
+ </table>
+ <table name="APP_CONFIGURATION_CODE">
+ <column>ID_CONFIGURATIONCODE</column>
+ <column>ID_CONFIGURATIONDOMAIN</column>
+ <column>CODE</column>
+ <column>DESCRIPTION</column>
+ <column>TYPE</column>
+ <column>VALUE</column>
+ <row>
+ <value>5</value>
+ <value>CONFIG_DOMAIN</value>
+ <value>CODICE</value>
+ <value>DESCRIZIONE</value>
+ <value>TIPO</value>
+ <value>VALORE</value>
+ </row>
+ <row>
+ <value>6</value>
+ <value>CONFIG_DOMAIN_2</value>
+ <value>CODICE</value>
+ <value>DESCRIZIONE</value>
+ <value>TIPO</value>
+ <value>VALORE</value>
+ </row>
+ </table>
+</dataset>
\ No newline at end of file
Copied: trunk/openutils-configuration-services/src/test/dbunit/ReferenceCodeDAOTest-load.xml (from rev 513, trunk/openutils-configuration-services/src/test/resources/ReferenceCodeDAOTest-load.xml)
===================================================================
--- trunk/openutils-configuration-services/src/test/dbunit/ReferenceCodeDAOTest-load.xml (rev 0)
+++ trunk/openutils-configuration-services/src/test/dbunit/ReferenceCodeDAOTest-load.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -0,0 +1,25 @@
+<!DOCTYPE dataset SYSTEM "dataset.dtd">
+<dataset>
+ <table name="APP_REFERENCE_DOMAIN">
+ <column>ID_REFERENCEDOMAIN</column>
+ <column>DESCRIPTION</column>
+ <row>
+ <value>DOMINIO1</value>
+ <value>DESCRIZIONE</value>
+ </row>
+ </table>
+ <table name="APP_REFERENCE_CODE">
+ <column>ID_REFERENCECODE</column>
+ <column>ID_REFERENCEDOMAIN</column>
+ <column>CODE</column>
+ <column>DESCRIPTION</column>
+ <column>ACTIVE</column>
+ <row>
+ <value>1</value>
+ <value>DOMINIO1</value>
+ <value>CODICE</value>
+ <value>DESCRIZIONE</value>
+ <value>0</value>
+ </row>
+ </table>
+</dataset>
\ No newline at end of file
Copied: trunk/openutils-configuration-services/src/test/dbunit/ReferenceDomainDAOTest-load.xml (from rev 513, trunk/openutils-configuration-services/src/test/resources/ReferenceDomainDAOTest-load.xml)
===================================================================
--- trunk/openutils-configuration-services/src/test/dbunit/ReferenceDomainDAOTest-load.xml (rev 0)
+++ trunk/openutils-configuration-services/src/test/dbunit/ReferenceDomainDAOTest-load.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -0,0 +1,11 @@
+<!DOCTYPE dataset SYSTEM "dataset.dtd">
+<dataset>
+ <table name="APP_REFERENCE_DOMAIN">
+ <column>ID_REFERENCEDOMAIN</column>
+ <column>DESCRIPTION</column>
+ <row>
+ <value>DOMINIO1</value>
+ <value>DESCRIZIONE</value>
+ </row>
+ </table>
+</dataset>
\ No newline at end of file
Copied: trunk/openutils-configuration-services/src/test/dbunit/ReferenceManagerTest-load.xml (from rev 513, trunk/openutils-configuration-services/src/test/resources/ReferenceManagerTest-load.xml)
===================================================================
--- trunk/openutils-configuration-services/src/test/dbunit/ReferenceManagerTest-load.xml (rev 0)
+++ trunk/openutils-configuration-services/src/test/dbunit/ReferenceManagerTest-load.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -0,0 +1,25 @@
+<!DOCTYPE dataset SYSTEM "dataset.dtd">
+<dataset>
+ <table name="APP_REFERENCE_DOMAIN">
+ <column>ID_REFERENCEDOMAIN</column>
+ <column>DESCRIPTION</column>
+ <row>
+ <value>CURVE_DOMAIN</value>
+ <value>DESCRIZIONE</value>
+ </row>
+ </table>
+ <table name="APP_REFERENCE_CODE">
+ <column>ID_REFERENCECODE</column>
+ <column>ID_REFERENCEDOMAIN</column>
+ <column>CODE</column>
+ <column>DESCRIPTION</column>
+ <column>ACTIVE</column>
+ <row>
+ <value>7</value>
+ <value>CURVE_DOMAIN</value>
+ <value>CODICE</value>
+ <value>DESCRIZIONE</value>
+ <value>1</value>
+ </row>
+ </table>
+</dataset>
\ No newline at end of file
Copied: trunk/openutils-configuration-services/src/test/dbunit/dataset.dtd (from rev 513, trunk/openutils-configuration-services/src/test/resources/dataset.dtd)
===================================================================
--- trunk/openutils-configuration-services/src/test/dbunit/dataset.dtd (rev 0)
+++ trunk/openutils-configuration-services/src/test/dbunit/dataset.dtd 2008-01-04 21:22:28 UTC (rev 515)
@@ -0,0 +1,13 @@
+<!ELEMENT dataset (table*)>
+<!ELEMENT table (column+,row+)>
+<!ATTLIST table
+ name CDATA #REQUIRED
+>
+<!ELEMENT row (value|null)+>
+<!ELEMENT column (#PCDATA)>
+<!ELEMENT value (#PCDATA)>
+<!ELEMENT null EMPTY>
+<!--
+nb una tabella senza righe sarebbe valida (per cancellare tutto il contenuto),
+ma NON DEVE ESISTERE NEI NOSTRI TEST IN QUANTO TUTTE LE TABELLE VENGONO SVUOTATE PRIMA DEL CARICAMENTO
+-->
\ No newline at end of file
Deleted: trunk/openutils-configuration-services/src/test/resources/ConfigurationCodeDAOTest-load.xml
===================================================================
--- trunk/openutils-configuration-services/src/test/resources/ConfigurationCodeDAOTest-load.xml 2008-01-04 21:21:07 UTC (rev 514)
+++ trunk/openutils-configuration-services/src/test/resources/ConfigurationCodeDAOTest-load.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -1,39 +0,0 @@
-<!DOCTYPE dataset SYSTEM "dataset.dtd">
-<dataset>
- <table name="APP_CONFIGURATION_DOMAIN">
- <column>ID_CONFIGURATIONDOMAIN</column>
- <column>DESCRIPTION</column>
- <row>
- <value>DOMINIO1</value>
- <value>DESCRIZIONE</value>
- </row>
- <row>
- <value>APPLTEST</value>
- <value>Application server configuration</value>
- </row>
- </table>
- <table name="APP_CONFIGURATION_CODE">
- <column>ID_CONFIGURATIONCODE</column>
- <column>ID_CONFIGURATIONDOMAIN</column>
- <column>CODE</column>
- <column>DESCRIPTION</column>
- <column>TYPE</column>
- <column>VALUE</column>
- <row>
- <value>1</value>
- <value>DOMINIO1</value>
- <value>CODE1</value>
- <value>DESCRIZIONE</value>
- <value>TIPO</value>
- <value>VALORE</value>
- </row>
- <row>
- <value>2</value>
- <value>APPLTEST</value>
- <value>CURVE_SEARCH_LIMIT</value>
- <value>Maximum number of curves returned by a search operation.</value>
- <value>INT</value>
- <value>500</value>
- </row>
- </table>
-</dataset>
\ No newline at end of file
Deleted: trunk/openutils-configuration-services/src/test/resources/ConfigurationDomainDAOTest-load.xml
===================================================================
--- trunk/openutils-configuration-services/src/test/resources/ConfigurationDomainDAOTest-load.xml 2008-01-04 21:21:07 UTC (rev 514)
+++ trunk/openutils-configuration-services/src/test/resources/ConfigurationDomainDAOTest-load.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -1,11 +0,0 @@
-<!DOCTYPE dataset SYSTEM "dataset.dtd">
-<dataset>
- <table name="APP_CONFIGURATION_DOMAIN">
- <column>ID_CONFIGURATIONDOMAIN</column>
- <column>DESCRIPTION</column>
- <row>
- <value>DOMINIO1</value>
- <value>DESCRIZIONE</value>
- </row>
- </table>
-</dataset>
\ No newline at end of file
Deleted: trunk/openutils-configuration-services/src/test/resources/ConfigurationManagerTest-load.xml
===================================================================
--- trunk/openutils-configuration-services/src/test/resources/ConfigurationManagerTest-load.xml 2008-01-04 21:21:07 UTC (rev 514)
+++ trunk/openutils-configuration-services/src/test/resources/ConfigurationManagerTest-load.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -1,39 +0,0 @@
-<!DOCTYPE dataset SYSTEM "dataset.dtd">
-<dataset>
- <table name="APP_CONFIGURATION_DOMAIN">
- <column>ID_CONFIGURATIONDOMAIN</column>
- <column>DESCRIPTION</column>
- <row>
- <value>CONFIG_DOMAIN</value>
- <value>DESCRIZIONE</value>
- </row>
- <row>
- <value>CONFIG_DOMAIN_2</value>
- <value>DESCRIZIONE_2</value>
- </row>
- </table>
- <table name="APP_CONFIGURATION_CODE">
- <column>ID_CONFIGURATIONCODE</column>
- <column>ID_CONFIGURATIONDOMAIN</column>
- <column>CODE</column>
- <column>DESCRIPTION</column>
- <column>TYPE</column>
- <column>VALUE</column>
- <row>
- <value>5</value>
- <value>CONFIG_DOMAIN</value>
- <value>CODICE</value>
- <value>DESCRIZIONE</value>
- <value>TIPO</value>
- <value>VALORE</value>
- </row>
- <row>
- <value>6</value>
- <value>CONFIG_DOMAIN_2</value>
- <value>CODICE</value>
- <value>DESCRIZIONE</value>
- <value>TIPO</value>
- <value>VALORE</value>
- </row>
- </table>
-</dataset>
\ No newline at end of file
Deleted: trunk/openutils-configuration-services/src/test/resources/ReferenceCodeDAOTest-load.xml
===================================================================
--- trunk/openutils-configuration-services/src/test/resources/ReferenceCodeDAOTest-load.xml 2008-01-04 21:21:07 UTC (rev 514)
+++ trunk/openutils-configuration-services/src/test/resources/ReferenceCodeDAOTest-load.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -1,25 +0,0 @@
-<!DOCTYPE dataset SYSTEM "dataset.dtd">
-<dataset>
- <table name="APP_REFERENCE_DOMAIN">
- <column>ID_REFERENCEDOMAIN</column>
- <column>DESCRIPTION</column>
- <row>
- <value>DOMINIO1</value>
- <value>DESCRIZIONE</value>
- </row>
- </table>
- <table name="APP_REFERENCE_CODE">
- <column>ID_REFERENCECODE</column>
- <column>ID_REFERENCEDOMAIN</column>
- <column>CODE</column>
- <column>DESCRIPTION</column>
- <column>ACTIVE</column>
- <row>
- <value>1</value>
- <value>DOMINIO1</value>
- <value>CODICE</value>
- <value>DESCRIZIONE</value>
- <value>0</value>
- </row>
- </table>
-</dataset>
\ No newline at end of file
Deleted: trunk/openutils-configuration-services/src/test/resources/ReferenceDomainDAOTest-load.xml
===================================================================
--- trunk/openutils-configuration-services/src/test/resources/ReferenceDomainDAOTest-load.xml 2008-01-04 21:21:07 UTC (rev 514)
+++ trunk/openutils-configuration-services/src/test/resources/ReferenceDomainDAOTest-load.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -1,11 +0,0 @@
-<!DOCTYPE dataset SYSTEM "dataset.dtd">
-<dataset>
- <table name="APP_REFERENCE_DOMAIN">
- <column>ID_REFERENCEDOMAIN</column>
- <column>DESCRIPTION</column>
- <row>
- <value>DOMINIO1</value>
- <value>DESCRIZIONE</value>
- </row>
- </table>
-</dataset>
\ No newline at end of file
Deleted: trunk/openutils-configuration-services/src/test/resources/ReferenceManagerTest-load.xml
===================================================================
--- trunk/openutils-configuration-services/src/test/resources/ReferenceManagerTest-load.xml 2008-01-04 21:21:07 UTC (rev 514)
+++ trunk/openutils-configuration-services/src/test/resources/ReferenceManagerTest-load.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -1,25 +0,0 @@
-<!DOCTYPE dataset SYSTEM "dataset.dtd">
-<dataset>
- <table name="APP_REFERENCE_DOMAIN">
- <column>ID_REFERENCEDOMAIN</column>
- <column>DESCRIPTION</column>
- <row>
- <value>CURVE_DOMAIN</value>
- <value>DESCRIZIONE</value>
- </row>
- </table>
- <table name="APP_REFERENCE_CODE">
- <column>ID_REFERENCECODE</column>
- <column>ID_REFERENCEDOMAIN</column>
- <column>CODE</column>
- <column>DESCRIPTION</column>
- <column>ACTIVE</column>
- <row>
- <value>7</value>
- <value>CURVE_DOMAIN</value>
- <value>CODICE</value>
- <value>DESCRIZIONE</value>
- <value>1</value>
- </row>
- </table>
-</dataset>
\ No newline at end of file
Deleted: trunk/openutils-configuration-services/src/test/resources/dataset.dtd
===================================================================
--- trunk/openutils-configuration-services/src/test/resources/dataset.dtd 2008-01-04 21:21:07 UTC (rev 514)
+++ trunk/openutils-configuration-services/src/test/resources/dataset.dtd 2008-01-04 21:22:28 UTC (rev 515)
@@ -1,13 +0,0 @@
-<!ELEMENT dataset (table*)>
-<!ELEMENT table (column+,row+)>
-<!ATTLIST table
- name CDATA #REQUIRED
->
-<!ELEMENT row (value|null)+>
-<!ELEMENT column (#PCDATA)>
-<!ELEMENT value (#PCDATA)>
-<!ELEMENT null EMPTY>
-<!--
-nb una tabella senza righe sarebbe valida (per cancellare tutto il contenuto),
-ma NON DEVE ESISTERE NEI NOSTRI TEST IN QUANTO TUTTE LE TABELLE VENGONO SVUOTATE PRIMA DEL CARICAMENTO
--->
\ No newline at end of file
Modified: trunk/openutils-configuration-services/src/test/resources/spring-dao.xml
===================================================================
--- trunk/openutils-configuration-services/src/test/resources/spring-dao.xml 2008-01-04 21:21:07 UTC (rev 514)
+++ trunk/openutils-configuration-services/src/test/resources/spring-dao.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -2,33 +2,32 @@
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
"http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
- <bean id="configurationCodeDAO" parent="txProxyTemplate">
- <property name="target">
- <bean class="it.openutils.configuration.dao.ConfigurationCodeDAOImpl">
- <property name="sessionFactory" ref="sessionFactory" />
- </bean>
- </property>
- </bean>
- <bean id="configurationDomainDAO" parent="txProxyTemplate">
- <property name="target">
- <bean class="it.openutils.configuration.dao.ConfigurationDomainDAOImpl">
- <property name="sessionFactory" ref="sessionFactory" />
- </bean>
- </property>
- </bean>
- <bean id="referenceCodeDAO" parent="txProxyTemplate">
- <property name="target">
- <bean class="it.openutils.configuration.dao.ReferenceCodeDAOImpl">
- <property name="sessionFactory" ref="sessionFactory" />
- </bean>
- </property>
- </bean>
- <bean id="referenceDomainDAO" parent="txProxyTemplate">
- <property name="target">
- <bean class="it.openutils.configuration.dao.ReferenceDomainDAOImpl">
- <property name="sessionFactory" ref="sessionFactory" />
- </bean>
- </property>
- </bean>
-
+ <bean id="configurationCodeDAO" parent="txProxyTemplate">
+ <property name="target">
+ <bean class="it.openutils.configuration.dao.ConfigurationCodeDAOImpl">
+ <property name="sessionFactory" ref="sessionFactory" />
+ </bean>
+ </property>
+ </bean>
+ <bean id="configurationDomainDAO" parent="txProxyTemplate">
+ <property name="target">
+ <bean class="it.openutils.configuration.dao.ConfigurationDomainDAOImpl">
+ <property name="sessionFactory" ref="sessionFactory" />
+ </bean>
+ </property>
+ </bean>
+ <bean id="referenceCodeDAO" parent="txProxyTemplate">
+ <property name="target">
+ <bean class="it.openutils.configuration.dao.ReferenceCodeDAOImpl">
+ <property name="sessionFactory" ref="sessionFactory" />
+ </bean>
+ </property>
+ </bean>
+ <bean id="referenceDomainDAO" parent="txProxyTemplate">
+ <property name="target">
+ <bean class="it.openutils.configuration.dao.ReferenceDomainDAOImpl">
+ <property name="sessionFactory" ref="sessionFactory" />
+ </bean>
+ </property>
+ </bean>
</beans>
\ No newline at end of file
Modified: trunk/openutils-configuration-services/src/test/resources/spring-database.xml
===================================================================
--- trunk/openutils-configuration-services/src/test/resources/spring-database.xml 2008-01-04 21:21:07 UTC (rev 514)
+++ trunk/openutils-configuration-services/src/test/resources/spring-database.xml 2008-01-04 21:22:28 UTC (rev 515)
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
- # ATTENZIONE: queste proprietà sono utilizzate solo per gli unit tests
- # i file per la configurazione del db utilizzati dall'applicazione web sono in
- # src/main/web-app/WEB-INF
+ # ATTENZIONE: queste proprietà sono utilizzate solo per gli unit tests
+ # i file per la configurazione del db utilizzati dall'applicazione web sono in
+ # src/main/web-app/WEB-INF
-->
<beans>
- <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location">
- <value>classpath:database.properties</value>
- </property>
- </bean>
- <bean id="dataSource"...
[truncated message content] |
|
From: <fg...@us...> - 2008-01-04 21:39:05
|
Revision: 516
http://openutils.svn.sourceforge.net/openutils/?rev=516&view=rev
Author: fgiust
Date: 2008-01-04 13:39:07 -0800 (Fri, 04 Jan 2008)
Log Message:
-----------
more cleanup
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
trunk/openutils-configuration-services/pom.xml
trunk/openutils-spring/pom.xml
trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java
trunk/openutils-tags-spring/pom.xml
trunk/openutils-testing-testng/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2008-01-04 21:22:28 UTC (rev 515)
+++ trunk/openutils-bshd5/pom.xml 2008-01-04 21:39:07 UTC (rev 516)
@@ -35,6 +35,17 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${spring.version}</version>
<exclusions>
Modified: trunk/openutils-configuration-services/pom.xml
===================================================================
--- trunk/openutils-configuration-services/pom.xml 2008-01-04 21:22:28 UTC (rev 515)
+++ trunk/openutils-configuration-services/pom.xml 2008-01-04 21:39:07 UTC (rev 516)
@@ -43,7 +43,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing-testng</artifactId>
- <version>1.1</version>
+ <version>1.1.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -100,6 +100,18 @@
</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>
@@ -123,9 +135,17 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>junit-addons</groupId>
+ <artifactId>junit-addons</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2008-01-04 21:22:28 UTC (rev 515)
+++ trunk/openutils-spring/pom.xml 2008-01-04 21:39:07 UTC (rev 516)
@@ -79,9 +79,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
+ <version>1.4.3</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<version>3.2.1.ga</version>
Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java 2008-01-04 21:22:28 UTC (rev 515)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java 2008-01-04 21:39:07 UTC (rev 516)
@@ -29,225 +29,253 @@
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.Controller;
+
/**
* @author mmolaschi
* @version $Id: $
*/
-public class JSONServiceExporter extends RemoteInvocationBasedExporter
- implements Controller {
- private static final String METHOD = "__method__";
+public class JSONServiceExporter extends RemoteInvocationBasedExporter implements Controller
+{
- private static final String PARAM_PREFIX = "param";
+ private static final String METHOD = "__method__";
- private static final String CONTENT_TYPE = "text/x-json";
+ private static final String PARAM_PREFIX = "param";
- /**
- * {@inheritDoc}
- */
- public ModelAndView handleRequest(HttpServletRequest request,
- HttpServletResponse response) throws Exception {
- if (request.getParameter(METHOD) != null) {
- String methodRequest = request.getParameter(METHOD);
- Method[] methods = this.getServiceInterface().getMethods();
- for (Method method : methods) {
- if (method.getName().equals(methodRequest)) {
- Class[] types = method.getParameterTypes();
- Object[] values = new Object[types.length];
- if (values.length > 0) {
- int i = 0;
- Enumeration<String> names = request.getParameterNames();
- while (names.hasMoreElements()) {
- String name = names.nextElement();
- if (name != null && name.startsWith(PARAM_PREFIX)) {
- String posStr = StringUtils.substringAfter(
- name, PARAM_PREFIX);
- int pos = NumberUtils.toInt(posStr);
+ private static final String CONTENT_TYPE = "text/x-json";
- String[] reqValues = request
- .getParameterValues(name);
- if (reqValues != null && reqValues.length > 0) {
- if (types[pos].isArray()) {
- values[pos] = ConvertUtils.convert(
- reqValues, types[pos]);
- } else {
- values[pos] = ConvertUtils.convert(
- reqValues[0], types[pos]);
- }
- } else {
- values[pos] = null;
- }
+ /**
+ * {@inheritDoc}
+ */
+ public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception
+ {
+ if (request.getParameter(METHOD) != null)
+ {
+ String methodRequest = request.getParameter(METHOD);
+ Method[] methods = this.getServiceInterface().getMethods();
+ for (Method method : methods)
+ {
+ if (method.getName().equals(methodRequest))
+ {
+ Class[] types = method.getParameterTypes();
+ Object[] values = new Object[types.length];
+ if (values.length > 0)
+ {
+ int i = 0;
+ Enumeration<String> names = request.getParameterNames();
+ while (names.hasMoreElements())
+ {
+ String name = names.nextElement();
+ if (name != null && name.startsWith(PARAM_PREFIX))
+ {
+ String posStr = StringUtils.substringAfter(name, PARAM_PREFIX);
+ int pos = NumberUtils.toInt(posStr);
- }
- }
- }
+ String[] reqValues = request.getParameterValues(name);
+ if (reqValues != null && reqValues.length > 0)
+ {
+ if (types[pos].isArray())
+ {
+ values[pos] = ConvertUtils.convert(reqValues, types[pos]);
+ }
+ else
+ {
+ values[pos] = ConvertUtils.convert(reqValues[0], types[pos]);
+ }
+ }
+ else
+ {
+ values[pos] = null;
+ }
- RemoteInvocation invocation = new RemoteInvocation();
- invocation.setArguments(values);
- invocation.setParameterTypes(types);
- invocation.setMethodName(methodRequest);
+ }
+ }
+ }
- RemoteInvocationResult result = invokeAndCreateResult(
- invocation, this.getProxyForService());
+ RemoteInvocation invocation = new RemoteInvocation();
+ invocation.setArguments(values);
+ invocation.setParameterTypes(types);
+ invocation.setMethodName(methodRequest);
- response.setContentType(CONTENT_TYPE);
- JSON json;
- if (result.hasException()) {
- JSONObject obj = JSONObject.fromBean(result
- .getException());
- obj.put("exception", true);
+ RemoteInvocationResult result = invokeAndCreateResult(invocation, this.getProxyForService());
- json = obj;
- } else {
- Object value = cleanLazy(result.getValue());
- if (value != null) {
- if (ClassUtils.getAllInterfaces(value.getClass())
- .contains(Collection.class)) {
- json = JSONArray
- .fromCollection((Collection) value);
- } else if (ClassUtils.getAllInterfaces(
- value.getClass()).contains(Map.class)) {
- json = JSONObject.fromMap((Map) value);
- } else if (value.getClass().isArray()) {
- json = JSONArray.fromArray((Object[]) value);
- } else {
- JSONObject obj = JSONObject.fromBean(value);
- json = obj;
- }
- } else {
- json = JSONNull.getInstance();
- }
- }
- json.write(response.getWriter());
+ response.setContentType(CONTENT_TYPE);
+ JSON json;
+ if (result.hasException())
+ {
+ JSONObject obj = JSONObject.fromBean(result.getException());
+ obj.put("exception", true);
- break;
- }
- }
+ json = obj;
+ }
+ else
+ {
+ Object value = cleanLazy(result.getValue());
+ if (value != null)
+ {
+ if (ClassUtils.getAllInterfaces(value.getClass()).contains(Collection.class))
+ {
+ json = JSONArray.fromCollection((Collection) value);
+ }
+ else if (ClassUtils.getAllInterfaces(value.getClass()).contains(Map.class))
+ {
+ json = JSONObject.fromMap((Map) value);
+ }
+ else if (value.getClass().isArray())
+ {
+ json = JSONArray.fromArray((Object[]) value);
+ }
+ else
+ {
+ JSONObject obj = JSONObject.fromBean(value);
+ json = obj;
+ }
+ }
+ else
+ {
+ json = JSONNull.getInstance();
+ }
+ }
+ json.write(response.getWriter());
- }
- return null;
- }
+ break;
+ }
+ }
- public Object cleanLazy(Object bean) throws IllegalAccessException,
- InstantiationException, IntrospectionException,
- InvocationTargetException {
- if (bean == null) {
- return null;
- }
- Class<?> clazz = bean.getClass();
- if (bean instanceof Collection) {
- Collection collection = (Collection) bean;
+ }
+ return null;
+ }
- Collection newCollection;
- newCollection = collection.getClass().newInstance();
- for (Object myObject : collection) {
- newCollection.add(cleanLazy(myObject));
- }
- collection.clear();
- collection.addAll(newCollection);
- }
- if (bean instanceof Map) {
- Map<Object, Object> map = (Map<Object, Object>) bean;
- Map<Object, Object> newMap = map.getClass().newInstance();
- for (Map.Entry entry : map.entrySet()) {
- Object key = cleanLazy(entry.getKey());
- Object value = cleanLazy(entry.getValue());
- newMap.put(key, value);
- }
- map.clear();
- map.putAll(newMap);
- }
- if (clazz.isArray()) {
- Object[] array = (Object[]) bean;
- for (int i = 0; i < array.length; i++) {
- array[i] = cleanLazy(array[i]);
- }
- }
- boolean isHibernate = !clazz.equals(Hibernate.getClass(bean));
- if (isHibernate) {
- Class<?> noProxyClass = Hibernate.getClass(bean);
- Object noHibernateBean = noProxyClass.newInstance();
- BeanInfo info = Introspector.getBeanInfo(noProxyClass);
- PropertyDescriptor[] descriptors = info.getPropertyDescriptors();
- for (PropertyDescriptor descriptor : descriptors) {
- String name = descriptor.getName();
+ public Object cleanLazy(Object bean) throws IllegalAccessException, InstantiationException, IntrospectionException,
+ InvocationTargetException
+ {
+ if (bean == null)
+ {
+ return null;
+ }
+ Class< ? > clazz = bean.getClass();
+ if (bean instanceof Collection)
+ {
+ Collection collection = (Collection) bean;
- if ("class".equals(name)) {
- descriptor.getWriteMethod().invoke(noHibernateBean,
- new Object[] { null });
- continue;
- }
+ Collection newCollection;
+ newCollection = collection.getClass().newInstance();
+ for (Object myObject : collection)
+ {
+ newCollection.add(cleanLazy(myObject));
+ }
+ collection.clear();
+ collection.addAll(newCollection);
+ }
+ if (bean instanceof Map)
+ {
+ Map<Object, Object> map = (Map<Object, Object>) bean;
+ Map<Object, Object> newMap = map.getClass().newInstance();
+ for (Map.Entry entry : map.entrySet())
+ {
+ Object key = cleanLazy(entry.getKey());
+ Object value = cleanLazy(entry.getValue());
+ newMap.put(key, value);
+ }
+ map.clear();
+ map.putAll(newMap);
+ }
+ if (clazz.isArray())
+ {
+ Object[] array = (Object[]) bean;
+ for (int i = 0; i < array.length; i++)
+ {
+ array[i] = cleanLazy(array[i]);
+ }
+ }
+ boolean isHibernate = !clazz.equals(Hibernate.getClass(bean));
+ if (isHibernate)
+ {
+ Class< ? > noProxyClass = Hibernate.getClass(bean);
+ Object noHibernateBean = noProxyClass.newInstance();
+ BeanInfo info = Introspector.getBeanInfo(noProxyClass);
+ PropertyDescriptor[] descriptors = info.getPropertyDescriptors();
+ for (PropertyDescriptor descriptor : descriptors)
+ {
+ String name = descriptor.getName();
- if ("hibernateLazyInitializer".equals(name)) {
- descriptor.getWriteMethod().invoke(noHibernateBean,
- new Object[] { null });
- continue;
- }
+ if ("class".equals(name))
+ {
+ descriptor.getWriteMethod().invoke(noHibernateBean, new Object[]{null });
+ continue;
+ }
- if (descriptor.getReadMethod() == null
- || descriptor.getWriteMethod() == null) {
- descriptor.getWriteMethod().invoke(noHibernateBean,
- new Object[] { null });
- continue;
- }
+ if ("hibernateLazyInitializer".equals(name))
+ {
+ descriptor.getWriteMethod().invoke(noHibernateBean, new Object[]{null });
+ continue;
+ }
- Method method = findGetter(bean, name);
+ if (descriptor.getReadMethod() == null || descriptor.getWriteMethod() == null)
+ {
+ descriptor.getWriteMethod().invoke(noHibernateBean, new Object[]{null });
+ continue;
+ }
- if (method == null) {
- descriptor.getWriteMethod().invoke(noHibernateBean,
- new Object[] { null });
- continue;
- }
+ Method method = findGetter(bean, name);
- if (!Hibernate.isPropertyInitialized(bean, name)) {
- descriptor.getWriteMethod().invoke(noHibernateBean,
- new Object[] { null });
- continue;
- }
+ if (method == null)
+ {
+ descriptor.getWriteMethod().invoke(noHibernateBean, new Object[]{null });
+ continue;
+ }
- // This might be a lazy-collection so we need to double check
- Object retval = method.invoke(bean);
- if (!Hibernate.isInitialized(retval)) {
- descriptor.getWriteMethod().invoke(noHibernateBean,
- new Object[] { null });
- continue;
- }
- descriptor.getWriteMethod().invoke(noHibernateBean,
- new Object[] { cleanLazy(bean) });
+ if (!Hibernate.isPropertyInitialized(bean, name))
+ {
+ descriptor.getWriteMethod().invoke(noHibernateBean, new Object[]{null });
+ continue;
+ }
- }
+ // This might be a lazy-collection so we need to double check
+ Object retval = method.invoke(bean);
+ if (!Hibernate.isInitialized(retval))
+ {
+ descriptor.getWriteMethod().invoke(noHibernateBean, new Object[]{null });
+ continue;
+ }
+ descriptor.getWriteMethod().invoke(noHibernateBean, new Object[]{cleanLazy(bean) });
- bean = noHibernateBean;
- } else {
- BeanInfo info = Introspector.getBeanInfo(clazz);
- PropertyDescriptor[] descriptors = info.getPropertyDescriptors();
- for (PropertyDescriptor descriptor : descriptors) {
- Object value = descriptor.getReadMethod().invoke(bean, null);
- descriptor.getWriteMethod().invoke(bean,
- new Object[] { cleanLazy(bean) });
- }
- }
- return bean;
- }
+ }
- protected Method findGetter(Object bean, String name)
- throws IntrospectionException {
- Class<?> clazz = Hibernate.getClass(bean);
- // String key = clazz.getName() + ":" + property;
+ bean = noHibernateBean;
+ }
+ else
+ {
+ BeanInfo info = Introspector.getBeanInfo(clazz);
+ PropertyDescriptor[] descriptors = info.getPropertyDescriptors();
+ for (PropertyDescriptor descriptor : descriptors)
+ {
+ Object value = descriptor.getReadMethod().invoke(bean, null);
+ descriptor.getWriteMethod().invoke(bean, new Object[]{cleanLazy(bean) });
+ }
+ }
+ return bean;
+ }
- Method method = null; // methods.get(key);
- // if (method == null)
- // {
- PropertyDescriptor[] props = Introspector.getBeanInfo(clazz)
- .getPropertyDescriptors();
- for (PropertyDescriptor prop : props) {
- if (prop.getName().equalsIgnoreCase(name)) {
- method = prop.getReadMethod();
- }
- }
+ protected Method findGetter(Object bean, String name) throws IntrospectionException
+ {
+ Class< ? > clazz = Hibernate.getClass(bean);
+ // String key = clazz.getName() + ":" + property;
- // methods.put(key, method);
- // }
+ Method method = null; // methods.get(key);
+ // if (method == null)
+ // {
+ PropertyDescriptor[] props = Introspector.getBeanInfo(clazz).getPropertyDescriptors();
+ for (PropertyDescriptor prop : props)
+ {
+ if (prop.getName().equalsIgnoreCase(name))
+ {
+ method = prop.getReadMethod();
+ }
+ }
- return method;
- }
+ // methods.put(key, method);
+ // }
+
+ return method;
+ }
}
Modified: trunk/openutils-tags-spring/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml 2008-01-04 21:22:28 UTC (rev 515)
+++ trunk/openutils-tags-spring/pom.xml 2008-01-04 21:39:07 UTC (rev 516)
@@ -75,6 +75,16 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.13</version>
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2008-01-04 21:22:28 UTC (rev 515)
+++ trunk/openutils-testing-testng/pom.xml 2008-01-04 21:39:07 UTC (rev 516)
@@ -68,9 +68,17 @@
<optional>true</optional>
<exclusions>
<exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>junit-addons</groupId>
+ <artifactId>junit-addons</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -78,7 +86,28 @@
<artifactId>testng</artifactId>
<classifier>jdk15</classifier>
<version>5.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.1.ga</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<properties>
<spring.version>2.5</spring.version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2008-01-08 09:25:09
|
Revision: 517
http://openutils.svn.sourceforge.net/openutils/?rev=517&view=rev
Author: fgiust
Date: 2008-01-08 01:25:06 -0800 (Tue, 08 Jan 2008)
Log Message:
-----------
new openutils-testing module
Modified Paths:
--------------
trunk/pom.xml
Added Paths:
-----------
trunk/openutils-testing/
trunk/openutils-testing/pom.xml
trunk/openutils-testing/src/
Property changes on: trunk/openutils-testing
___________________________________________________________________
Name: svn:ignore
+ .project
.classpath
.checkstyle
target
.settings
Added: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml (rev 0)
+++ trunk/openutils-testing/pom.xml 2008-01-08 09:25:06 UTC (rev 517)
@@ -0,0 +1,54 @@
+<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-testing</artifactId>
+ <name>openutils test utils</name>
+ <version>2.0-SNAPSHOT</version>
+ <description>openutils test utils</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.2</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit-addons</groupId>
+ <artifactId>junit-addons</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <properties>
+ <spring.version>2.5</spring.version>
+ </properties>
+</project>
Property changes on: trunk/openutils-testing/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-01-04 21:39:07 UTC (rev 516)
+++ trunk/pom.xml 2008-01-08 09:25:06 UTC (rev 517)
@@ -201,6 +201,7 @@
<module>openutils-spring</module>
<module>openutils-usermanagement-dataobjects</module>
<module>openutils-usermanagement</module>
+ <module>openutils-testing</module>
<module>openutils-testing-testng</module>
<module>openutils-testing-testng-dwr</module>
<module>openutils-testing-junit</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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] |
|
From: <fg...@us...> - 2008-01-20 16:55:00
|
Revision: 531
http://openutils.svn.sourceforge.net/openutils/?rev=531&view=rev
Author: fgiust
Date: 2008-01-20 08:54:59 -0800 (Sun, 20 Jan 2008)
Log Message:
-----------
update versions
Modified Paths:
--------------
trunk/openutils-backup/pom.xml
trunk/openutils-bshd5/pom.xml
trunk/openutils-configuration-dataobjects/pom.xml
trunk/openutils-configuration-services/pom.xml
trunk/openutils-dbmigration/pom.xml
trunk/openutils-deployment/pom.xml
trunk/openutils-hibernate-security/pom.xml
trunk/openutils-log4j/pom.xml
trunk/openutils-maven-skin/pom.xml
trunk/openutils-mgnlspring/pom.xml
trunk/openutils-mgnlstripes/pom.xml
trunk/openutils-spring/pom.xml
trunk/openutils-spring-rmibernate/pom.xml
trunk/openutils-tags-spring/pom.xml
trunk/openutils-testing/pom.xml
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-junit-dwr/pom.xml
trunk/openutils-testing-testng/pom.xml
trunk/openutils-testing-testng-dwr/pom.xml
trunk/openutils-usermanagement/pom.xml
trunk/openutils-usermanagement-dataobjects/pom.xml
trunk/openutils-web/pom.xml
trunk/pom.xml
trunk/src/site/site.xml
Added Paths:
-----------
trunk/openutils-testing/src/site/apt/index.apt
Modified: trunk/openutils-backup/pom.xml
===================================================================
--- trunk/openutils-backup/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-backup/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-backup</artifactId>
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-bshd5/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-bshd5</artifactId>
Modified: trunk/openutils-configuration-dataobjects/pom.xml
===================================================================
--- trunk/openutils-configuration-dataobjects/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-configuration-dataobjects/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-configuration-services/pom.xml
===================================================================
--- trunk/openutils-configuration-services/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-configuration-services/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-dbmigration/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-dbmigration</artifactId>
Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-deployment/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-deployment</artifactId>
Modified: trunk/openutils-hibernate-security/pom.xml
===================================================================
--- trunk/openutils-hibernate-security/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-hibernate-security/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<artifactId>openutils</artifactId>
<groupId>net.sourceforge.openutils</groupId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-log4j/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -5,7 +5,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-log4j</artifactId>
Modified: trunk/openutils-maven-skin/pom.xml
===================================================================
--- trunk/openutils-maven-skin/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-maven-skin/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -5,7 +5,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-maven-skin</artifactId>
Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-mgnlspring/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-mgnlstripes/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-spring/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-spring</artifactId>
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-spring-rmibernate/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-spring-rmibernate</artifactId>
Modified: trunk/openutils-tags-spring/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-tags-spring/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-tags-spring</artifactId>
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-testing/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing</artifactId>
Added: trunk/openutils-testing/src/site/apt/index.apt
===================================================================
--- trunk/openutils-testing/src/site/apt/index.apt (rev 0)
+++ trunk/openutils-testing/src/site/apt/index.apt 2008-01-20 16:54:59 UTC (rev 531)
@@ -0,0 +1,8 @@
+ --------------------------
+ O p e n u t i l s
+ --------------------------
+ Fabrizio Giustina
+ --------------------------
+
+openutils-testing
+
Property changes on: trunk/openutils-testing/src/site/apt/index.apt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-testing-junit/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-junit</artifactId>
Modified: trunk/openutils-testing-junit-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-junit-dwr/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-testing-junit-dwr/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-junit-dwr</artifactId>
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-testing-testng/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-testng</artifactId>
Modified: trunk/openutils-testing-testng-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-testng-dwr/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-testing-testng-dwr/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-testng-dwr</artifactId>
Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-usermanagement/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-usermanagement-dataobjects/pom.xml
===================================================================
--- trunk/openutils-usermanagement-dataobjects/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-usermanagement-dataobjects/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-web/pom.xml
===================================================================
--- trunk/openutils-web/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/openutils-web/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>5</version>
+ <version>6</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-web</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/pom.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
<packaging>pom</packaging>
- <version>5</version>
+ <version>6</version>
<name>openutils</name>
<description>openutils parent POM</description>
<url>http://openutils.sourceforge.net</url>
@@ -191,13 +191,9 @@
</distributionManagement>
<modules>
<module>openutils-maven-skin</module>
- <!--
<module>openutils-bshd5</module>
<module>openutils-deployment</module>
-
- -->
<module>openutils-log4j</module>
- <!--
<module>openutils-spring</module>
<module>openutils-usermanagement-dataobjects</module>
<module>openutils-usermanagement</module>
@@ -216,8 +212,6 @@
<module>openutils-mgnlspring</module>
<module>openutils-mgnlstripes</module>
<module>openutils-spring-rmibernate</module>
-
- -->
</modules>
<dependencyManagement>
<dependencies>
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2008-01-20 16:50:15 UTC (rev 530)
+++ trunk/src/site/site.xml 2008-01-20 16:54:59 UTC (rev 531)
@@ -21,6 +21,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</skin>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2008-01-20 17:20:17
|
Revision: 537
http://openutils.svn.sourceforge.net/openutils/?rev=537&view=rev
Author: fgiust
Date: 2008-01-20 09:20:20 -0800 (Sun, 20 Jan 2008)
Log Message:
-----------
update site descriptors
Modified Paths:
--------------
trunk/openutils-backup/src/site/site.xml
trunk/openutils-bshd5/src/site/site.xml
trunk/openutils-configuration-dataobjects/src/site/site.xml
trunk/openutils-configuration-services/src/site/site.xml
trunk/openutils-dbmigration/src/site/site.xml
trunk/openutils-deployment/src/site/site.xml
trunk/openutils-hibernate-security/src/site/site.xml
trunk/openutils-log4j/src/site/site.xml
trunk/openutils-mgnlspring/src/site/site.xml
trunk/openutils-mgnlstripes/src/site/site.xml
trunk/openutils-spring/src/site/site.xml
trunk/openutils-tags-spring/src/site/site.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/src/site/site.xml
trunk/openutils-testing-testng-dwr/pom.xml
trunk/openutils-testing-testng-dwr/src/site/site.xml
trunk/openutils-usermanagement/src/site/site.xml
trunk/openutils-usermanagement-dataobjects/src/site/site.xml
trunk/openutils-web/src/site/site.xml
Added Paths:
-----------
trunk/openutils-spring-rmibernate/src/site/
trunk/openutils-spring-rmibernate/src/site/site.xml
trunk/openutils-testing/src/site/site.xml
Modified: trunk/openutils-backup/src/site/site.xml
===================================================================
--- trunk/openutils-backup/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-backup/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils backup">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils-backup">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Modified: trunk/openutils-bshd5/src/site/site.xml
===================================================================
--- trunk/openutils-bshd5/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-bshd5/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -12,14 +12,18 @@
<href>http://www.sourceforge.net/projects/openutils</href>
</bannerLeft>
<body>
- <menu ref="modules" inherit="bottom" />
- <menu ref="reports" inherit="bottom" />
<head>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils-bshd5">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Modified: trunk/openutils-configuration-dataobjects/src/site/site.xml
===================================================================
--- trunk/openutils-configuration-dataobjects/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-configuration-dataobjects/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils configuration dataobjects">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils configuration">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Modified: trunk/openutils-configuration-services/src/site/site.xml
===================================================================
--- trunk/openutils-configuration-services/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-configuration-services/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils configuration services">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils configuration">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Modified: trunk/openutils-dbmigration/src/site/site.xml
===================================================================
--- trunk/openutils-dbmigration/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-dbmigration/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils dbmigration">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils dbmigration">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Modified: trunk/openutils-deployment/src/site/site.xml
===================================================================
--- trunk/openutils-deployment/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-deployment/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils deployment">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils deployment">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Modified: trunk/openutils-hibernate-security/src/site/site.xml
===================================================================
--- trunk/openutils-hibernate-security/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-hibernate-security/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils hibernate security">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils hibernate security">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Modified: trunk/openutils-log4j/src/site/site.xml
===================================================================
--- trunk/openutils-log4j/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-log4j/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -28,6 +28,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</skin>
</project>
Modified: trunk/openutils-mgnlspring/src/site/site.xml
===================================================================
--- trunk/openutils-mgnlspring/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-mgnlspring/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils mgnlspring">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils mgnlspring">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Modified: trunk/openutils-mgnlstripes/src/site/site.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-mgnlstripes/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils mgnlstripes">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils mgnlstripes">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Modified: trunk/openutils-spring/src/site/site.xml
===================================================================
--- trunk/openutils-spring/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-spring/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils spring">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils spring">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Added: trunk/openutils-spring-rmibernate/src/site/site.xml
===================================================================
--- trunk/openutils-spring-rmibernate/src/site/site.xml (rev 0)
+++ trunk/openutils-spring-rmibernate/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Openutils rmihibernate">
+ <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://www.sourceforge.net/projects/openutils</href>
+ </bannerLeft>
+ <body>
+ <head>
+ <link rel="icon" href="images/favicon.ico" />
+ </head>
+ <menu name="openutils rmihibernate">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
+ </body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
+ </skin>
+</project>
Property changes on: trunk/openutils-spring-rmibernate/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-tags-spring/src/site/site.xml
===================================================================
--- trunk/openutils-tags-spring/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-tags-spring/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils tags-spring">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils tags-spring">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Added: trunk/openutils-testing/src/site/site.xml
===================================================================
--- trunk/openutils-testing/src/site/site.xml (rev 0)
+++ trunk/openutils-testing/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Openutils testing">
+ <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://www.sourceforge.net/projects/openutils</href>
+ </bannerLeft>
+ <body>
+ <head>
+ <link rel="icon" href="images/favicon.ico" />
+ </head>
+ <menu name="openutils testing">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
+ </body>
+ <skin>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
+ </skin>
+</project>
Property changes on: trunk/openutils-testing/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-testing-junit/src/site/site.xml
===================================================================
--- trunk/openutils-testing-junit/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-testing-junit/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils testing (junit)">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils testing (junit)">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Modified: trunk/openutils-testing-junit-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-junit-dwr/pom.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-testing-junit-dwr/pom.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -8,7 +8,7 @@
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-junit-dwr</artifactId>
- <name>openutils test utils (junit) for dwr</name>
+ <name>openutils dwr test utils (junit)</name>
<version>2.0-SNAPSHOT</version>
<description>openutils test utils for dwr</description>
<dependencies>
Modified: trunk/openutils-testing-junit-dwr/src/site/site.xml
===================================================================
--- trunk/openutils-testing-junit-dwr/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-testing-junit-dwr/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils dwr testing (junit)">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils dwr testing (junit)">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Modified: trunk/openutils-testing-testng/src/site/site.xml
===================================================================
--- trunk/openutils-testing-testng/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-testing-testng/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils testing (testng)">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils testing (testng)">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Modified: trunk/openutils-testing-testng-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-testng-dwr/pom.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-testing-testng-dwr/pom.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -8,7 +8,7 @@
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-testng-dwr</artifactId>
- <name>openutils test utils (testng) for dwr</name>
+ <name>openutils dwr test utils (testng)</name>
<version>2.0-SNAPSHOT</version>
<description>openutils test utils for dwr</description>
<dependencies>
Modified: trunk/openutils-testing-testng-dwr/src/site/site.xml
===================================================================
--- trunk/openutils-testing-testng-dwr/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-testing-testng-dwr/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils dwr testing (testng)">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils dwr testing (testng)">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Modified: trunk/openutils-usermanagement/src/site/site.xml
===================================================================
--- trunk/openutils-usermanagement/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-usermanagement/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils usermanagement">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils usermanagement">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Modified: trunk/openutils-usermanagement-dataobjects/src/site/site.xml
===================================================================
--- trunk/openutils-usermanagement-dataobjects/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-usermanagement-dataobjects/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils usermanagement dataobjects">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils usermanagement dataobjects">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
Modified: trunk/openutils-web/src/site/site.xml
===================================================================
--- trunk/openutils-web/src/site/site.xml 2008-01-20 17:02:17 UTC (rev 536)
+++ trunk/openutils-web/src/site/site.xml 2008-01-20 17:20:20 UTC (rev 537)
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Openutils">
+<project name="Openutils web">
+ <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>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <menu name="openutils web">
+ <item name="Usage" href="index.html"></item>
+ </menu>
+ <menu ref="modules" inherit="bottom" />
+ <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
+ <version>1.0</version>
</skin>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2008-01-20 19:29:52
|
Revision: 540
http://openutils.svn.sourceforge.net/openutils/?rev=540&view=rev
Author: fgiust
Date: 2008-01-20 11:29:56 -0800 (Sun, 20 Jan 2008)
Log Message:
-----------
modifiche alla struttura sito
Modified Paths:
--------------
trunk/openutils-bshd5/src/site/site.xml
trunk/openutils-dbmigration/src/site/site.xml
trunk/openutils-deployment/src/site/site.xml
trunk/openutils-log4j/src/site/apt/index.apt
trunk/openutils-log4j/src/site/site.xml
trunk/openutils-testing/src/site/site.xml
Added Paths:
-----------
trunk/openutils-bshd5/src/site/apt/
Modified: trunk/openutils-bshd5/src/site/site.xml
===================================================================
--- trunk/openutils-bshd5/src/site/site.xml 2008-01-20 19:22:22 UTC (rev 539)
+++ trunk/openutils-bshd5/src/site/site.xml 2008-01-20 19:29:56 UTC (rev 540)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="Openutils bshd5">
- <publishDate position="left" format="yyyy-MM-dd" />
+ <publishDate position="navigation-bottom" format="yyyy-MM-dd" />
+ <version position="navigation-bottom" />
<bannerRight>
<name>Openutils</name>
<src>http://openutils.sourceforge.net/images/openutils-logo.png</src>
@@ -15,6 +16,10 @@
<head>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <breadcrumbs>
+ <item name="openutils" href="http://openutils.sourceforge.net/" />
+ <item name="openutils-bshd5" href="http://openutils.sourceforge.net/openutils-bshd5" />
+ </breadcrumbs>
<menu name="openutils-bshd5">
<item name="Usage" href="index.html"></item>
</menu>
Modified: trunk/openutils-dbmigration/src/site/site.xml
===================================================================
--- trunk/openutils-dbmigration/src/site/site.xml 2008-01-20 19:22:22 UTC (rev 539)
+++ trunk/openutils-dbmigration/src/site/site.xml 2008-01-20 19:29:56 UTC (rev 540)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="Openutils dbmigration">
- <publishDate position="left" format="yyyy-MM-dd" />
+ <publishDate position="navigation-bottom" format="yyyy-MM-dd" />
+ <version position="navigation-bottom" />
<bannerRight>
<name>Openutils</name>
<src>http://openutils.sourceforge.net/images/openutils-logo.png</src>
@@ -15,6 +16,10 @@
<head>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <breadcrumbs>
+ <item name="openutils" href="http://openutils.sourceforge.net/" />
+ <item name="openutils-dbmigration" href="http://openutils.sourceforge.net/openutils-dbmigration" />
+ </breadcrumbs>
<menu name="openutils dbmigration">
<item name="Usage" href="index.html"></item>
</menu>
Modified: trunk/openutils-deployment/src/site/site.xml
===================================================================
--- trunk/openutils-deployment/src/site/site.xml 2008-01-20 19:22:22 UTC (rev 539)
+++ trunk/openutils-deployment/src/site/site.xml 2008-01-20 19:29:56 UTC (rev 540)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="Openutils deployment">
- <publishDate position="left" format="yyyy-MM-dd" />
+ <publishDate position="navigation-bottom" format="yyyy-MM-dd" />
+ <version position="navigation-bottom" />
<bannerRight>
<name>Openutils</name>
<src>http://openutils.sourceforge.net/images/openutils-logo.png</src>
@@ -15,6 +16,10 @@
<head>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <breadcrumbs>
+ <item name="openutils" href="http://openutils.sourceforge.net/" />
+ <item name="openutils-deployment" href="http://openutils.sourceforge.net/openutils-deployment" />
+ </breadcrumbs>
<menu name="openutils deployment">
<item name="Usage" href="index.html"></item>
</menu>
Modified: trunk/openutils-log4j/src/site/apt/index.apt
===================================================================
--- trunk/openutils-log4j/src/site/apt/index.apt 2008-01-20 19:22:22 UTC (rev 539)
+++ trunk/openutils-log4j/src/site/apt/index.apt 2008-01-20 19:29:56 UTC (rev 540)
@@ -18,7 +18,7 @@
[]
-maven
+Maven
Openutils-log4j is built using maven 2. If you want to use openutils-log4j in your application you can declare the
dependency as:
@@ -27,6 +27,11 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-log4j</artifactId>
- <version>${project.version}</version>
+ <version>...</version>
</dependency>
-+----------------------------------------------+
\ No newline at end of file
++----------------------------------------------+
+
+Released versions
+
+ Check it at {{{http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-log4j}http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-log4j}}
+
Modified: trunk/openutils-log4j/src/site/site.xml
===================================================================
--- trunk/openutils-log4j/src/site/site.xml 2008-01-20 19:22:22 UTC (rev 539)
+++ trunk/openutils-log4j/src/site/site.xml 2008-01-20 19:29:56 UTC (rev 540)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="Openutils log4j">
- <publishDate position="left" format="yyyy-MM-dd" />
+ <publishDate position="navigation-bottom" format="yyyy-MM-dd" />
+ <version position="navigation-bottom" />
<bannerRight>
<name>Openutils</name>
<src>http://openutils.sourceforge.net/images/openutils-logo.png</src>
@@ -15,6 +16,10 @@
<head>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <breadcrumbs>
+ <item name="openutils" href="http://openutils.sourceforge.net/" />
+ <item name="openutils-log4j" href="http://openutils.sourceforge.net/openutils-log4j" />
+ </breadcrumbs>
<menu name="openutils-log4j">
<item name="Usage" href="index.html">
<item name="smtp appender" href="smtpappender.html" />
Modified: trunk/openutils-testing/src/site/site.xml
===================================================================
--- trunk/openutils-testing/src/site/site.xml 2008-01-20 19:22:22 UTC (rev 539)
+++ trunk/openutils-testing/src/site/site.xml 2008-01-20 19:29:56 UTC (rev 540)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="Openutils testing">
- <publishDate position="left" format="yyyy-MM-dd" />
+ <publishDate position="navigation-bottom" format="yyyy-MM-dd" />
+ <version position="navigation-bottom" />
<bannerRight>
<name>Openutils</name>
<src>http://openutils.sourceforge.net/images/openutils-logo.png</src>
@@ -15,6 +16,10 @@
<head>
<link rel="icon" href="images/favicon.ico" />
</head>
+ <breadcrumbs>
+ <item name="openutils" href="http://openutils.sourceforge.net/" />
+ <item name="openutils-testing" href="http://openutils.sourceforge.net/openutils-testing" />
+ </breadcrumbs>
<menu name="openutils testing">
<item name="Usage" href="index.html"></item>
</menu>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2008-01-21 09:07:20
|
Revision: 542
http://openutils.svn.sourceforge.net/openutils/?rev=542&view=rev
Author: fgiust
Date: 2008-01-21 01:07:23 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
docs
Modified Paths:
--------------
trunk/openutils-dbmigration/pom.xml
trunk/openutils-log4j/src/site/apt/index.apt
trunk/openutils-maven-skin/src/main/resources/css/site.css
trunk/openutils-spring-rmibernate/pom.xml
Added Paths:
-----------
trunk/openutils-bshd5/src/site/apt/index.apt
trunk/openutils-dbmigration/src/site/apt/
trunk/openutils-dbmigration/src/site/apt/index.apt
trunk/openutils-deployment/src/site/apt/
trunk/openutils-deployment/src/site/apt/index.apt
Added: trunk/openutils-bshd5/src/site/apt/index.apt
===================================================================
--- trunk/openutils-bshd5/src/site/apt/index.apt (rev 0)
+++ trunk/openutils-bshd5/src/site/apt/index.apt 2008-01-21 09:07:23 UTC (rev 542)
@@ -0,0 +1,15 @@
+ --------------------------
+ O p e n u t i l s
+ --------------------------
+ Fabrizio Giustina
+ --------------------------
+
+openutils-bshd5
+
+ bshd5 stands for "base spring-hibernate DAO for java 5"
+
+
+Released versions
+
+ Check it at {{{http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-bshd5}http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-bshd5}}
+
Property changes on: trunk/openutils-bshd5/src/site/apt/index.apt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2008-01-20 20:47:20 UTC (rev 541)
+++ trunk/openutils-dbmigration/pom.xml 2008-01-21 09:07:23 UTC (rev 542)
@@ -8,7 +8,7 @@
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-dbmigration</artifactId>
- <name>openutils db migration framework</name>
+ <name>openutils db migration</name>
<version>2.0-SNAPSHOT</version>
<description />
<dependencies>
Added: trunk/openutils-dbmigration/src/site/apt/index.apt
===================================================================
--- trunk/openutils-dbmigration/src/site/apt/index.apt (rev 0)
+++ trunk/openutils-dbmigration/src/site/apt/index.apt 2008-01-21 09:07:23 UTC (rev 542)
@@ -0,0 +1,15 @@
+ --------------------------
+ O p e n u t i l s
+ --------------------------
+ Fabrizio Giustina
+ --------------------------
+
+openutils-dbmigration
+
+
+
+
+Released versions
+
+ Check it at {{{http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-dbmigration}http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-dbmigration}}
+
Property changes on: trunk/openutils-dbmigration/src/site/apt/index.apt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/openutils-deployment/src/site/apt/index.apt
===================================================================
--- trunk/openutils-deployment/src/site/apt/index.apt (rev 0)
+++ trunk/openutils-deployment/src/site/apt/index.apt 2008-01-21 09:07:23 UTC (rev 542)
@@ -0,0 +1,15 @@
+ --------------------------
+ O p e n u t i l s
+ --------------------------
+ Fabrizio Giustina
+ --------------------------
+
+openutils-deployment
+
+
+
+
+Released versions
+
+ Check it at {{{http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-deployment}http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-deployment}}
+
Property changes on: trunk/openutils-deployment/src/site/apt/index.apt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/openutils-log4j/src/site/apt/index.apt
===================================================================
--- trunk/openutils-log4j/src/site/apt/index.apt 2008-01-20 20:47:20 UTC (rev 541)
+++ trunk/openutils-log4j/src/site/apt/index.apt 2008-01-21 09:07:23 UTC (rev 542)
@@ -18,19 +18,6 @@
[]
-Maven
-
- Openutils-log4j is built using maven 2. If you want to use openutils-log4j in your application you can declare the
- dependency as:
-
-+----------------------------------------------+
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-log4j</artifactId>
- <version>...</version>
- </dependency>
-+----------------------------------------------+
-
Released versions
Check it at {{{http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-log4j}http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-log4j}}
Modified: trunk/openutils-maven-skin/src/main/resources/css/site.css
===================================================================
--- trunk/openutils-maven-skin/src/main/resources/css/site.css 2008-01-20 20:47:20 UTC (rev 541)
+++ trunk/openutils-maven-skin/src/main/resources/css/site.css 2008-01-21 09:07:23 UTC (rev 542)
@@ -41,7 +41,7 @@
}
#leftColumn a.poweredBy {
- border: 1px solid #000;
+ border: none;
}
a:link {
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2008-01-20 20:47:20 UTC (rev 541)
+++ trunk/openutils-spring-rmibernate/pom.xml 2008-01-21 09:07:23 UTC (rev 542)
@@ -8,8 +8,8 @@
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-spring-rmibernate</artifactId>
- <name>hibernate RMI remote lazy loading</name>
- <version>1.0.4-SNAPSHOT</version>
+ <name>hibernate remote lazy loading</name>
+ <version>2.0-SNAPSHOT</version>
<description>openutils base Spring-Hibernate RMI remote lazy loading support</description>
<dependencies>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2008-01-27 10:53:51
|
Revision: 553
http://openutils.svn.sourceforge.net/openutils/?rev=553&view=rev
Author: fgiust
Date: 2008-01-27 02:53:50 -0800 (Sun, 27 Jan 2008)
Log Message:
-----------
update parent
Modified Paths:
--------------
trunk/openutils-backup/pom.xml
trunk/openutils-bshd5/pom.xml
trunk/openutils-configuration-dataobjects/pom.xml
trunk/openutils-configuration-services/pom.xml
trunk/openutils-dbmigration/pom.xml
trunk/openutils-deployment/pom.xml
trunk/openutils-hibernate-security/pom.xml
trunk/openutils-log4j/pom.xml
trunk/openutils-maven-skin/pom.xml
trunk/openutils-mgnlspring/pom.xml
trunk/openutils-mgnlstripes/pom.xml
trunk/openutils-spring/pom.xml
trunk/openutils-spring-rmibernate/pom.xml
trunk/openutils-tags-spring/pom.xml
trunk/openutils-testing/pom.xml
trunk/openutils-testing/src/site/site.xml
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-junit-dwr/pom.xml
trunk/openutils-testing-testng/pom.xml
trunk/openutils-testing-testng-dwr/pom.xml
trunk/openutils-usermanagement/pom.xml
trunk/openutils-usermanagement-dataobjects/pom.xml
trunk/openutils-web/pom.xml
trunk/src/site/apt/index.apt
trunk/src/site/site.xml
Modified: trunk/openutils-backup/pom.xml
===================================================================
--- trunk/openutils-backup/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-backup/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-backup</artifactId>
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-bshd5/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-bshd5</artifactId>
@@ -102,12 +102,6 @@
<artifactId>commons-lang</artifactId>
<version>2.3</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <optional>true</optional>
- </dependency>
</dependencies>
<properties>
<spring.version>2.5.1</spring.version>
Modified: trunk/openutils-configuration-dataobjects/pom.xml
===================================================================
--- trunk/openutils-configuration-dataobjects/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-configuration-dataobjects/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-configuration-services/pom.xml
===================================================================
--- trunk/openutils-configuration-services/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-configuration-services/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-dbmigration/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-dbmigration</artifactId>
Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-deployment/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-deployment</artifactId>
Modified: trunk/openutils-hibernate-security/pom.xml
===================================================================
--- trunk/openutils-hibernate-security/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-hibernate-security/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<artifactId>openutils</artifactId>
<groupId>net.sourceforge.openutils</groupId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-log4j/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -5,7 +5,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-log4j</artifactId>
Modified: trunk/openutils-maven-skin/pom.xml
===================================================================
--- trunk/openutils-maven-skin/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-maven-skin/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-maven-skin</artifactId>
Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-mgnlspring/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-mgnlstripes/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-spring/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-spring</artifactId>
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-spring-rmibernate/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-spring-rmibernate</artifactId>
Modified: trunk/openutils-tags-spring/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-tags-spring/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-tags-spring</artifactId>
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-testing/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing</artifactId>
Modified: trunk/openutils-testing/src/site/site.xml
===================================================================
--- trunk/openutils-testing/src/site/site.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-testing/src/site/site.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -22,6 +22,7 @@
</breadcrumbs>
<menu name="openutils testing">
<item name="Usage" href="index.html"></item>
+ <item name="DbUnit tests" href="dbunit.html"></item>
</menu>
<menu ref="modules" inherit="bottom" />
<menu ref="reports" inherit="bottom" />
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-testing-junit/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-junit</artifactId>
Modified: trunk/openutils-testing-junit-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-junit-dwr/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-testing-junit-dwr/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-junit-dwr</artifactId>
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-testing-testng/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-testng</artifactId>
@@ -15,10 +15,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
- <configuration>
- <forkMode>once</forkMode>
- </configuration>
+ <version>2.4</version>
</plugin>
</plugins>
</build>
Modified: trunk/openutils-testing-testng-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-testng-dwr/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-testing-testng-dwr/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-testng-dwr</artifactId>
Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-usermanagement/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-usermanagement-dataobjects/pom.xml
===================================================================
--- trunk/openutils-usermanagement-dataobjects/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-usermanagement-dataobjects/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-web/pom.xml
===================================================================
--- trunk/openutils-web/pom.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/openutils-web/pom.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-web</artifactId>
Modified: trunk/src/site/apt/index.apt
===================================================================
--- trunk/src/site/apt/index.apt 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/src/site/apt/index.apt 2008-01-27 10:53:50 UTC (rev 553)
@@ -16,4 +16,27 @@
{{{http://www.openmindonline.it}http://www.openmindonline.it}}
+Distribution
+ Openutils releases are available in the main maven2 repository.
+
+ Snapshots versions are available in separate repository hosted at sourceforge:
+ add the following repository to your pom if you need to download openutils snapshots
+
++----------------------------------------------+
+
+ <repositories>
+ <repository>
+ <id>snapshots.openutils.sourceforge.net</id>
+ <name>openutils snapshot repository</name>
+ <url>http://openutils.sourceforge.net/repository/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
++----------------------------------------------+
\ No newline at end of file
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2008-01-27 10:52:15 UTC (rev 552)
+++ trunk/src/site/site.xml 2008-01-27 10:53:50 UTC (rev 553)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="Openutils">
<publishDate position="left" format="yyyy-MM-dd" />
+ <version position="bottom" />
<bannerRight>
<name>Openutils</name>
<src>http://openutils.sourceforge.net/images/openutils-logo.png</src>
@@ -16,7 +17,6 @@
<link rel="icon" href="images/favicon.ico" />
</head>
<menu ref="modules" inherit="bottom" />
- <menu ref="reports" inherit="bottom" />
</body>
<skin>
<groupId>net.sourceforge.openutils</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2008-01-27 11:16:26
|
Revision: 561
http://openutils.svn.sourceforge.net/openutils/?rev=561&view=rev
Author: fgiust
Date: 2008-01-27 03:16:29 -0800 (Sun, 27 Jan 2008)
Log Message:
-----------
released version of openutils-testing
Modified Paths:
--------------
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-testng/pom.xml
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2008-01-27 11:12:28 UTC (rev 560)
+++ trunk/openutils-testing-junit/pom.xml 2008-01-27 11:16:29 UTC (rev 561)
@@ -15,7 +15,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
+ <version>1.4.3</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2008-01-27 11:12:28 UTC (rev 560)
+++ trunk/openutils-testing-testng/pom.xml 2008-01-27 11:16:29 UTC (rev 561)
@@ -15,7 +15,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -35,12 +35,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.1</version>
+ <version>1.4.3</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.1</version>
+ <version>1.4.3</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2008-01-31 22:23:28
|
Revision: 583
http://openutils.svn.sourceforge.net/openutils/?rev=583&view=rev
Author: fgiust
Date: 2008-01-31 14:23:34 -0800 (Thu, 31 Jan 2008)
Log Message:
-----------
update openutils-testing dependency to 2.0.2
Modified Paths:
--------------
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-testng/pom.xml
Property Changed:
----------------
trunk/openutils-testing-testng/
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2008-01-31 22:20:03 UTC (rev 582)
+++ trunk/openutils-testing-junit/pom.xml 2008-01-31 22:23:34 UTC (rev 583)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -14,7 +15,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.0</version>
+ <version>2.0.2</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Property changes on: trunk/openutils-testing-testng
___________________________________________________________________
Name: svn:ignore
- .checkstyle
target
.settings
.classpath
.project
test-output
temp-testng-customsuite.xml
+ .checkstyle
target
.settings
.classpath
.project
test-output
temp-testng-customsuite.xml
derby.log
release.properties
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2008-01-31 22:20:03 UTC (rev 582)
+++ trunk/openutils-testing-testng/pom.xml 2008-01-31 22:23:34 UTC (rev 583)
@@ -14,7 +14,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.0</version>
+ <version>2.0.2</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2008-02-12 16:57:50
|
Revision: 615
http://openutils.svn.sourceforge.net/openutils/?rev=615&view=rev
Author: fcarone
Date: 2008-02-12 08:57:54 -0800 (Tue, 12 Feb 2008)
Log Message:
-----------
pom.xml update to make openutils modules consistent
Modified Paths:
--------------
trunk/openutils-hibernate-security/pom.xml
trunk/openutils-usermanagement/pom.xml
trunk/openutils-usermanagement-dataobjects/pom.xml
Property Changed:
----------------
trunk/openutils-spring-rmibernate/
Modified: trunk/openutils-hibernate-security/pom.xml
===================================================================
--- trunk/openutils-hibernate-security/pom.xml 2008-02-11 20:51:03 UTC (rev 614)
+++ trunk/openutils-hibernate-security/pom.xml 2008-02-12 16:57:54 UTC (rev 615)
@@ -101,17 +101,17 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-usermanagement-dataobjects</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-bshd5</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing-junit</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Property changes on: trunk/openutils-spring-rmibernate
___________________________________________________________________
Name: svn:ignore
- .project
.classpath
.checkstyle
target
.settings
+ .project
.classpath
.checkstyle
target
.settings
pom.xml.releaseBackup
release.properties
Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml 2008-02-11 20:51:03 UTC (rev 614)
+++ trunk/openutils-usermanagement/pom.xml 2008-02-12 16:57:54 UTC (rev 615)
@@ -28,12 +28,12 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-bshd5</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing-junit</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: trunk/openutils-usermanagement-dataobjects/pom.xml
===================================================================
--- trunk/openutils-usermanagement-dataobjects/pom.xml 2008-02-11 20:51:03 UTC (rev 614)
+++ trunk/openutils-usermanagement-dataobjects/pom.xml 2008-02-12 16:57:54 UTC (rev 615)
@@ -10,7 +10,7 @@
<artifactId>openutils-usermanagement-dataobjects</artifactId>
<packaging>jar</packaging>
<name>openutils usermanagement dataobjects</name>
- <version>2.1-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
<description>Usermanagement dataobjects</description>
<dependencies>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2008-02-14 16:06:37
|
Revision: 617
http://openutils.svn.sourceforge.net/openutils/?rev=617&view=rev
Author: fcarone
Date: 2008-02-14 08:06:03 -0800 (Thu, 14 Feb 2008)
Log Message:
-----------
pom update before release. please release projects altogether in the future
Modified Paths:
--------------
trunk/openutils-configuration-services/pom.xml
trunk/openutils-hibernate-security/pom.xml
trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/SecurityIntegrationTest.java
trunk/openutils-testing-junit-dwr/pom.xml
trunk/openutils-testing-testng-dwr/pom.xml
trunk/openutils-usermanagement/pom.xml
trunk/pom.xml
Modified: trunk/openutils-configuration-services/pom.xml
===================================================================
--- trunk/openutils-configuration-services/pom.xml 2008-02-14 16:02:44 UTC (rev 616)
+++ trunk/openutils-configuration-services/pom.xml 2008-02-14 16:06:03 UTC (rev 617)
@@ -38,12 +38,12 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-bshd5</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing-testng</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: trunk/openutils-hibernate-security/pom.xml
===================================================================
--- trunk/openutils-hibernate-security/pom.xml 2008-02-14 16:02:44 UTC (rev 616)
+++ trunk/openutils-hibernate-security/pom.xml 2008-02-14 16:06:03 UTC (rev 617)
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
- <version>3.2.3.ga</version>
+ <version>3.2.5.ga</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -137,7 +137,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
+ <version>3.3.0.ga</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Modified: trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/SecurityIntegrationTest.java
===================================================================
--- trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/SecurityIntegrationTest.java 2008-02-14 16:02:44 UTC (rev 616)
+++ trunk/openutils-hibernate-security/src/test/java/it/openutils/hibernate/security/SecurityIntegrationTest.java 2008-02-14 16:06:03 UTC (rev 617)
@@ -80,7 +80,6 @@
0,
new ArrayList<Criterion>());
Assert.assertNotNull(dummyObjects);
-// Assert.assertEquals(1, dummyObjects.size());
dummyObjects = securedObject.findFiltered(filter);
Assert.assertNotNull(dummyObjects);
Modified: trunk/openutils-testing-junit-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-junit-dwr/pom.xml 2008-02-14 16:02:44 UTC (rev 616)
+++ trunk/openutils-testing-junit-dwr/pom.xml 2008-02-14 16:06:03 UTC (rev 617)
@@ -15,7 +15,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: trunk/openutils-testing-testng-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-testng-dwr/pom.xml 2008-02-14 16:02:44 UTC (rev 616)
+++ trunk/openutils-testing-testng-dwr/pom.xml 2008-02-14 16:06:03 UTC (rev 617)
@@ -15,7 +15,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml 2008-02-14 16:02:44 UTC (rev 616)
+++ trunk/openutils-usermanagement/pom.xml 2008-02-14 16:06:03 UTC (rev 617)
@@ -23,7 +23,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-usermanagement-dataobjects</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-02-14 16:02:44 UTC (rev 616)
+++ trunk/pom.xml 2008-02-14 16:06:03 UTC (rev 617)
@@ -218,7 +218,10 @@
<module>openutils-configuration-dataobjects</module>
<module>openutils-configuration-services</module>
<module>openutils-hibernate-security</module>
+ <!-- temporarily disabled for missing dependencies -->
+ <!--
<module>openutils-mgnlspring</module>
+ -->
<module>openutils-mgnlstripes</module>
<module>openutils-spring-rmibernate</module>
</modules>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fc...@us...> - 2008-03-20 15:14:20
|
Revision: 748
http://openutils.svn.sourceforge.net/openutils/?rev=748&view=rev
Author: fcarone
Date: 2008-03-20 08:13:45 -0700 (Thu, 20 Mar 2008)
Log Message:
-----------
initial impl for remote callbacks
Added Paths:
-----------
trunk/openutils-spring-remote-callback/
trunk/openutils-spring-remote-callback/pom.xml
trunk/openutils-spring-remote-callback/src/
trunk/openutils-spring-remote-callback/src/main/
trunk/openutils-spring-remote-callback/src/main/java/
trunk/openutils-spring-remote-callback/src/main/java/it/
trunk/openutils-spring-remote-callback/src/main/java/it/openutils/
trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/
trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/
trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/
trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/Callback.java
trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/interceptor/
trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/interceptor/CallbackInstallerInterceptor.java
trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/
trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/CallbackHolder.java
trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/CallbackManager.java
trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/impl/
trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/impl/CallbackManagerImpl.java
trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/rmi/
trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/rmi/CallbackRemoteInvocation.java
trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/rmi/CallbackRemoteInvocationFactory.java
trunk/openutils-spring-remote-callback/src/main/resources/
Added: trunk/openutils-spring-remote-callback/pom.xml
===================================================================
--- trunk/openutils-spring-remote-callback/pom.xml (rev 0)
+++ trunk/openutils-spring-remote-callback/pom.xml 2008-03-20 15:13:45 UTC (rev 748)
@@ -0,0 +1,144 @@
+<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">
+ <parent>
+ <artifactId>openutils</artifactId>
+ <groupId>net.sourceforge.openutils</groupId>
+ <version>7</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-spring-remote-callback</artifactId>
+ <name>openutils spring remote callback</name>
+ <version>0.0.1-SNAPSHOT</version>
+ <description>Openutils Spring Remote Callback classes</description>
+ <properties>
+ <spring.version>2.5.1</spring.version>
+ <aspectj.version>1.5.3</aspectj.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>${spring.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <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>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.logicblaze.lingo</groupId>
+ <artifactId>lingo</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>4.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>${aspectj.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>${aspectj.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-testing-junit</artifactId>
+ <version>2.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-testing</artifactId>
+ <version>2.0.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>http://repository.codehaus.org</id>
+ <name>codehaus repository</name>
+ <url>http://repository.codehaus.org</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+</project>
\ No newline at end of file
Added: trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/Callback.java
===================================================================
--- trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/Callback.java (rev 0)
+++ trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/Callback.java 2008-03-20 15:13:45 UTC (rev 748)
@@ -0,0 +1,37 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed 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.
+ */
+
+package it.openutils.spring.remote.callback;
+
+import java.util.EventListener;
+
+
+/**
+ * @author fcarone
+ * @version $Id: $
+ */
+public interface Callback extends EventListener
+{
+ /**
+ * Invocation for the remote callback
+ */
+ void invoke();
+
+ /**
+ * @return The callback UID.
+ */
+ String getUID();
+}
Property changes on: trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/Callback.java
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/interceptor/CallbackInstallerInterceptor.java
===================================================================
--- trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/interceptor/CallbackInstallerInterceptor.java (rev 0)
+++ trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/interceptor/CallbackInstallerInterceptor.java 2008-03-20 15:13:45 UTC (rev 748)
@@ -0,0 +1,65 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed 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.
+ */
+
+package it.openutils.spring.remote.callback.interceptor;
+
+import it.openutils.spring.remote.callback.Callback;
+import it.openutils.spring.remote.callback.manager.CallbackManager;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+
+
+/**
+ * @author fcarone
+ * @version $Id: $
+ */
+public class CallbackInstallerInterceptor implements MethodInterceptor
+{
+
+ private CallbackManager callbackManager;
+
+ private Callback callback;
+
+ /**
+ * {@inheritDoc}
+ */
+ public Object invoke(MethodInvocation invocation) throws Throwable
+ {
+ callbackManager.installCallback(callback);
+ Object result = invocation.proceed();
+ callbackManager.uninstallCallback(callback);
+ return result;
+ }
+
+ /**
+ * Sets the callback.
+ * @param callback the callback to set
+ */
+ public void setCallback(Callback callback)
+ {
+ this.callback = callback;
+ }
+
+ /**
+ * Sets the callbackManager.
+ * @param callbackManager the callbackManager to set
+ */
+ public void setCallbackManager(CallbackManager callbackManager)
+ {
+ this.callbackManager = callbackManager;
+ }
+}
Property changes on: trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/interceptor/CallbackInstallerInterceptor.java
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/CallbackHolder.java
===================================================================
--- trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/CallbackHolder.java (rev 0)
+++ trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/CallbackHolder.java 2008-03-20 15:13:45 UTC (rev 748)
@@ -0,0 +1,58 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed 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.
+ */
+
+package it.openutils.spring.remote.callback.manager;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.util.Assert;
+
+
+/**
+ * @author fcarone
+ * @version $Id: $
+ */
+public final class CallbackHolder
+{
+
+ private static ThreadLocal<String> callbackUID;
+
+ private CallbackHolder()
+ {
+ //
+ }
+
+ /**
+ * @param uid The callback uid
+ */
+ public static void setCallbackUID(String uid)
+ {
+ Assert.notNull(uid, "Only non-null UID instances are permitted");
+ callbackUID.set(uid);
+ }
+
+ public static String getCallbackUID()
+ {
+ return callbackUID.get();
+ }
+
+ /**
+ * Clears the callback UID
+ */
+ public static void clearCallback()
+ {
+ callbackUID.set(StringUtils.EMPTY);
+ }
+}
Property changes on: trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/CallbackHolder.java
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/CallbackManager.java
===================================================================
--- trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/CallbackManager.java (rev 0)
+++ trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/CallbackManager.java 2008-03-20 15:13:45 UTC (rev 748)
@@ -0,0 +1,44 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed 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.
+ */
+
+package it.openutils.spring.remote.callback.manager;
+
+import it.openutils.spring.remote.callback.Callback;
+
+
+/**
+ * @author fcarone
+ * @version $Id: $
+ */
+public interface CallbackManager
+{
+
+ /**
+ * @param callback The callback to register
+ */
+ void installCallback(Callback callback);
+
+ /**
+ * @param callback The callback to unregister
+ */
+ void uninstallCallback(Callback callback);
+
+ /**
+ * Invokes the current callback
+ */
+ void invokeCallback();
+
+}
Property changes on: trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/CallbackManager.java
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/impl/CallbackManagerImpl.java
===================================================================
--- trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/impl/CallbackManagerImpl.java (rev 0)
+++ trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/impl/CallbackManagerImpl.java 2008-03-20 15:13:45 UTC (rev 748)
@@ -0,0 +1,66 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed 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.
+ */
+
+package it.openutils.spring.remote.callback.manager.impl;
+
+import it.openutils.spring.remote.callback.Callback;
+import it.openutils.spring.remote.callback.manager.CallbackHolder;
+import it.openutils.spring.remote.callback.manager.CallbackManager;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+
+/**
+ * @author fcarone
+ * @version $Id: $
+ */
+public class CallbackManagerImpl implements CallbackManager
+{
+
+ private Set<Callback> callbacks = new HashSet<Callback>();
+ private Map<String, Callback> callbacksMap = new HashMap<String, Callback>();
+
+ /**
+ * {@inheritDoc}
+ */
+ public void invokeCallback()
+ {
+ Callback callback = callbacksMap.get(CallbackHolder.getCallbackUID());
+ callback.invoke();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void installCallback(Callback callback)
+ {
+ callbacks.add(callback);
+ callbacksMap.put(callback.getUID(), callback);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void uninstallCallback(Callback callback)
+ {
+ callbacks.remove(callback);
+ callbacksMap.remove(callback.getUID());
+ }
+
+}
Property changes on: trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/manager/impl/CallbackManagerImpl.java
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/rmi/CallbackRemoteInvocation.java
===================================================================
--- trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/rmi/CallbackRemoteInvocation.java (rev 0)
+++ trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/rmi/CallbackRemoteInvocation.java 2008-03-20 15:13:45 UTC (rev 748)
@@ -0,0 +1,66 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed 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.
+ */
+
+package it.openutils.spring.remote.callback.rmi;
+
+import it.openutils.spring.remote.callback.manager.CallbackHolder;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.remoting.support.RemoteInvocation;
+
+
+/**
+ * @author fcarone
+ * @version $Id: $
+ */
+public class CallbackRemoteInvocation extends RemoteInvocation
+{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 5093459466178643546L;
+
+ private String callbackUID;
+
+ /**
+ * @param methodInvocation The methodInvocation
+ */
+ public CallbackRemoteInvocation(MethodInvocation methodInvocation)
+ {
+ super(methodInvocation);
+ this.callbackUID = CallbackHolder.getCallbackUID();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Object invoke(Object targetObject) throws NoSuchMethodException, IllegalAccessException,
+ InvocationTargetException
+ {
+ CallbackHolder.setCallbackUID(callbackUID);
+ try
+ {
+ return super.invoke(targetObject);
+ }
+ finally
+ {
+ CallbackHolder.clearCallback();
+ }
+ }
+}
Property changes on: trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/rmi/CallbackRemoteInvocation.java
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/rmi/CallbackRemoteInvocationFactory.java
===================================================================
--- trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/rmi/CallbackRemoteInvocationFactory.java (rev 0)
+++ trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/rmi/CallbackRemoteInvocationFactory.java 2008-03-20 15:13:45 UTC (rev 748)
@@ -0,0 +1,45 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed 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.
+ */
+
+package it.openutils.spring.remote.callback.rmi;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.remoting.support.RemoteInvocation;
+import org.springframework.remoting.support.RemoteInvocationFactory;
+
+
+
+/**
+ * @author fcarone
+ * @version $Id: $
+ */
+public class CallbackRemoteInvocationFactory implements RemoteInvocationFactory
+{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 5093459466178643546L;
+
+ /**
+ * {@inheritDoc}
+ */
+ public RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation)
+ {
+ return new CallbackRemoteInvocation(methodInvocation);
+ }
+
+
+}
Property changes on: trunk/openutils-spring-remote-callback/src/main/java/it/openutils/spring/remote/callback/rmi/CallbackRemoteInvocationFactory.java
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2008-04-27 12:03:48
|
Revision: 759
http://openutils.svn.sourceforge.net/openutils/?rev=759&view=rev
Author: fgiust
Date: 2008-04-27 05:03:55 -0700 (Sun, 27 Apr 2008)
Log Message:
-----------
update poms
Modified Paths:
--------------
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-testng/pom.xml
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2008-04-27 10:00:09 UTC (rev 758)
+++ trunk/openutils-testing-junit/pom.xml 2008-04-27 12:03:55 UTC (rev 759)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -14,7 +15,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.0.2</version>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -34,7 +35,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -77,11 +78,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
<version>2.2</version>
@@ -154,6 +150,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.3</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2008-04-27 10:00:09 UTC (rev 758)
+++ trunk/openutils-testing-testng/pom.xml 2008-04-27 12:03:55 UTC (rev 759)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -14,7 +15,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.0.2</version>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -34,14 +35,9 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.3</version>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
@@ -76,11 +72,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
<version>2.2</version>
@@ -168,6 +159,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.3</spring.version>
</properties>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2008-04-27 12:36:12
|
Revision: 768
http://openutils.svn.sourceforge.net/openutils/?rev=768&view=rev
Author: fgiust
Date: 2008-04-27 05:36:18 -0700 (Sun, 27 Apr 2008)
Log Message:
-----------
update parent pom (use maven 2.0.9) and add checkstyle configuration
Modified Paths:
--------------
trunk/pom.xml
Added Paths:
-----------
trunk/src/config/
trunk/src/config/checkstyle.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-04-27 12:23:57 UTC (rev 767)
+++ trunk/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
<packaging>pom</packaging>
- <version>7</version>
+ <version>8</version>
<name>openutils</name>
<description>openutils parent POM</description>
<url>http://openutils.sourceforge.net</url>
@@ -80,12 +80,15 @@
<timezone>+1</timezone>
</developer>
</developers>
+ <prerequisites>
+ <maven>2.0.9</maven>
+ </prerequisites>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
+ <version>2.0-beta-6</version>
<configuration>
<stagingSiteURL>
scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/staging/${pom.artifactId}/
@@ -98,10 +101,11 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4</version>
+ <version>2.4.2</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -109,6 +113,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
+ <version>2.0.4</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -150,15 +155,18 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<quiet>true</quiet>
</configuration>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.0-beta-3</version>
</plugin>
<plugin>
<artifactId>maven-changes-plugin</artifactId>
+ <version>2.0-beta-3</version>
<configuration>
<xmlPath>${basedir}/src/site/changes/changes.xml</xmlPath>
</configuration>
@@ -172,13 +180,15 @@
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4</version>
+ <version>2.4.2</version>
</plugin>
<plugin>
<artifactId>maven-changelog-plugin</artifactId>
+ <version>2.1</version>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
</plugin>
</plugins>
</reporting>
@@ -209,6 +219,8 @@
<module>openutils-testing</module>
<module>openutils-testing-testng</module>
<module>openutils-testing-junit</module>
+ <module>openutils-testing4dwr</module>
+ <module>openutils-testing4web</module>
<module>openutils-testing-junit-dwr</module>
<module>openutils-testing-testng-dwr</module>
<module>openutils-web</module>
Added: trunk/src/config/checkstyle.xml
===================================================================
--- trunk/src/config/checkstyle.xml (rev 0)
+++ trunk/src/config/checkstyle.xml 2008-04-27 12:36:18 UTC (rev 768)
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ This configuration file was written by the eclipse-cs plugin configuration editor
+-->
+<!--
+ Checkstyle-Configuration: project
+ Description: none
+-->
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<module name="Checker">
+ <property name="severity" value="warning"/>
+ <module name="TreeWalker">
+ <module name="ArrayTypeStyle"/>
+ <module name="GenericIllegalRegexp">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="no System.out.println"/>
+ <property name="severity" value="error"/>
+ <property name="format" value="System\.out\.print"/>
+ <property name="message" value="Avoid System.out.println(), use log.debug()"/>
+ </module>
+ <module name="GenericIllegalRegexp">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="no printStackTrace"/>
+ <property name="severity" value="error"/>
+ <property name="format" value="\.printStackTrace\(\)"/>
+ <property name="message" value="Avoid exception.printStackTrace()"/>
+ </module>
+ <module name="GenericIllegalRegexp">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Assert.assertTrue(true) is meaningless!"/>
+ <property name="severity" value="error"/>
+ <property name="format" value="Assert\.assertTrue\(true"/>
+ <property name="message" value="Assert.assertTrue(true) is meaningless!"/>
+ </module>
+ <module name="GenericIllegalRegexp">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="no conversions from string to number using Integer.valueOf()"/>
+ <property name="severity" value="error"/>
+ <property name="format" value="Integer\.valueOf\("/>
+ <property name="message" value="Don't use Integer.valueOf(), use NumberUtils from commons-lang"/>
+ </module>
+ <module name="UncommentedMain"/>
+ <module name="UpperEll"/>
+ <module name="AvoidNestedBlocks"/>
+ <module name="EmptyBlock">
+ <property name="option" value="text"/>
+ <property name="tokens" value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF, LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, STATIC_INIT"/>
+ </module>
+ <module name="LeftCurly">
+ <property name="option" value="nl"/>
+ <property name="tokens" value="CLASS_DEF, CTOR_DEF, INTERFACE_DEF, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF"/>
+ </module>
+ <module name="NeedBraces">
+ <property name="tokens" value="LITERAL_DO, LITERAL_ELSE, LITERAL_IF, LITERAL_FOR, LITERAL_WHILE"/>
+ </module>
+ <module name="RightCurly">
+ <property name="option" value="alone"/>
+ <property name="tokens" value="LITERAL_CATCH, LITERAL_ELSE, LITERAL_TRY"/>
+ </module>
+ <module name="CovariantEquals"/>
+ <module name="DeclarationOrder">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="DoubleCheckedLocking"/>
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <module name="ExplicitInitialization"/>
+ <module name="IllegalCatch">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="IllegalInstantiation"/>
+ <module name="IllegalType">
+ <property name="tokens" value="METHOD_DEF, PARAMETER_DEF, VARIABLE_DEF"/>
+ </module>
+ <module name="InnerAssignment">
+ <property name="severity" value="info"/>
+ <property name="tokens" value="ASSIGN, BAND_ASSIGN, BOR_ASSIGN, BSR_ASSIGN, BXOR_ASSIGN, DIV_ASSIGN, MINUS_ASSIGN, MOD_ASSIGN, PLUS_ASSIGN, SL_ASSIGN, SR_ASSIGN, STAR_ASSIGN"/>
+ </module>
+ <module name="JUnitTestCase">
+ <property name="severity" value="ignore"/>
+ </module>
+ <module name="MissingSwitchDefault"/>
+ <module name="NestedIfDepth">
+ <property name="severity" value="info"/>
+ <property name="max" value="3"/>
+ </module>
+ <module name="NestedTryDepth">
+ <property name="severity" value="info"/>
+ <property name="max" value="2"/>
+ </module>
+ <module name="PackageDeclaration"/>
+ <module name="ParameterAssignment"/>
+ <module name="ReturnCount">
+ <property name="severity" value="info"/>
+ <property name="max" value="3"/>
+ </module>
+ <module name="SimplifyBooleanExpression"/>
+ <module name="SimplifyBooleanReturn"/>
+ <module name="StringLiteralEquality"/>
+ <module name="SuperClone">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="SuperFinalize"/>
+ <module name="FinalClass"/>
+ <module name="HideUtilityClassConstructor"/>
+ <module name="InterfaceIsType"/>
+ <module name="ThrowsCount">
+ <property name="max" value="5"/>
+ </module>
+ <module name="VisibilityModifier">
+ <property name="packageAllowed" value="true"/>
+ <property name="protectedAllowed" value="true"/>
+ </module>
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+ <module name="JavadocMethod">
+ <property name="scope" value="package"/>
+ <property name="allowMissingPropertyJavadoc" value="true"/>
+ <property name="suppressLoadErrors" value="true"/>
+ <property name="tokens" value="METHOD_DEF"/>
+ </module>
+ <module name="JavadocStyle">
+ <property name="severity" value="info"/>
+ <property name="scope" value="package"/>
+ <property name="checkFirstSentence" value="false"/>
+ </module>
+ <module name="JavadocType">
+ <property name="scope" value="package"/>
+ <property name="authorFormat" value="^[a-zA-Z @\.]*$"/>
+ </module>
+ <module name="JavadocVariable">
+ <property name="scope" value="package"/>
+ </module>
+ <module name="CyclomaticComplexity">
+ <property name="severity" value="info"/>
+ <property name="max" value="18"/>
+ </module>
+ <module name="ConstantName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="MemberName">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="MethodName"/>
+ <module name="PackageName">
+ <property name="severity" value="ignore"/>
+ <property name="format" value="^[a-z]+(\.[a-z][a-z]*)*$"/>
+ </module>
+ <module name="ParameterName">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="StaticVariableName"/>
+ <module name="TypeName"/>
+ <module name="AnonInnerLength"/>
+ <module name="ExecutableStatementCount">
+ <property name="severity" value="info"/>
+ <property name="max" value="50"/>
+ <property name="tokens" value="INSTANCE_INIT,STATIC_INIT,METHOD_DEF,CTOR_DEF"/>
+ </module>
+ <module name="FileLength"/>
+ <module name="LineLength">
+ <property name="max" value="160"/>
+ </module>
+ <module name="MethodLength"/>
+ <module name="ParameterNumber"/>
+ <module name="EmptyForIteratorPad"/>
+ <module name="NoWhitespaceAfter">
+ <property name="tokens" value="BNOT,DEC,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
+ </module>
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap"/>
+ <module name="ParenPad"/>
+ <module name="TabCharacter"/>
+ <module name="TypecastParenPad">
+ <property name="tokens" value="RPAREN, TYPECAST"/>
+ </module>
+ <module name="WhitespaceAfter"/>
+ <module name="WhitespaceAround">
+ <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND,WILDCARD_TYPE"/>
+ </module>
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="IllegalThrows">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="avoid generic runtime exceptions"/>
+ </module>
+ <module name="MultipleStringLiterals">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="duplicate strings"/>
+ <property name="severity" value="ignore"/>
+ </module>
+ <module name="MultipleVariableDeclarations">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="single declaration"/>
+ </module>
+ <module name="ModifiedControlVariable">
+ <property name="severity" value="ignore"/>
+ </module>
+ </module>
+</module>
Property changes on: trunk/src/config/checkstyle.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2008-04-27 12:41:05
|
Revision: 769
http://openutils.svn.sourceforge.net/openutils/?rev=769&view=rev
Author: fgiust
Date: 2008-04-27 05:41:06 -0700 (Sun, 27 Apr 2008)
Log Message:
-----------
update module poms
Modified Paths:
--------------
trunk/openutils-backup/pom.xml
trunk/openutils-bshd5/pom.xml
trunk/openutils-configuration-dataobjects/pom.xml
trunk/openutils-configuration-services/pom.xml
trunk/openutils-dbmigration/pom.xml
trunk/openutils-deployment/pom.xml
trunk/openutils-hibernate-security/pom.xml
trunk/openutils-log4j/pom.xml
trunk/openutils-maven-skin/pom.xml
trunk/openutils-mgnlspring/pom.xml
trunk/openutils-mgnlstripes/pom.xml
trunk/openutils-spring/pom.xml
trunk/openutils-spring-rmibernate/pom.xml
trunk/openutils-tags-spring/pom.xml
trunk/openutils-testing/pom.xml
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-junit-dwr/pom.xml
trunk/openutils-testing-testng/pom.xml
trunk/openutils-testing-testng-dwr/pom.xml
trunk/openutils-usermanagement/pom.xml
trunk/openutils-usermanagement-dataobjects/pom.xml
trunk/openutils-web/pom.xml
Added Paths:
-----------
trunk/openutils-testing4dwr/
trunk/openutils-testing4dwr/pom.xml
trunk/openutils-testing4dwr/src/
trunk/openutils-testing4dwr/src/main/
trunk/openutils-testing4dwr/src/main/java/
trunk/openutils-testing4dwr/src/main/resources/
trunk/openutils-testing4web/
trunk/openutils-testing4web/pom.xml
trunk/openutils-testing4web/src/
trunk/openutils-testing4web/src/main/
trunk/openutils-testing4web/src/main/java/
trunk/openutils-testing4web/src/main/resources/
Property Changed:
----------------
trunk/
trunk/openutils-dbmigration/
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- openutils-springjsp
target
eclipse.log
+ openutils-springjsp
target
eclipse.log
release.properties
Modified: trunk/openutils-backup/pom.xml
===================================================================
--- trunk/openutils-backup/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-backup/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-backup</artifactId>
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-bshd5/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-bshd5</artifactId>
Modified: trunk/openutils-configuration-dataobjects/pom.xml
===================================================================
--- trunk/openutils-configuration-dataobjects/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-configuration-dataobjects/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-configuration-services/pom.xml
===================================================================
--- trunk/openutils-configuration-services/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-configuration-services/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
Property changes on: trunk/openutils-dbmigration
___________________________________________________________________
Name: svn:ignore
- target
.checkstyle
.settings
.classpath
.project
+ target
.checkstyle
.settings
.classpath
.project
pom.xml.releaseBackup
release.properties
Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-dbmigration/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-dbmigration</artifactId>
Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-deployment/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-deployment</artifactId>
Modified: trunk/openutils-hibernate-security/pom.xml
===================================================================
--- trunk/openutils-hibernate-security/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-hibernate-security/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -2,7 +2,7 @@
<parent>
<artifactId>openutils</artifactId>
<groupId>net.sourceforge.openutils</groupId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-log4j/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-log4j</artifactId>
Modified: trunk/openutils-maven-skin/pom.xml
===================================================================
--- trunk/openutils-maven-skin/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-maven-skin/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-maven-skin</artifactId>
Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-mgnlspring/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- trunk/openutils-mgnlstripes/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-mgnlstripes/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-spring/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-spring</artifactId>
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-spring-rmibernate/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-spring-rmibernate</artifactId>
Modified: trunk/openutils-tags-spring/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-tags-spring/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-tags-spring</artifactId>
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-testing/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing</artifactId>
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-testing-junit/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-junit</artifactId>
Modified: trunk/openutils-testing-junit-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-junit-dwr/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-testing-junit-dwr/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-junit-dwr</artifactId>
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-testing-testng/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-testng</artifactId>
Modified: trunk/openutils-testing-testng-dwr/pom.xml
===================================================================
--- trunk/openutils-testing-testng-dwr/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-testing-testng-dwr/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-testing-testng-dwr</artifactId>
Added: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml (rev 0)
+++ trunk/openutils-testing4dwr/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -0,0 +1,143 @@
+<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>7</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-testing4dwr</artifactId>
+ <name>openutils dwr test utils</name>
+ <version>2.0-SNAPSHOT</version>
+ <description>openutils test utils for dwr</description>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-testing</artifactId>
+ <version>2.0.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <version>5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-resources</artifactId>
+ <version>5.5.15</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-factory</artifactId>
+ <version>5.5.15</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.6R6-candidate2</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <spring.version>2.5.1</spring.version>
+ </properties>
+</project>
Property changes on: trunk/openutils-testing4dwr/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml (rev 0)
+++ trunk/openutils-testing4web/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -0,0 +1,143 @@
+<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>7</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-testing4web</artifactId>
+ <name>openutils web test utils</name>
+ <version>2.0-SNAPSHOT</version>
+ <description>openutils test utils for webapps</description>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-testing</artifactId>
+ <version>2.0.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <version>5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-resources</artifactId>
+ <version>5.5.15</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-factory</artifactId>
+ <version>5.5.15</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.6R6-candidate2</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <spring.version>2.5.1</spring.version>
+ </properties>
+</project>
Property changes on: trunk/openutils-testing4web/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-usermanagement/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-usermanagement-dataobjects/pom.xml
===================================================================
--- trunk/openutils-usermanagement-dataobjects/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-usermanagement-dataobjects/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-web/pom.xml
===================================================================
--- trunk/openutils-web/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-web/pom.xml 2008-04-27 12:41:06 UTC (rev 769)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openutils-web</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2008-04-27 17:03:06
|
Revision: 780
http://openutils.svn.sourceforge.net/openutils/?rev=780&view=rev
Author: fgiust
Date: 2008-04-27 10:02:54 -0700 (Sun, 27 Apr 2008)
Log Message:
-----------
refactor and rename openutils-testing for dwr
Modified Paths:
--------------
trunk/openutils-testing4dwr/pom.xml
trunk/openutils-testing4dwr-junit/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java
trunk/openutils-testing4dwr-testng/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java
trunk/openutils-testing4web/pom.xml
trunk/pom.xml
Added Paths:
-----------
trunk/openutils-testing4dwr/src/main/java/it/
trunk/openutils-testing4dwr/src/main/java/it/openutils/
trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/
trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/
trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/DwrTestContext.java
trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/JsException.java
trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/XMLHttpRequest.java
trunk/openutils-testing4dwr/src/main/resources/webEnv.js
trunk/openutils-testing4dwr-junit/
trunk/openutils-testing4dwr-junit/pom.xml
trunk/openutils-testing4dwr-junit/src/
trunk/openutils-testing4dwr-testng/
trunk/openutils-testing4dwr-testng/pom.xml
trunk/openutils-testing4dwr-testng/src/
Removed Paths:
-------------
trunk/openutils-testing-junit-dwr/
trunk/openutils-testing-testng-dwr/
trunk/openutils-testing4dwr-junit/pom.xml
trunk/openutils-testing4dwr-junit/src/
trunk/openutils-testing4dwr-junit/src/main/java/it/openutils/testing/junit/dwr/JsException.java
trunk/openutils-testing4dwr-junit/src/main/java/it/openutils/testing/junit/dwr/XMLHttpRequest.java
trunk/openutils-testing4dwr-junit/src/main/resources/webEnv.js
trunk/openutils-testing4dwr-testng/pom.xml
trunk/openutils-testing4dwr-testng/src/
trunk/openutils-testing4dwr-testng/src/main/java/it/openutils/testing/testng/dwr/JsException.java
trunk/openutils-testing4dwr-testng/src/main/java/it/openutils/testing/testng/dwr/XMLHttpRequest.java
trunk/openutils-testing4dwr-testng/src/main/resources/webEnv.js
Property Changed:
----------------
trunk/openutils-testing4dwr/
trunk/openutils-testing4web/
Property changes on: trunk/openutils-testing4dwr
___________________________________________________________________
Name: svn:ignore
+ .settings
target
.checkstyle
.classpath
.project
Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml 2008-04-27 16:35:14 UTC (rev 779)
+++ trunk/openutils-testing4dwr/pom.xml 2008-04-27 17:02:54 UTC (rev 780)
@@ -13,11 +13,6 @@
<description>openutils test utils for dwr</description>
<dependencies>
<dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-testing</artifactId>
- <version>2.0.3-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
@@ -48,12 +43,6 @@
<version>1.2.13</version>
</dependency>
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.1</version>
- </dependency>
- <dependency>
<groupId>httpunit</groupId>
<artifactId>httpunit</artifactId>
<version>1.6.2</version>
@@ -138,6 +127,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.3</spring.version>
</properties>
-</project>
+</project>
\ No newline at end of file
Added: trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/DwrTestContext.java
===================================================================
--- trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/DwrTestContext.java (rev 0)
+++ trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/DwrTestContext.java 2008-04-27 17:02:54 UTC (rev 780)
@@ -0,0 +1,312 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed 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.
+ */
+package it.openutils.testing.dwr;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xml.sax.SAXException;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebResponse;
+import com.meterware.servletunit.ServletRunner;
+import com.meterware.servletunit.ServletUnitClient;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class DwrTestContext
+{
+
+ public static final String SERVLET_UNIT_CLIENT = "SERVLET_UNIT_CLIENT";
+
+ private static Logger log = LoggerFactory.getLogger(DwrTestContext.class);
+
+ private Context context;
+
+ private Scriptable scope;
+
+ private ServletUnitClient servletUnitClient;
+
+ private ServletRunner servletRunner;
+
+ private String webXmlLocation;
+
+ private String contextPath = "/webapp";
+
+ private List<String> jsLibraries = new ArrayList<String>();
+
+ public void setAbsoluteWebXmlLocation(String absoluteWebXmlLocation)
+ {
+ this.webXmlLocation = absoluteWebXmlLocation;
+ }
+
+ public void setContextPath(String contextPath)
+ {
+ this.contextPath = contextPath;
+ if (this.contextPath != null)
+ {
+ this.contextPath = this.contextPath.replace('\\', '/');
+ if (!this.contextPath.startsWith("/"))
+ {
+ this.contextPath = "/" + this.contextPath;
+ }
+ }
+ }
+
+ public void addJsLibrary(String library)
+ {
+ jsLibraries.add(library);
+ }
+
+ public void setUpServer() throws Exception
+ {
+ // run httpunit servlet engine
+ servletRunner = new ServletRunner(new File(webXmlLocation), contextPath);
+ }
+
+ public void setUpClient() throws Exception
+ {
+ servletUnitClient = servletRunner.newClient();
+
+ // init scripting context
+ context = Context.enter();
+ context.setLanguageVersion(Context.VERSION_1_6);
+
+ // store servletUnitClient in context
+ context.putThreadLocal(DwrTestContext.SERVLET_UNIT_CLIENT, servletUnitClient);
+
+ // load js support for window and document
+ String jsWebEnvironment = "";
+ InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("webEnv.js");
+ byte[] buffer = new byte[1024];
+ int read = 0;
+ int length = 1024;
+ while ((read = is.read(buffer, 0, length)) > 0)
+ {
+ jsWebEnvironment += new String(buffer, 0, read);
+ }
+ is.close();
+
+ //
+ scope = context.initStandardObjects();
+ ScriptableObject.defineClass(scope, XMLHttpRequest.class);
+ // ScriptableObject.defineClass(scope, JsJUnitAssert.class);
+ context.evaluateString(scope, jsWebEnvironment, "webEnv.js", -1, null);
+ scope.put("Test", scope, this);
+ scope.put("Log", scope, log);
+
+ // add javascript
+ for (String library : jsLibraries)
+ {
+ if (loadLibraryFromLocalServer(library))
+ {
+ log.info("Loaded library from local server: " + library);
+ }
+ else if (loadLibraryFromRemoteServer(library))
+ {
+ log.info("Loaded library from remote server: " + library);
+ }
+ else if (loadLibraryFromClasspath(library))
+ {
+ log.info("Loaded library from classpath: " + library);
+ }
+ else if (loadLibraryFromFileSystem(library))
+ {
+ log.info("Loaded library from filesystem: " + library);
+ }
+ else
+ {
+ log.error("Can't load library " + library);
+ throw new FileNotFoundException(library);
+ }
+ }
+ }
+
+ private boolean loadLibraryFromLocalServer(String library) throws MalformedURLException, SAXException, IOException,
+ URISyntaxException
+ {
+ if (!library.startsWith("http://localhost/"))
+ {
+ return false;
+ }
+
+ WebResponse response = servletUnitClient.getResponse(new GetMethodWebRequest(library));
+ if (response == null)
+ {
+ return false;
+ }
+ URI uri = new URI(library);
+ context.evaluateString(scope, response.getText(), uri.getPath(), -1, null);
+
+ return true;
+ }
+
+ private boolean loadLibraryFromRemoteServer(String library) throws MalformedURLException, SAXException,
+ IOException, URISyntaxException
+ {
+ if (!library.startsWith("http://"))
+ {
+ return false;
+ }
+
+ URL url = new URL(library);
+
+ // connect to library
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setRequestMethod("GET");
+ connection.setDoInput(true);
+ connection.connect();
+
+ // get response
+ InputStream is = connection.getInputStream();
+ StringBuffer sb = new StringBuffer();
+
+ int i;
+ while ((i = is.read()) != -1)
+ {
+ sb.append((char) i);
+ }
+ is.close();
+ connection.disconnect();
+
+ // put response in context
+ context.evaluateString(scope, sb.toString(), url.getPath(), -1, null);
+
+ return true;
+ }
+
+ private boolean loadLibraryFromClasspath(String library) throws IOException
+ {
+ String js = loadFileFromClassPath(library);
+
+ if (js == null)
+ {
+ return false;
+ }
+
+ context.evaluateString(scope, js, library, -1, null);
+
+ return true;
+ }
+
+ private String loadFileFromClassPath(String file) throws IOException
+ {
+ InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(file);
+ if (is == null)
+ {
+ return null;
+ }
+ byte[] buffer = new byte[1024];
+ int read = 0;
+ String js = "";
+ while ((read = is.read(buffer, 0, buffer.length)) > 0)
+ {
+ js += new String(buffer, 0, read);
+ }
+ is.close();
+
+ return js;
+ }
+
+ private boolean loadLibraryFromFileSystem(String library) throws FileNotFoundException, IOException
+ {
+ String js = loadFileFromFileSystem(library);
+
+ if (js == null)
+ {
+ return false;
+ }
+
+ context.evaluateString(scope, js, library, -1, null);
+
+ return true;
+ }
+
+ private String loadFileFromFileSystem(String file) throws FileNotFoundException, IOException
+ {
+ File f = new File(file);
+ if (!f.exists())
+ {
+ return null;
+ }
+
+ InputStream is = new FileInputStream(f);
+ if (is == null)
+ {
+ return null;
+ }
+ byte[] buffer = new byte[1024];
+ int read = 0;
+ String js = "";
+ while ((read = is.read(buffer, 0, buffer.length)) > 0)
+ {
+ js += new String(buffer, 0, read);
+ }
+ is.close();
+
+ return js;
+ }
+
+ public void tearDownClient() throws Exception
+ {
+ scope = null;
+ Context.exit();
+ }
+
+ public void tearDownServer() throws Exception
+ {
+ servletRunner.shutDown();
+ }
+
+ public void runScript(String script)
+ {
+ context.evaluateString(scope, script, "inline", -1, null);
+ }
+
+ public void runScriptFile(String scriptFile) throws FileNotFoundException, IOException
+ {
+ String js = loadFileFromClassPath(scriptFile);
+ if (js == null)
+ {
+ js = loadFileFromFileSystem(scriptFile);
+ if (js == null)
+ {
+ throw new FileNotFoundException(scriptFile);
+ }
+ }
+
+ context.evaluateString(scope, js, scriptFile, -1, null);
+ }
+
+}
Property changes on: trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/DwrTestContext.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/JsException.java
===================================================================
--- trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/JsException.java (rev 0)
+++ trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/JsException.java 2008-04-27 17:02:54 UTC (rev 780)
@@ -0,0 +1,23 @@
+package it.openutils.testing.dwr;
+
+import org.mozilla.javascript.ScriptableObject;
+
+
+/**
+ * @author mmolaschi
+ * @version $Id$
+ */
+public class JsException extends ScriptableObject
+{
+
+ @Override
+ public String getClassName()
+ {
+ return "Exception";
+ }
+
+ public void js_constructor(String message) throws Exception
+ {
+ throw new Exception(message);
+ }
+}
Property changes on: trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/JsException.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/XMLHttpRequest.java
===================================================================
--- trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/XMLHttpRequest.java (rev 0)
+++ trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/XMLHttpRequest.java 2008-04-27 17:02:54 UTC (rev 780)
@@ -0,0 +1,480 @@
+//=============================================================================
+//Change History:
+//Date UserId Defect Description
+//----------------------------------------------------------------------------
+//07/02/05 ant ??? Initial version.
+//09/02/05 ant Support both HTTP GET and POST
+//14/02/05 ant Fix call backs in functions
+//20/02/05 ant Support HTTP HEAD
+//28/02/05 ant HTTP basic authentication support
+//
+package it.openutils.testing.dwr;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.StringReader;
+import java.net.Authenticator;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.PasswordAuthentication;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.NativeFunction;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.PostMethodWebRequest;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+import com.meterware.servletunit.ServletUnitClient;
+import com.sun.org.apache.xerces.internal.parsers.DOMParser;
+
+
+/**
+ * XMLHttpRequest simulates the Mozilla XMLHttpRequest. Add this class to the Rhino classpath and then define to Rhino
+ * with <code>defineClass('xmlhttp.XMLHttpRequest');</code>
+ * @author <a href="mailto:ant...@uk...">Ant Elder </a>
+ */
+public class XMLHttpRequest extends ScriptableObject
+{
+
+ /**
+ * Stable serialVersionUID.
+ */
+ private static final long serialVersionUID = 42L;
+
+ private String url;
+
+ private String httpMethod;
+
+ private int httpStatus;
+
+ private String httpStatusText;
+
+ private Map<String, String> requestHeaders;
+
+ private String userName;
+
+ private String password;
+
+ private String responseText;
+
+ private Document responseXML;
+
+ private int readyState;
+
+ private NativeFunction readyStateChangeFunction;
+
+ private boolean asyncFlag;
+
+ private Thread asyncThread;
+
+ private ServletUnitClient suc;
+
+ private WebRequest request;
+
+ private WebResponse response;
+
+ private boolean localRequest;
+
+ private HttpURLConnection connection;
+
+ public XMLHttpRequest()
+ {
+ }
+
+ public void jsConstructor()
+ {
+ suc = (ServletUnitClient) Context.getCurrentContext().getThreadLocal(DwrTestContext.SERVLET_UNIT_CLIENT);
+ }
+
+ @Override
+ public String getClassName()
+ {
+ return "XMLHttpRequest";
+ }
+
+ public void jsFunction_setRequestHeader(String headerName, String value)
+ {
+ if (readyState > 1)
+ {
+ throw new IllegalStateException("request already in progress");
+ }
+
+ if (requestHeaders == null)
+ {
+ requestHeaders = new HashMap<String, String>();
+ }
+
+ requestHeaders.put(headerName, value);
+ }
+
+ public Map<String, String[]> jsFunction_getAllResponseHeaders()
+ {
+ if (readyState < 3)
+ {
+ throw new IllegalStateException("must call send before getting response headers");
+ }
+ Map<String, String[]> map = new HashMap<String, String[]>();
+ for (String name : response.getHeaderFieldNames())
+ {
+ map.put(name.toLowerCase(), response.getHeaderFields(name));
+ }
+ return map;
+ }
+
+ public String jsFunction_getResponseHeader(String headerName)
+ {
+ String theValue = "";
+ String[] theValues = jsFunction_getAllResponseHeaders().get(headerName.toLowerCase());
+ for (String value : theValues)
+ {
+ theValue = ((theValue.length() > 0) ? " " : "") + value;
+ }
+ return theValue;
+ }
+
+ public void jsFunction_open(String httpMethod, String url, boolean asyncFlag, String userName, String password)
+ {
+
+ if (readyState != 0)
+ {
+ throw new IllegalStateException("already open");
+ }
+
+ this.httpMethod = httpMethod;
+
+ this.url = url;
+
+ if (!this.url.startsWith("http://"))
+ {
+ this.url = "http://localhost" + ((this.url.startsWith("/")) ? "" : "/") + this.url;
+ }
+
+ if (this.url.startsWith("http://localhost/"))
+ {
+ this.localRequest = true;
+ }
+ else
+ {
+ this.localRequest = false;
+ }
+
+ this.asyncFlag = asyncFlag;
+
+ if ("undefined".equals(userName) || "".equals(userName))
+ {
+ this.userName = null;
+ }
+ else
+ {
+ this.userName = userName;
+ }
+ if ("undefined".equals(password) || "".equals(password))
+ {
+ this.password = null;
+ }
+ else
+ {
+ this.password = password;
+ }
+ if (this.userName != null)
+ {
+ setAuthenticator();
+ }
+
+ setReadyState(1);
+ }
+
+ private void setAuthenticator()
+ {
+ Authenticator.setDefault(new Authenticator()
+ {
+
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication()
+ {
+ return new PasswordAuthentication(userName, password.toCharArray());
+ }
+ });
+ }
+
+ public void jsFunction_send(Object o) throws SAXException, MalformedURLException, IOException
+ {
+ final String content = (o == null) ? "" : o.toString();
+ /*
+ * if (asyncFlag) { Runnable r = new Runnable() { public void run() { try { doSend(content); } catch
+ * (SAXException ex) { throw new NestableRuntimeException(ex); } } }; this.asyncThread = new Thread(r);
+ * asyncThread.start(); } else
+ */
+
+ doSend(content);
+
+ }
+
+ public void jsFunction_abort()
+ {
+ if (asyncThread != null)
+ {
+ asyncThread.interrupt();
+ }
+ }
+
+ /**
+ * @return Returns the readyState.
+ */
+ public int jsGet_readyState()
+ {
+ return readyState;
+ }
+
+ /**
+ * @return Returns the responseText.
+ */
+ public String jsGet_responseText()
+ {
+ if (readyState < 2)
+ {
+ throw new IllegalStateException("request not yet sent");
+ }
+ return responseText;
+ }
+
+ /**
+ * @return Returns the responseXML as a DOM Document.
+ */
+ public Document jsGet_responseXML()
+ {
+ if (responseXML == null && responseText != null)
+ {
+ convertResponse2DOM();
+ }
+ return responseXML;
+ }
+
+ private void convertResponse2DOM()
+ {
+ try
+ {
+
+ DOMParser parser = new DOMParser();
+ StringReader sr = new StringReader(jsGet_responseText());
+ parser.parse(new InputSource(sr));
+ this.responseXML = parser.getDocument();
+
+ }
+ catch (SAXException e)
+ {
+ throw new RuntimeException("ex: " + e, e);
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException("ex: " + e, e);
+ }
+ }
+
+ /**
+ * @return Returns the htto status.
+ */
+ public int jsGet_status()
+ {
+ return httpStatus;
+ }
+
+ /**
+ * @return Returns the http status text.
+ */
+ public String jsGet_statusText()
+ {
+ return httpStatusText;
+ }
+
+ /**
+ * @return Returns the onreadystatechange.
+ */
+ public Object jsGet_onreadystatechange()
+ {
+ return readyStateChangeFunction;
+ }
+
+ public void jsSet_onreadystatechange(NativeFunction function)
+ {
+ readyStateChangeFunction = function;
+ }
+
+ private void doSend(String content) throws SAXException, MalformedURLException, IOException
+ {
+
+ connect(content);
+
+ setRequestHeaders();
+
+ sendRequest(content);
+
+ if ("POST".equals(this.httpMethod) || "GET".equals(this.httpMethod))
+ {
+ readResponse();
+ }
+
+ setReadyState(4);
+
+ }
+
+ private void connect(String content) throws MalformedURLException, IOException
+ {
+ if ("POST".equals(httpMethod))
+ {
+ if (this.localRequest)
+ {
+ ByteArrayInputStream bis = new ByteArrayInputStream(content.getBytes());
+ request = new PostMethodWebRequest(url, bis, null);
+ }
+ else
+ {
+ URL url = new URL(this.url);
+ connection = (HttpURLConnection) url.openConnection();
+ connection.setDoInput(true);
+ connection.setDoOutput(true);
+ connection.setRequestMethod("POST");
+ }
+ }
+ else
+ {
+ if (this.localRequest)
+ {
+ request = new GetMethodWebRequest("http://localhost/" + url);
+ }
+ else
+ {
+ URL url = new URL(this.url);
+ connection = (HttpURLConnection) url.openConnection();
+ connection.setDoInput(true);
+ connection.setRequestMethod("GET");
+ }
+
+ }
+ }
+
+ private void setRequestHeaders()
+ {
+ if (this.requestHeaders != null)
+ {
+ for (Iterator<String> i = requestHeaders.keySet().iterator(); i.hasNext();)
+ {
+ String header = i.next();
+ String value = requestHeaders.get(header);
+ if (this.localRequest)
+ {
+ request.setHeaderField(header, value);
+ }
+ else
+ {
+ connection.setRequestProperty(header, value);
+ }
+ }
+ }
+ }
+
+ private void sendRequest(String content) throws SAXException
+ {
+ try
+ {
+ if ("POST".equals(this.httpMethod) || content.length() > 0)
+ {
+ if (this.localRequest)
+ {
+ response = suc.getResponse(request);
+ }
+ else
+ {
+ OutputStreamWriter out = new OutputStreamWriter(connection.getOutputStream(), "ASCII");
+ out.write(content);
+ out.flush();
+ out.close();
+
+ }
+ }
+
+ if (this.localRequest)
+ {
+ httpStatus = response.getResponseCode();
+ httpStatusText = response.getResponseMessage();
+ }
+ else
+ {
+ httpStatus = connection.getResponseCode();
+ httpStatusText = connection.getResponseMessage();
+ }
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException("IOException: " + e, e);
+ }
+
+ setReadyState(2);
+ }
+
+ private void readResponse()
+ {
+ try
+ {
+ if (this.localRequest)
+ {
+ this.responseText = response.getText();
+ }
+ else
+ {
+ InputStream is = connection.getInputStream();
+ StringBuffer sb = new StringBuffer();
+
+ setReadyState(3);
+
+ int i;
+ while ((i = is.read()) != -1)
+ {
+ sb.append((char) i);
+ }
+ is.close();
+
+ this.responseText = sb.toString();
+ }
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException("IOException: " + e, e);
+ }
+ }
+
+ private void setReadyState(int state)
+ {
+ this.readyState = state;
+ callOnreadyStateChange();
+ }
+
+ private void callOnreadyStateChange()
+ {
+ if (readyStateChangeFunction != null)
+ {
+ Context cx = Context.enter();
+ try
+ {
+ Scriptable scope = cx.initStandardObjects();
+ readyStateChangeFunction.call(cx, scope, this, new Object[]{});
+ }
+ finally
+ {
+ Context.exit();
+ }
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/XMLHttpRequest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: trunk/openutils-testing4dwr/src/main/resources/webEnv.js (from rev 768, trunk/openutils-testing-junit-dwr/src/main/resources/webEnv.js)
===================================================================
--- trunk/openutils-testing4dwr/src/main/resources/webEnv.js (rev 0)
+++ trunk/openutils-testing4dwr/src/main/resources/webEnv.js 2008-04-27 17:02:54 UTC (rev 780)
@@ -0,0 +1,596 @@
+/*
+ * Simulated browser environment for Rhino
+ * By John Resig <http://ejohn.org/>
+ * Copyright 2007 John Resig, under the MIT License
+ */
+
+// The window Object
+var window = this;
+
+(function(){
+
+ // Browser Navigator
+
+ window.navigator = {
+ get userAgent(){
+ return "Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.3) Gecko/20070309 Firefox/2.0.0.3";
+ }
+ };
+
+ var curLocation = (new java.io.File("./")).toURL();
+
+ window.__defineSetter__("location", function(url){
+ var xhr = new XMLHttpRequest();
+ xhr.open("GET", url);
+ xhr.onreadystatechange = function(){
+ curLocation = new java.net.URL( curLocation, url );
+ window.document = xhr.responseXML;
+
+ var event = document.createEvent();
+ event.initEvent("load");
+ window.dispatchEvent( event );
+ };
+ xhr.send();
+ });
+
+ window.__defineGetter__("location", function(url){
+ return {
+ get pathname(){
+ if (curLocation.toString().indexOf('?') >= 0)
+ {
+ return curLocation.toString().substring(0, curLocation.toString().indexOf('?'));
+ }
+ return curLocation.toString();
+ },
+ get search(){
+ if (curLocation.toString().indexOf('?') >= 0)
+ {
+ return curLocation.toString().substring(curLocation.toString().indexOf('?') + 1, curLocation.toString().length());
+ }
+ return "";
+ },
+ get protocol(){
+ return curLocation.getProtocol() + ":";
+ },
+ get href(){
+ return curLocation.toString();
+ },
+ toString: function(){
+ return this.href;
+ }
+ };
+ });
+
+ // Timers
+
+ var timers = [];
+
+ window.setTimeout = function(fn, time){
+ var num;
+ return num = setInterval(function(){
+ fn();
+ clearInterval(num);
+ }, time);
+ };
+
+ window.setInterval = function(fn, time){
+ var num = timers.length;
+
+ timers[num] = new java.lang.Thread(new java.lang.Runnable({
+ run: function(){
+ while (true){
+ java.lang.Thread.currentThread().sleep(time);
+ fn();
+ }
+ }
+ }));
+
+ timers[num].start();
+
+ return num;
+ };
+
+ window.clearInterval = function(num){
+ if ( timers[num] ) {
+ timers[num].stop();
+ delete timers[num];
+ }
+ };
+
+ // Window Events
+
+ var events = [{}];
+
+ window.addEventListener = function(type, fn){
+ if ( !this.uuid || this == window ) {
+ this.uuid = events.length;
+ events[this.uuid] = {};
+ }
+
+ if ( !events[this.uuid][type] )
+ events[this.uuid][type] = [];
+
+ if ( events[this.uuid][type].indexOf( fn ) < 0 )
+ events[this.uuid][type].push( fn );
+ };
+
+ window.removeEventListener = function(type, fn){
+ if ( !this.uuid || this == window ) {
+ this.uuid = events.length;
+ events[this.uuid] = {};
+ }
+
+ if ( !events[this.uuid][type] )
+ events[this.uuid][type] = [];
+
+ events[this.uuid][type] =
+ events[this.uuid][type].filter(function(f){
+ return f != fn;
+ });
+ };
+
+ window.dispatchEvent = function(event){
+ if ( event.type ) {
+ if ( this.uuid && events[this.uuid][event.type] ) {
+ var self = this;
+
+ events[this.uuid][event.type].forEach(function(fn){
+ fn.call( self, event );
+ });
+ }
+
+ if ( this["on" + event.type] )
+ this["on" + event.type].call( self, event );
+ }
+ };
+
+ // DOM Document
+
+ window.DOMDocument = function(file){
+ this._file = file;
+ this._dom = Packages.javax.xml.parsers.
+ DocumentBuilderFactory.newInstance()
+ .newDocumentBuilder().parse(file);
+
+ if ( !obj_nodes.containsKey( this._dom ) )
+ obj_nodes.put( this._dom, this );
+ };
+
+ DOMDocument.prototype = {
+ createTextNode: function(text){
+ return makeNode( this._dom.createTextNode(
+ text.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">")) );
+ },
+ createElement: function(name){
+ return makeNode( this._dom.createElement(name.toLowerCase()) );
+ },
+ getElementsByTagName: function(name){
+ return new DOMNodeList( this._dom.getElementsByTagName(
+ name.toLowerCase()) );
+ },
+ getElementById: function(id){
+ var elems = this._dom.getElementsByTagName("*");
+
+ for ( var i = 0; i < elems.length; i++ ) {
+ var elem = elems.item(i);
+ if ( elem.getAttribute("id") == id )
+ return makeNode(elem);
+ }
+
+ return null;
+ },
+ get body(){
+ return this.getElementsByTagName("body")[0];
+ },
+ get documentElement(){
+ return makeNode( this._dom.getDocumentElement() );
+ },
+ get ownerDocument(){
+ return null;
+ },
+ addEventListener: window.addEventListener,
+ removeEventListener: window.removeEventListener,
+ dispatchEvent: window.dispatchEvent,
+ get nodeName() {
+ return "#document";
+ },
+ importNode: function(node, deep){
+ return makeNode( this._dom.importNode(node._dom, deep) );
+ },
+ toString: function(){
+ return "Document" + (typeof this._file == "string" ?
+ ": " + this._file : "");
+ },
+ get innerHTML(){
+ return this.documentElement.outerHTML;
+ },
+
+ get defaultView(){
+ return {
+ getComputedStyle: function(elem){
+ return {
+ getPropertyValue: function(prop){
+ prop = prop.replace(/\-(\w)/g,function(m,c){
+ return c.toUpperCase();
+ });
+ var val = elem.style[prop];
+
+ if ( prop == "opacity" && val == "" )
+ val = "1";
+
+ return val;
+ }
+ };
+ }
+ };
+ },
+
+ createEvent: function(){
+ return {
+ type: "",
+ initEvent: function(type){
+ this.type = type;
+ }
+ };
+ }
+ };
+
+ function getDocument(node){
+ return obj_nodes.get(node);
+ }
+
+ // DOM NodeList
+
+ window.DOMNodeList = function(list){
+ this._dom = list;
+ this.length = list.getLength();
+
+ for ( var i = 0; i < this.length; i++ ) {
+ var node = list.item(i);
+ this[i] = makeNode( node );
+ }
+ };
+
+ DOMNodeList.prototype = {
+ toString: function(){
+ return "[ " +
+ Array.prototype.join.call( this, ", " ) + " ]";
+ },
+ get outerHTML(){
+ return Array.prototype.map.call(
+ this, function(node){return node.outerHTML;}).join('');
+ }
+ };
+
+ // DOM Node
+
+ window.DOMNode = function(node){
+ this._dom = node;
+ };
+
+ DOMNode.prototype = {
+ get nodeType(){
+ return this._dom.getNodeType();
+ },
+ get nodeValue(){
+ return this._dom.getNodeValue();
+ },
+ get nodeName() {
+ return this._dom.getNodeName();
+ },
+ cloneNode: function(deep){
+ return makeNode( this._dom.cloneNode(deep) );
+ },
+ get ownerDocument(){
+ return getDocument( this._dom.ownerDocument );
+ },
+ get documentElement(){
+ return makeNode( this._dom.documentElement );
+ },
+ get parentNode() {
+ return makeNode( this._dom.getParentNode() );
+ },
+ get nextSibling() {
+ return makeNode( this._dom.getNextSibling() );
+ },
+ get previousSibling() {
+ return makeNode( this._dom.getPreviousSibling() );
+ },
+ toString: function(){
+ return '"' + this.nodeValue + '"';
+ },
+ get outerHTML(){
+ return this.nodeValue;
+ }
+ };
+
+ // DOM Element
+
+ window.DOMElement = function(elem){
+ this._dom = elem;
+ this.style = {
+ get opacity(){ return this._opacity; },
+ set opacity(val){ this._opacity = val + ""; }
+ };
+
+ // Load CSS info
+ var styles = (this.getAttribute("style") || "").split(/\s*;\s*/);
+
+ for ( var i = 0; i < styles.length; i++ ) {
+ var style = styles[i].split(/\s*:\s*/);
+ if ( style.length == 2 )
+ this.style[ style[0] ] = style[1];
+ }
+ };
+
+ DOMElement.prototype = extend( new DOMNode(), {
+ get nodeName(){
+ return this.tagName.toUpperCase();
+ },
+ get tagName(){
+ return this._dom.getTagName();
+ },
+ toString: function(){
+ return "<" + this.tagName + (this.id ? "#" + this.id : "" ) + ">";
+ },
+ get outerHTML(){
+ var ret = "<" + this.tagName, attr = this.attributes;
+
+ for ( var i in attr )
+ ret += " " + i + "='" + attr[i] + "'";
+
+ if ( this.childNodes.length || this.nodeName == "SCRIPT" )
+ ret += ">" + this.childNodes.outerHTML +
+ "</" + this.tagName + ">";
+ else
+ ret += "/>";
+
+ return ret;
+ },
+
+ get attributes(){
+ var attr = {}, attrs = this._dom.getAttributes();
+
+ for ( var i = 0; i < attrs.getLength(); i++ )
+ attr[ attrs.item(i).nodeName ] = attrs.item(i).nodeValue;
+
+ return attr;
+ },
+
+ get innerHTML(){
+ return this.childNodes.outerHTML;
+ },
+ set innerHTML(html){
+ html = html.replace(/<\/?([A-Z]+)/g, function(m){
+ return m.toLowerCase();
+ });
+
+ var nodes = this.ownerDocument.importNode(
+ new DOMDocument( new java.io.ByteArrayInputStream(
+ (new java.lang.String("<wrap>" + html + "</wrap>"))
+ .getBytes("UTF8"))).documentElement, true).childNodes;
+
+ while (this.firstChild)
+ this.removeChild( this.firstChild );
+
+ for ( var i = 0; i < nodes.length; i++ )
+ this.appendChild( nodes[i] );
+ },
+
+ get textContent(){
+ return nav(this.childNodes);
+
+ function nav(nodes){
+ var str = "";
+ for ( var i = 0; i < nodes.length; i++ )
+ if ( nodes[i].nodeType == 3 )
+ str += nodes[i].nodeValue;
+ else if ( nodes[i].nodeType == 1 )
+ str += nav(nodes[i].childNodes);
+ return str;
+ }
+ },
+ set textContent(text){
+ while (this.firstChild)
+ this.removeChild( this.firstChild );
+ this.appendChild( this.ownerDocument.createTextNode(text));
+ },
+
+ style: {},
+ clientHeight: 0,
+ clientWidth: 0,
+ offsetHeight: 0,
+ offsetWidth: 0,
+
+ get disabled() {
+ var val = this.getAttribute("disabled");
+ return val != "false" && !!val;
+ },
+ set disabled(val) { return this.setAttribute("disabled",val); },
+
+ get checked() {
+ var val = this.getAttribute("checked");
+ return val != "false" && !!val;
+ },
+ set checked(val) { return this.setAttribute("checked",val); },
+
+ get selected() {
+ if ( !this._selectDone ) {
+ this._selectDone = true;
+
+ if ( this.nodeName == "OPTION" && !this.parentNode.getAttribute("multiple") ) {
+ var opt = this.parentNode.getElementsByTagName("option");
+
+ if ( this == opt[0] ) {
+ var select = true;
+
+ for ( var i = 1; i < opt.length; i++ )
+ if ( opt[i].selected ) {
+ select = false;
+ break;
+ }
+
+ if ( select )
+ this.selected = true;
+ }
+ }
+ }
+
+ var val = this.getAttribute("selected");
+ return val != "false" && !!val;
+ },
+ set selected(val) { return this.setAttribute("selected",val); },
+
+ get className() { return this.getAttribute("class") || ""; },
+ set className(val) {
+ return this.setAttribute("class",
+ val.replace(/(^\s*|\s*$)/g,""));
+ },
+
+ get type() { return this.getAttribute("type") || ""; },
+ set type(val) { return this.setAttribute("type",val); },
+
+ get value() { return this.getAttribute("value") || ""; },
+ set value(val) { return this.setAttribute("value",val); },
+
+ get src() { return this.getAttribute("src") || ""; },
+ set src(val) { return this.setAttribute("src",val); },
+
+ get id() { return this.getAttribute("id") || ""; },
+ set id(val) { return this.setAttribute("id",val); },
+
+ getAttribute: function(name){
+ return this._dom.hasAttribute(name) ?
+ new String( this._dom.getAttribute(name) ) :
+ null;
+ },
+ setAttribute: function(name,value){
+ this._dom.setAttribute(name,value);
+ },
+ removeAttribute: function(name){
+ this._dom.removeAttribute(name);
+ },
+
+ get childNodes(){
+ return new DOMNodeList( this._dom.getChildNodes() );
+ },
+ get firstChild(){
+ return makeNode( this._dom.getFirstChild() );
+ },
+ get lastChild(){
+ return makeNode( this._dom.getLastChild() );
+ },
+ appendChild: function(node){
+ this._dom.appendChild( node._dom );
+ },
+ insertBefore: function(node,before){
+ this._dom.insertBefore( node._dom, before ? before._dom : before );
+ },
+ removeChild: function(node){
+ this._dom.removeChild( node._dom );
+ },
+
+ getElementsByTagName: DOMDocument.prototype.getElementsByTagName,
+
+ addEventListener: window.addEventListener,
+ removeEventListener: window.removeEventListener,
+ dispatchEvent: window.dispatchEvent,
+
+ click: function(){
+ var event = document.createEvent();
+ event.initEvent("click");
+ this.dispatchEvent(event);
+ },
+ submit: function(){
+ var event = document.createEvent();
+ event.initEvent("submit");
+ this.dispatchEvent(event);
+ },
+ focus: function(){
+ var event = document.createEvent();
+ event.initEvent("focus");
+ this.dispatchEvent(event);
+ },
+ blur: function(){
+ var event = document.createEvent();
+ event.initEvent("blur");
+ this.dispatchEvent(event);
+ },
+ get elements(){
+ return this.getElementsByTagName("*");
+ },
+ get contentWindow(){
+ return this.nodeName == "IFRAME" ? {
+ document: this.contentDocument
+ } : null;
+ },
+ get contentDocument(){
+ if ( this.nodeName == "IFRAME" ) {
+ if ( !this._doc )
+ this._doc = new DOMDocument(
+ new java.io.ByteArrayInputStream((new java.lang.String(
+ "<html><head><title></title></head><body></body></html>"))
+ .getBytes("UTF8")));
+ return this._doc;
+ } else
+ return null;
+ }
+ });
+
+ // Helper method for extending one object with another
+
+ function extend(a,b) {
+ for ( var i in b ) {
+ var g = b.__lookupGetter__(i), s = b.__lookupSetter__(i);
+
+ if ( g || s ) {
+ if ( g )
+ a.__defineGetter__(i, g);
+ if ( s )
+ a.__defineSetter__(i, s);
+ } else
+ a[i] = b[i];
+ }
+ return a;
+ }
+
+ // Helper method for generating the right
+ // DOM objects based upon the type
+
+ var obj_nodes = new java.util.HashMap();
+
+ function makeNode(node){
+ if ( node ) {
+ if ( !obj_nodes.containsKey( node ) )
+ obj_nodes.put( node, node.getNodeType() ==
+ Packages.org.w3c.dom.Node.ELEMENT_NODE ?
+ new DOMElement( node ) : new DOMNode( node ) );
+
+ return obj_nodes.get(node);
+ } else
+ return null;
+ }
+
+})();
+
+var document = {
+
+ location: window.location,
+ cookie: '',
+
+ getElementById: function(id){
+ if (id == "dwr-debug"){
+ var dbEl = {
+ get innerHTML(){
+ return "";
+ },
+ set innerHTML(value){
+ java.lang.System.out.print(value.replace("<br>", "\n"));
+ }
+ }
+ return dbEl;
+ }
+ return null;
+ }
+
+}
Copied: trunk/openutils-testing4dwr-junit (from rev 768, trunk/openutils-testing-junit-dwr)
Deleted: trunk/openutils-testing4dwr-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit-dwr/pom.xml 2008-04-27 12:36:18 UTC (rev 768)
+++ trunk/openutils-testing4dwr-junit/pom.xml 2008-04-27 17:02:54 UTC (rev 780)
@@ -1,142 +0,0 @@
-<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>7</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-testing-junit-dwr</artifactId>
- <name>openutils dwr test utils (junit)</name>
- <version>2.0-SNAPSHOT</version>
- <description>openutils test utils for dwr</description>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-testing</artifactId>
- <version>2.0.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.3</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>httpunit</groupId>
- <artifactId>httpunit</artifactId>
- <version>1.6.2</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- </exclusion>
- <exclusion>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- <version>5.5.12</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>naming-resources</artifactId>
- <version>5.5.15</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>5.5.12</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>5.5.12</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>naming-factory</artifactId>
- <version>5.5.15</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- <version>1.6R6-candidate2</version>
- </dependency>
- </dependencies>
- <properties>
- <spring.version>2.5.1</spring.version>
- </properties>
-</project>
\ No newline at end of file
Copied: trunk/openutils-testing4dwr-junit/pom.xml (from rev 779, trunk/openutils-testing-junit-dwr/pom.xml)
===================================================================
--- trunk/openutils-testing4dwr-junit/pom.xml (rev 0)
+++ trunk/openutils-testing4dwr-junit/pom.xml 2008-04-27 17:02:54 UTC (rev 780)
@@ -0,0 +1,26 @@
+<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>8</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-testing4dwr-junit</artifactId>
+ <name>openutils testing4dwr (junit)</name>
+ <version>2.0-SNAPSHOT</version>
+ <description>openutils testing4dwr (junit)</description>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-testing4dwr</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Copied: trunk/openutils-testing4dwr-junit/src (from rev 779, trunk/openutils-testing-junit-dwr/src)
Modified: trunk/openutils-testing4dwr-junit/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java
===================================================================
--- trunk/openutils-testing-junit-dwr/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java 2008-04-27 16:35:14 UTC (rev 779)
+++ trunk/openutils-testing4dwr-junit/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java 2008-04-27 17:02:54 UTC (rev 780)
@@ -1,294 +1,87 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed 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.
+ */
package it.openutils.testing.junit.dwr;
-import java.io.File;
-import java.io.FileInputStream;
+import it.openutils.testing.dwr.DwrTestContext;
+
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import junit.framework.TestCase;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.ScriptableObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.xml.sax.SAXException;
-import com.meterware.httpunit.GetMethodWebRequest;
-import com.meterware.httpunit.WebResponse;
-import com.meterware.servletunit.ServletRunner;
-import com.meterware.servletunit.ServletUnitClient;
-
-
-public class DwrTestCase extends TestCase
+/**
+ * @author fgiust
+ * @version $Id: $
+ */
+public class DwrTestCase
{
- private static Logger log = LoggerFactory.getLogger(DwrTestCase.class);
+ protected DwrTestContext dwrTestContext = new DwrTestContext();
- public static final String SERVLET_UNIT_CLIENT = "SERVLET_UNIT_CLIENT";
-
- private Context context;
-
- private Scriptable scope;
-
- private ServletUnitClient servletUnitClient;
-
- private ServletRunner servletRunner;
-
- private String webXmlLocation;
-
- private String contextPath = "/webapp";
-
- private List<String> jsLibraries = new ArrayList<String>();
-
protected void setAbsoluteWebXmlLocation(String absoluteWebXmlLocation)
{
- this.webXmlLocation = absoluteWebXmlLocation;
+ dwrTestContext.setAbsoluteWebXmlLocation(absoluteWebXmlLocation);
}
protected void setContextPath(String contextPath)
{
- this.contextPath = contextPath;
- if (this.contextPath != null)
- {
- this.contextPath = this.contextPath.replace('\\', '/');
- if (!this.contextPath.startsWith("/"))
- {
- this.contextPath = "/" + this.contextPath;
- }
- }
+ dwrTestContext.setContextPath(contextPath);
}
public void addJsLibrary(String library)
{
- jsLibraries.add(library);
+ dwrTestContext.addJsLibrary(library);
}
- @Override
- protected void setUp() throws Exception
+ @BeforeClass
+ protected void setUpServer() throws Exception
{
- // run httpunit servlet engine
- servletRunner = new ServletRunner(new File(webXmlLocation), contextPath);
- servletUnitClient = servletRunner.newClient();
-
- // init scripting context
- context = Context.enter();
- context.setLanguageVersion(Context.VERSION_1_6);
-
- // store servletUnitClient in context
- context.putThreadLocal(DwrTestCase.SERVLET_UNIT_CLIENT, servletUnitClient);
-
- // load js support for window and document
- String jsWebEnvironment = "";
- InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("webEnv.js");
- byte[] buffer = new byte[1024];
- int read = 0;
- int length = 1024;
- while ((read = is.read(buffer, 0, length)) > 0)
- {
- jsWebEnvironment += new String(buffer, 0, read);
- }
- is.close();
-
- //
- scope = context.initStandardObjects();
- ScriptableObject.defineClass(scope, XMLHttpRequest.class);
- // ScriptableObject.defineClass(scope, JsJUnitAssert.class);
- context.evaluateString(scope, jsWebEnvironment, "webEnv.js", -1, null);
- scope.put("Test", scope, this);
- scope.put("Log", scope, log);
-
- // add javascript
- for (String library : jsLibraries)
- {
- if (loadLibraryFromLocalServer(library))
- {
- log.info("Loaded library from local server: " + library);
- }
- else if (loadLibraryFromRemoteServer(library))
- {
- log.info("Loaded library from remote server: " + library);
- }
- else if (loadLibraryFromClasspath(library))
- {
- log.info("Loaded library from classpath: " + library);
- }
- else if (loadLibraryFromFileSystem(library))
- {
- log.info("Loaded library from filesystem: " + library);
- }
- else
- {
- log.error("Can't load library " + library);
- throw new FileNotFoundException(library);
- }
- }
-
- super.setUp();
+ dwrTestContext.setUpServer();
}
- private boolean loadLibraryFromLocalServer(String library) throws MalformedURLException, SAXException, IOException,
- URISyntaxException
+ @BeforeMethod
+ protected void setUpClient() throws Exception
{
- if (!library.startsWith("http://localhost/"))
- {
- return false;
- }
-
- WebResponse response = servletUnitClient.getResponse(new GetMethodWebRequest(library));
- if (response == null)
- {
- return false;
- }
- URI uri = new URI(library);
- context.evaluateString(scope, response.getText(), uri.getPath(), -1, null);
-
- return true;
+ dwrTestContext.setUpClient();
}
- private boolean loadLibraryFromRemoteServer(String library) throws MalformedURLException, SAXException,
- IOException, URISyntaxException
+ @AfterMethod
+ protected void tearDownClient() throws Exception
{
- if (!library.startsWith("http://"))
- {
- return false;
- }
-
- URL url = new URL(library);
-
- // connect to library
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
- connection.setRequestMethod("GET");
- connection.setDoInput(true);
- connection.connect();
-
- // get response
- InputStream is = connection.getInputStream();
- StringBuffer sb = new StringBuffer();
-
- int i;
- while ((i = is.read()) != -1)
- {
- sb.append((char) i);
- }
- is.close();
- connection.disconnect();
-
- // put response in context
- context.evaluateString(scope, sb.toString(), url.getPath(), -1, null);
-
- return true;
+ dwrTestContext.tearDownClient();
}
- private boolean loadLibraryFromClasspath(String library) throws IOException
+ @AfterClass
+ protected void tearDownServer() throws Exception
{
- String js = loadFileFromClassPath(library);
-
- if (js == null)
- {
- return false;
- }
-
- context.evaluateString(scope, js, library, -1, null);
-
- return true;
+ dwrTestContext.tearDownServer();
}
- private String loadFileFromClassPath(String file) throws IOException
- {
- InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(file);
- if (is == null)
- {
- return null;
- }
- byte[] buffer = new byte[1024];
- int read = 0;
- String js = "";
- while ((read = is.read(buffer, 0, buffer.length)) > 0)
- {
- js += new String(buffer, 0, read);
- }
- is.close();
-
- return js;
- }
-
- private boolean loadLibraryFromFileSystem(String library) throws FileNotFoundException, IOException
- {
- String js = loadFileFromFileSystem(library);
-
- if (js == null)
- {
- return false;
- }
-
- context.evaluateString(scope, js, library, -1, null);
-
- return true;
- }
-
- private String loadFileFromFileSystem(String file) throws FileNotFoundException, IOException
- {
- File f = new File(file);
- if (!f.exists())
- {
- return null;
- }
-
- InputStream is = new FileInputStream(f);
- if (is == null)
- {
- return null;
- }
- byte[] buffer = new byte[1024];
- int read = 0;
- String js = "";
- while ((read = is.read(buffer, 0, buffer.length)) > 0)
- {
- js += new String(buffer, 0, read);
- }
- is.close();
-
- return js;
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- scope = null;
- Context.exit();
-
- servletRunner.shutDown();
-
- ...
[truncated message content] |
|
From: <fg...@us...> - 2008-04-27 18:30:03
|
Revision: 781
http://openutils.svn.sourceforge.net/openutils/?rev=781&view=rev
Author: fgiust
Date: 2008-04-27 11:29:29 -0700 (Sun, 27 Apr 2008)
Log Message:
-----------
dependencies updated
Modified Paths:
--------------
trunk/openutils-testing4dwr/pom.xml
trunk/openutils-testing4web/pom.xml
Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml 2008-04-27 17:02:54 UTC (rev 780)
+++ trunk/openutils-testing4dwr/pom.xml 2008-04-27 18:29:29 UTC (rev 781)
@@ -123,7 +123,7 @@
<dependency>
<groupId>rhino</groupId>
<artifactId>js</artifactId>
- <version>1.6R6-candidate2</version>
+ <version>1.7R1</version>
</dependency>
</dependencies>
<properties>
Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml 2008-04-27 17:02:54 UTC (rev 780)
+++ trunk/openutils-testing4web/pom.xml 2008-04-27 18:29:29 UTC (rev 781)
@@ -13,11 +13,6 @@
<description>openutils test utils for webapps</description>
<dependencies>
<dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-testing</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
@@ -35,19 +30,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.3</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
- <dependency>
<groupId>httpunit</groupId>
<artifactId>httpunit</artifactId>
<version>1.6.2</version>
@@ -128,10 +118,10 @@
<dependency>
<groupId>rhino</groupId>
<artifactId>js</artifactId>
- <version>1.6R6-candidate2</version>
+ <version>1.7R1</version>
</dependency>
</dependencies>
<properties>
<spring.version>2.5.3</spring.version>
</properties>
-</project>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2008-04-27 20:42:50
|
Revision: 784
http://openutils.svn.sourceforge.net/openutils/?rev=784&view=rev
Author: fgiust
Date: 2008-04-27 13:42:00 -0700 (Sun, 27 Apr 2008)
Log Message:
-----------
new openutils-mgnltasks module, fixed license headers
Modified Paths:
--------------
trunk/openutils-mgnlspring/pom.xml
trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/ContentBridgeTag.java
trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/MagnoliaMultipartResolver.java
trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/RewriteVarsThreadLocal.java
trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/UrlFunctions.java
trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/WrappedResponse.java
trunk/openutils-mgnlstripes/pom.xml
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRequestWrapper.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphResponseWrapper.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/setup/StripesModuleVersionHandler.java
trunk/openutils-mgnlstripes/src/site/changes/changes.xml
Added Paths:
-----------
trunk/openutils-mgnlspring/LICENSE.txt
trunk/openutils-mgnlstripes/LICENSE.txt
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/tag/
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/tag/ExtendedFormTag.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/tag/ExtendedLabelTag.java
trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/tag/ExtendedMessagesTag.java
trunk/openutils-mgnltasks/
trunk/openutils-mgnltasks/LICENSE.txt
trunk/openutils-mgnltasks/pom.xml
trunk/openutils-mgnltasks/src/
trunk/openutils-mgnltasks/src/main/
trunk/openutils-mgnltasks/src/main/java/
trunk/openutils-mgnltasks/src/main/java/it/
trunk/openutils-mgnltasks/src/main/java/it/openutils/
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AnonymousUserSetupTask.java
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalBootstrapResource.java
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/NodeSortTask.java
trunk/openutils-mgnltasks/src/site/
trunk/openutils-mgnltasks/src/site/apt/
trunk/openutils-mgnltasks/src/site/apt/index.apt
trunk/openutils-mgnltasks/src/site/changes/
trunk/openutils-mgnltasks/src/site/changes/changes.xml
trunk/openutils-mgnltasks/src/site/site.xml
Added: trunk/openutils-mgnlspring/LICENSE.txt
===================================================================
--- trunk/openutils-mgnlspring/LICENSE.txt (rev 0)
+++ trunk/openutils-mgnlspring/LICENSE.txt 2008-04-27 20:42:00 UTC (rev 784)
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Property changes on: trunk/openutils-mgnlspring/LICENSE.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/openutils-mgnlspring/pom.xml
===================================================================
--- trunk/openutils-mgnlspring/pom.xml 2008-04-27 20:01:20 UTC (rev 783)
+++ trunk/openutils-mgnlspring/pom.xml 2008-04-27 20:42:00 UTC (rev 784)
@@ -12,16 +12,22 @@
<artifactId>openutils-mgnlspring</artifactId>
<name>openutils-mgnlspring</name>
<version>0.2-SNAPSHOT</version>
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
+ </license>
+ </licenses>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
- <version>1.4.3</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -59,7 +65,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>3.0.2</version>
+ <version>3.5.4</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -70,7 +76,7 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-jaas</artifactId>
- <version>3.0.2</version>
+ <version>3.5.4</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -107,7 +113,20 @@
</exclusions>
</dependency>
</dependencies>
+ <repositories>
+ <repository>
+ <id>repository.magnolia.info</id>
+ <name>magnolia repository</name>
+ <url>http://repo.magnolia.info/m2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.3</spring.version>
</properties>
-</project>
+</project>
\ No newline at end of file
Modified: trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/ContentBridgeTag.java
===================================================================
--- trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/ContentBridgeTag.java 2008-04-27 20:01:20 UTC (rev 783)
+++ trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/ContentBridgeTag.java 2008-04-27 20:42:00 UTC (rev 784)
@@ -1,17 +1,19 @@
-/*
- * Copyright 2007 Fabrizio Giustina.
+/**
+ * Copyright Openmind http://www.openmindonline.it
*
- * Licensed 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
package it.openutils.mgnlspring;
@@ -43,7 +45,7 @@
/**
* @author fgiust
- * @version $Id$
+ * @version $Id:ContentBridgeTag.java 344 2007-06-30 15:31:28Z fgiust $
*/
public class ContentBridgeTag extends TagSupport
{
Modified: trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/MagnoliaMultipartResolver.java
===================================================================
--- trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/MagnoliaMultipartResolver.java 2008-04-27 20:01:20 UTC (rev 783)
+++ trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/MagnoliaMultipartResolver.java 2008-04-27 20:42:00 UTC (rev 784)
@@ -1,17 +1,19 @@
-/*
- * Copyright 2007 Fabrizio Giustina.
+/**
+ * Copyright Openmind http://www.openmindonline.it
*
- * Licensed 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
package it.openutils.mgnlspring;
@@ -40,7 +42,6 @@
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.multipart.MultipartResolver;
import org.springframework.web.multipart.commons.CommonsFileUploadSupport;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
import org.springframework.web.multipart.support.DefaultMultipartHttpServletRequest;
import org.springframework.web.util.WebUtils;
@@ -48,7 +49,7 @@
/**
* Spring MagnoliaMultipartResolver which interacts with magnolia.
* @author fgiust
- * @version $Id$
+ * @version $Id:MagnoliaMultipartResolver.java 344 2007-06-30 15:31:28Z fgiust $
*/
public class MagnoliaMultipartResolver extends CommonsFileUploadSupport
implements
Modified: trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/RewriteVarsThreadLocal.java
===================================================================
--- trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/RewriteVarsThreadLocal.java 2008-04-27 20:01:20 UTC (rev 783)
+++ trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/RewriteVarsThreadLocal.java 2008-04-27 20:42:00 UTC (rev 784)
@@ -1,23 +1,25 @@
-/*
- * Copyright 2007 Fabrizio Giustina.
+/**
+ * Copyright Openmind http://www.openmindonline.it
*
- * Licensed 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
package it.openutils.mgnlspring;
/**
* @author fgiust
- * @version $Id$
+ * @version $Id:RewriteVarsThreadLocal.java 344 2007-06-30 15:31:28Z fgiust $
*/
public final class RewriteVarsThreadLocal
{
Modified: trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/UrlFunctions.java
===================================================================
--- trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/UrlFunctions.java 2008-04-27 20:01:20 UTC (rev 783)
+++ trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/UrlFunctions.java 2008-04-27 20:42:00 UTC (rev 784)
@@ -1,17 +1,19 @@
-/*
- * Copyright 2007 Fabrizio Giustina.
+/**
+ * Copyright Openmind http://www.openmindonline.it
*
- * Licensed 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
package it.openutils.mgnlspring;
@@ -23,7 +25,7 @@
/**
* @author fgiust
- * @version $Id$
+ * @version $Id:UrlFunctions.java 344 2007-06-30 15:31:28Z fgiust $
*/
public final class UrlFunctions
{
Modified: trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/WrappedResponse.java
===================================================================
--- trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/WrappedResponse.java 2008-04-27 20:01:20 UTC (rev 783)
+++ trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/WrappedResponse.java 2008-04-27 20:42:00 UTC (rev 784)
@@ -1,17 +1,19 @@
-/*
- * Copyright 2007 Fabrizio Giustina.
+/**
+ * Copyright Openmind http://www.openmindonline.it
*
- * Licensed 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
package it.openutils.mgnlspring;
@@ -27,7 +29,7 @@
/**
* @author fgiust
- * @version $Id$
+ * @version $Id:WrappedResponse.java 344 2007-06-30 15:31:28Z fgiust $
*/
public class WrappedResponse extends HttpServletResponseWrapper
{
Added: trunk/openutils-mgnlstripes/LICENSE.txt
===================================================================
--- trunk/openutils-mgnlstripes/LICENSE.txt (rev 0)
+++ trunk/openutils-mgnlstripes/LICENSE.txt 2008-04-27 20:42:00 UTC (rev 784)
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on th...
[truncated message content] |
|
From: <fg...@us...> - 2008-04-27 21:27:46
|
Revision: 794
http://openutils.svn.sourceforge.net/openutils/?rev=794&view=rev
Author: fgiust
Date: 2008-04-27 14:27:49 -0700 (Sun, 27 Apr 2008)
Log Message:
-----------
new skin version
Modified Paths:
--------------
trunk/openutils-backup/src/site/site.xml
trunk/openutils-bshd5/src/site/site.xml
trunk/openutils-configuration-dataobjects/src/site/site.xml
trunk/openutils-configuration-services/src/site/site.xml
trunk/openutils-dbmigration/src/site/site.xml
trunk/openutils-deployment/src/site/site.xml
trunk/openutils-hibernate-security/src/site/site.xml
trunk/openutils-log4j/src/site/site.xml
trunk/openutils-mgnlspring/src/site/site.xml
trunk/openutils-mgnlstripes/src/site/site.xml
trunk/openutils-mgnltasks/src/site/site.xml
trunk/openutils-spring/src/site/site.xml
trunk/openutils-spring-rmibernate/src/site/site.xml
trunk/openutils-tags-spring/src/site/site.xml
trunk/openutils-testing/src/site/site.xml
trunk/openutils-testing-junit/src/site/site.xml
trunk/openutils-testing-testng/src/site/site.xml
trunk/openutils-testing4dwr-junit/src/site/site.xml
trunk/openutils-testing4dwr-testng/src/site/site.xml
trunk/openutils-usermanagement/src/site/site.xml
trunk/openutils-usermanagement-dataobjects/src/site/site.xml
trunk/openutils-web/src/site/site.xml
trunk/src/site/site.xml
Modified: trunk/openutils-backup/src/site/site.xml
===================================================================
--- trunk/openutils-backup/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-backup/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -24,6 +24,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-bshd5/src/site/site.xml
===================================================================
--- trunk/openutils-bshd5/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-bshd5/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -30,6 +30,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-configuration-dataobjects/src/site/site.xml
===================================================================
--- trunk/openutils-configuration-dataobjects/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-configuration-dataobjects/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -24,6 +24,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-configuration-services/src/site/site.xml
===================================================================
--- trunk/openutils-configuration-services/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-configuration-services/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -24,6 +24,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-dbmigration/src/site/site.xml
===================================================================
--- trunk/openutils-dbmigration/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-dbmigration/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -29,6 +29,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-deployment/src/site/site.xml
===================================================================
--- trunk/openutils-deployment/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-deployment/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -29,6 +29,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-hibernate-security/src/site/site.xml
===================================================================
--- trunk/openutils-hibernate-security/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-hibernate-security/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -24,6 +24,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-log4j/src/site/site.xml
===================================================================
--- trunk/openutils-log4j/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-log4j/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -33,6 +33,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-mgnlspring/src/site/site.xml
===================================================================
--- trunk/openutils-mgnlspring/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-mgnlspring/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -24,6 +24,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-mgnlstripes/src/site/site.xml
===================================================================
--- trunk/openutils-mgnlstripes/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-mgnlstripes/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -24,6 +24,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-mgnltasks/src/site/site.xml
===================================================================
--- trunk/openutils-mgnltasks/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-mgnltasks/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -29,6 +29,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-spring/src/site/site.xml
===================================================================
--- trunk/openutils-spring/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-spring/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -24,6 +24,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-spring-rmibernate/src/site/site.xml
===================================================================
--- trunk/openutils-spring-rmibernate/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-spring-rmibernate/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -24,6 +24,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-tags-spring/src/site/site.xml
===================================================================
--- trunk/openutils-tags-spring/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-tags-spring/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -24,6 +24,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-testing/src/site/site.xml
===================================================================
--- trunk/openutils-testing/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-testing/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -30,6 +30,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-testing-junit/src/site/site.xml
===================================================================
--- trunk/openutils-testing-junit/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-testing-junit/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -24,6 +24,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-testing-testng/src/site/site.xml
===================================================================
--- trunk/openutils-testing-testng/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-testing-testng/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -24,6 +24,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-testing4dwr-junit/src/site/site.xml
===================================================================
--- trunk/openutils-testing4dwr-junit/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-testing4dwr-junit/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -24,6 +24,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-testing4dwr-testng/src/site/site.xml
===================================================================
--- trunk/openutils-testing4dwr-testng/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-testing4dwr-testng/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -24,6 +24,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-usermanagement/src/site/site.xml
===================================================================
--- trunk/openutils-usermanagement/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-usermanagement/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -24,6 +24,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-usermanagement-dataobjects/src/site/site.xml
===================================================================
--- trunk/openutils-usermanagement-dataobjects/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-usermanagement-dataobjects/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -24,6 +24,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/openutils-web/src/site/site.xml
===================================================================
--- trunk/openutils-web/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/openutils-web/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -24,6 +24,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2008-04-27 21:22:10 UTC (rev 793)
+++ trunk/src/site/site.xml 2008-04-27 21:27:49 UTC (rev 794)
@@ -21,6 +21,6 @@
<skin>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-maven-skin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</skin>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X