openutils-svn — developer list with svn commits

[Openutils-svn] SF.net SVN: openutils: [545] trunk/openutils-log4j/src/main/java/it/ openutils/log4j/DynamicSubjectSMTPAppender.java

[<fg...@us...>]

Revision: 545
          http://openutils.svn.sourceforge.net/openutils/?rev=545&view=rev
Author:   fgiust
Date:     2008-01-26 05:58:30 -0800 (Sat, 26 Jan 2008)

Log Message:
-----------
trim subject line to the first newline

Modified Paths:
--------------
    trunk/openutils-log4j/src/main/java/it/openutils/log4j/DynamicSubjectSMTPAppender.java

Modified: trunk/openutils-log4j/src/main/java/it/openutils/log4j/DynamicSubjectSMTPAppender.java
===================================================================
--- trunk/openutils-log4j/src/main/java/it/openutils/log4j/DynamicSubjectSMTPAppender.java	2008-01-26 13:53:20 UTC (rev 544)
+++ trunk/openutils-log4j/src/main/java/it/openutils/log4j/DynamicSubjectSMTPAppender.java	2008-01-26 13:58:30 UTC (rev 545)
@@ -85,6 +85,14 @@
                 if (this.subjectLayout != null)
                 {
                     String subject = this.subjectLayout.format(event);
+                    if (subject != null)
+                    {
+                        subject = subject.trim();
+                        if (subject.indexOf("\n") > 0)
+                        {
+                            subject = subject.substring(0, subject.indexOf("\n"));
+                        }
+                    }
                     this.msg.setSubject(subject);
                 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [544] trunk/openutils-log4j/src

[<fg...@us...>]

Revision: 544
          http://openutils.svn.sourceforge.net/openutils/?rev=544&view=rev
Author:   fgiust
Date:     2008-01-26 05:53:20 -0800 (Sat, 26 Jan 2008)

Log Message:
-----------
new EnhancedDailyRollingFileAppender

Modified Paths:
--------------
    trunk/openutils-log4j/src/site/apt/index.apt

Added Paths:
-----------
    trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java
    trunk/openutils-log4j/src/site/apt/fileppenders.apt

Added: trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java
===================================================================
--- trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java	                        (rev 0)
+++ trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java	2008-01-26 13:53:20 UTC (rev 544)
@@ -0,0 +1,398 @@
+package it.openutils.log4j;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.TimeZone;
+
+import org.apache.log4j.FileAppender;
+import org.apache.log4j.Layout;
+import org.apache.log4j.helpers.LogLog;
+import org.apache.log4j.spi.LoggingEvent;
+
+
+/**
+ * Enhanced version of standard DailyRollingFileAppender that allow moving rotated files to a different directory. You
+ * can configure the target directory by setting the <code>archiveDirectory</code> property. The default value is
+ * <code>archive</code> <strong>Note that since DailyRollingFileAppender is not easily extendible, this class is
+ * actually a copy and paste of all the code with slights modifications...</strong>
+ * @author fgiust
+ * @version $Id: $
+ */
+public class EnhancedDailyRollingFileAppender extends FileAppender
+{
+
+    // The code assumes that the following constants are in a increasing
+    // sequence.
+    static final int TOP_OF_TROUBLE = -1;
+
+    static final int TOP_OF_MINUTE = 0;
+
+    static final int TOP_OF_HOUR = 1;
+
+    static final int HALF_DAY = 2;
+
+    static final int TOP_OF_DAY = 3;
+
+    static final int TOP_OF_WEEK = 4;
+
+    static final int TOP_OF_MONTH = 5;
+
+    /**
+     * The date pattern. By default, the pattern is set to "'.'yyyy-MM-dd" meaning daily rollover.
+     */
+    private String datePattern = "'.'yyyy-MM-dd";
+
+    /**
+     * The log file will be renamed to the value of the scheduledFilename variable when the next interval is entered.
+     * For example, if the rollover period is one hour, the log file will be renamed to the value of "scheduledFilename"
+     * at the beginning of the next hour. The precise time when a rollover occurs depends on logging activity.
+     */
+    private String scheduledFilename;
+
+    String archiveDirectory = "archive";
+
+    /**
+     * The next time we estimate a rollover should occur.
+     */
+    private long nextCheck = System.currentTimeMillis() - 1;
+
+    Date now = new Date();
+
+    SimpleDateFormat sdf;
+
+    RollingCalendar rc = new RollingCalendar();
+
+    int checkPeriod = TOP_OF_TROUBLE;
+
+    // The gmtTimeZone is used only in computeCheckPeriod() method.
+    static final TimeZone gmtTimeZone = TimeZone.getTimeZone("GMT");
+
+    /**
+     * The default constructor does nothing.
+     */
+    public EnhancedDailyRollingFileAppender()
+    {
+    }
+
+    /**
+     * Instantiate a <code>DailyRollingFileAppender</code> and open the file designated by <code>filename</code>.
+     * The opened filename will become the ouput destination for this appender.
+     */
+    public EnhancedDailyRollingFileAppender(Layout layout, String filename, String datePattern) throws IOException
+    {
+        super(layout, filename, true);
+        this.datePattern = datePattern;
+        activateOptions();
+    }
+
+    /**
+     * Sets the archiveDirectory.
+     * @param archiveDirectory the archiveDirectory to set
+     */
+    public void setArchiveDirectory(String archiveDirectory)
+    {
+        this.archiveDirectory = archiveDirectory;
+    }
+
+    /**
+     * The <b>DatePattern</b> takes a string in the same format as expected by {@link SimpleDateFormat}. This options
+     * determines the rollover schedule.
+     */
+    public void setDatePattern(String pattern)
+    {
+        datePattern = pattern;
+    }
+
+    /** Returns the value of the <b>DatePattern</b> option. */
+    public String getDatePattern()
+    {
+        return datePattern;
+    }
+
+    public void activateOptions()
+    {
+        super.activateOptions();
+        if (datePattern != null && fileName != null)
+        {
+            now.setTime(System.currentTimeMillis());
+            sdf = new SimpleDateFormat(datePattern);
+            int type = computeCheckPeriod();
+            printPeriodicity(type);
+            rc.setType(type);
+            File file = new File(fileName);
+            scheduledFilename = fileName + sdf.format(new Date(file.lastModified()));
+
+        }
+        else
+        {
+            LogLog.error("Either File or DatePattern options are not set for appender [" + name + "].");
+        }
+    }
+
+    void printPeriodicity(int type)
+    {
+        switch (type)
+        {
+            case TOP_OF_MINUTE :
+                LogLog.debug("Appender [" + name + "] to be rolled every minute.");
+                break;
+            case TOP_OF_HOUR :
+                LogLog.debug("Appender [" + name + "] to be rolled on top of every hour.");
+                break;
+            case HALF_DAY :
+                LogLog.debug("Appender [" + name + "] to be rolled at midday and midnight.");
+                break;
+            case TOP_OF_DAY :
+                LogLog.debug("Appender [" + name + "] to be rolled at midnight.");
+                break;
+            case TOP_OF_WEEK :
+                LogLog.debug("Appender [" + name + "] to be rolled at start of week.");
+                break;
+            case TOP_OF_MONTH :
+                LogLog.debug("Appender [" + name + "] to be rolled at start of every month.");
+                break;
+            default :
+                LogLog.warn("Unknown periodicity for appender [" + name + "].");
+        }
+    }
+
+    // This method computes the roll over period by looping over the
+    // periods, starting with the shortest, and stopping when the r0 is
+    // different from from r1, where r0 is the epoch formatted according
+    // the datePattern (supplied by the user) and r1 is the
+    // epoch+nextMillis(i) formatted according to datePattern. All date
+    // formatting is done in GMT and not local format because the test
+    // logic is based on comparisons relative to 1970-01-01 00:00:00
+    // GMT (the epoch).
+
+    int computeCheckPeriod()
+    {
+        RollingCalendar rollingCalendar = new RollingCalendar(gmtTimeZone, Locale.ENGLISH);
+        // set sate to 1970-01-01 00:00:00 GMT
+        Date epoch = new Date(0);
+        if (datePattern != null)
+        {
+            for (int i = TOP_OF_MINUTE; i <= TOP_OF_MONTH; i++)
+            {
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat(datePattern);
+                simpleDateFormat.setTimeZone(gmtTimeZone); // do all date formatting in GMT
+                String r0 = simpleDateFormat.format(epoch);
+                rollingCalendar.setType(i);
+                Date next = new Date(rollingCalendar.getNextCheckMillis(epoch));
+                String r1 = simpleDateFormat.format(next);
+                if (r0 != null && r1 != null && !r0.equals(r1))
+                {
+                    return i;
+                }
+            }
+        }
+        return TOP_OF_TROUBLE; // Deliberately head for trouble...
+    }
+
+    /**
+     * Rollover the current file to a new file.
+     */
+    void rollOver() throws IOException
+    {
+
+        /* Compute filename, but only if datePattern is specified */
+        if (datePattern == null)
+        {
+            errorHandler.error("Missing DatePattern option in rollOver().");
+            return;
+        }
+
+        String datedFilename = fileName + sdf.format(now);
+        // It is too early to roll over because we are still within the
+        // bounds of the current interval. Rollover will occur once the
+        // next interval is reached.
+        if (scheduledFilename.equals(datedFilename))
+        {
+            return;
+        }
+
+        // close current file, and rename it to datedFilename
+        this.closeFile();
+
+        File scheduledFile = new File(scheduledFilename);
+        File targetDir;
+        if (archiveDirectory != null)
+        {
+            targetDir = new File(scheduledFile.getParentFile(), archiveDirectory);
+        }
+        else
+        {
+            targetDir = scheduledFile.getParentFile();
+        }
+        if (!targetDir.exists())
+        {
+            boolean newdir = targetDir.mkdirs();
+            if (!newdir)
+            {
+                LogLog.error("Failed to create dir [" + targetDir.getAbsolutePath() + "].");
+            }
+        }
+
+        File target = new File(targetDir, scheduledFile.getName());
+
+        if (target.exists())
+        {
+            target.delete();
+        }
+
+        File file = new File(fileName);
+        boolean result = file.renameTo(target);
+        if (result)
+        {
+            LogLog.debug(fileName + " -> " + scheduledFilename);
+        }
+        else
+        {
+            LogLog.error("Failed to rename [" + fileName + "] to [" + target.getAbsolutePath() + "].");
+
+            // try without moving:
+            target = new File(scheduledFilename);
+            result = file.renameTo(target);
+            if (result)
+            {
+                LogLog.debug(fileName + " -> " + scheduledFilename);
+            }
+            else
+            {
+                LogLog.error("Failed to rename [" + fileName + "] to [" + scheduledFilename + "].");
+            }
+        }
+
+        try
+        {
+            // This will also close the file. This is OK since multiple
+            // close operations are safe.
+            this.setFile(fileName, false, this.bufferedIO, this.bufferSize);
+        }
+        catch (IOException e)
+        {
+            errorHandler.error("setFile(" + fileName + ", false) call failed.");
+        }
+        scheduledFilename = datedFilename;
+    }
+
+    /**
+     * This method differentiates DailyRollingFileAppender from its super class.
+     * <p>
+     * Before actually logging, this method will check whether it is time to do a rollover. If it is, it will schedule
+     * the next rollover time and then rollover.
+     */
+    protected void subAppend(LoggingEvent event)
+    {
+        long n = System.currentTimeMillis();
+        if (n >= nextCheck)
+        {
+            now.setTime(n);
+            nextCheck = rc.getNextCheckMillis(now);
+            try
+            {
+                rollOver();
+            }
+            catch (IOException ioe)
+            {
+                LogLog.error("rollOver() failed.", ioe);
+            }
+        }
+        super.subAppend(event);
+    }
+}
+
+
+/**
+ * RollingCalendar is a helper class to DailyRollingFileAppender. Given a periodicity type and the current time, it
+ * computes the start of the next interval.
+ */
+class RollingCalendar extends GregorianCalendar
+{
+
+    int type = EnhancedDailyRollingFileAppender.TOP_OF_TROUBLE;
+
+    RollingCalendar()
+    {
+        super();
+    }
+
+    RollingCalendar(TimeZone tz, Locale locale)
+    {
+        super(tz, locale);
+    }
+
+    void setType(int type)
+    {
+        this.type = type;
+    }
+
+    public long getNextCheckMillis(Date now)
+    {
+        return getNextCheckDate(now).getTime();
+    }
+
+    public Date getNextCheckDate(Date now)
+    {
+        this.setTime(now);
+
+        switch (type)
+        {
+            case EnhancedDailyRollingFileAppender.TOP_OF_MINUTE :
+                this.set(Calendar.SECOND, 0);
+                this.set(Calendar.MILLISECOND, 0);
+                this.add(Calendar.MINUTE, 1);
+                break;
+            case EnhancedDailyRollingFileAppender.TOP_OF_HOUR :
+                this.set(Calendar.MINUTE, 0);
+                this.set(Calendar.SECOND, 0);
+                this.set(Calendar.MILLISECOND, 0);
+                this.add(Calendar.HOUR_OF_DAY, 1);
+                break;
+            case EnhancedDailyRollingFileAppender.HALF_DAY :
+                this.set(Calendar.MINUTE, 0);
+                this.set(Calendar.SECOND, 0);
+                this.set(Calendar.MILLISECOND, 0);
+                int hour = get(Calendar.HOUR_OF_DAY);
+                if (hour < 12)
+                {
+                    this.set(Calendar.HOUR_OF_DAY, 12);
+                }
+                else
+                {
+                    this.set(Calendar.HOUR_OF_DAY, 0);
+                    this.add(Calendar.DAY_OF_MONTH, 1);
+                }
+                break;
+            case EnhancedDailyRollingFileAppender.TOP_OF_DAY :
+                this.set(Calendar.HOUR_OF_DAY, 0);
+                this.set(Calendar.MINUTE, 0);
+                this.set(Calendar.SECOND, 0);
+                this.set(Calendar.MILLISECOND, 0);
+                this.add(Calendar.DATE, 1);
+                break;
+            case EnhancedDailyRollingFileAppender.TOP_OF_WEEK :
+                this.set(Calendar.DAY_OF_WEEK, getFirstDayOfWeek());
+                this.set(Calendar.HOUR_OF_DAY, 0);
+                this.set(Calendar.SECOND, 0);
+                this.set(Calendar.MILLISECOND, 0);
+                this.add(Calendar.WEEK_OF_YEAR, 1);
+                break;
+            case EnhancedDailyRollingFileAppender.TOP_OF_MONTH :
+                this.set(Calendar.DATE, 1);
+                this.set(Calendar.HOUR_OF_DAY, 0);
+                this.set(Calendar.SECOND, 0);
+                this.set(Calendar.MILLISECOND, 0);
+                this.add(Calendar.MONTH, 1);
+                break;
+            default :
+                throw new IllegalStateException("Unknown periodicity type.");
+        }
+        return getTime();
+    }
+}


Property changes on: trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-log4j/src/site/apt/fileppenders.apt
===================================================================
--- trunk/openutils-log4j/src/site/apt/fileppenders.apt	                        (rev 0)
+++ trunk/openutils-log4j/src/site/apt/fileppenders.apt	2008-01-26 13:53:20 UTC (rev 544)
@@ -0,0 +1,28 @@
+                                 --------------------------
+                                      O p e n u t i l s
+                                 --------------------------
+                                     Fabrizio Giustina
+                                 --------------------------
+
+EnhancedDailyRollingFileAppender
+
+ The standard org.apache.log4j.DailyRollingFileAppender lets you only add a suffix to the original log file name,
+renaming for example <<<error.log>>> to <<<error.log.2008-02-23>>>.
+
+ This appender also allow moving archived file to a different directory, by setting the <<<ArchiveDirectory>>> property
+ (default is <<<archive>>>)
+
+
+
++----------------------------------------------+
+  <appender name="log" class="it.openutils.log4j.EnhancedDailyRollingFileAppender">
+    <param name="DatePattern" value="'.'yyyy-MM-dd'.log'" />
+    <param name="ArchiveDirectory" value="archive" />
+    <param name="File" value="/data/logs/error.log" />
+    <param name="Threshold" value="INFO" />
+    <param name="Append" value="true" />
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %m%n" />
+    </layout>
+  </appender>
++----------------------------------------------+
\ No newline at end of file


Property changes on: trunk/openutils-log4j/src/site/apt/fileppenders.apt
___________________________________________________________________
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-22 21:17:56 UTC (rev 543)
+++ trunk/openutils-log4j/src/site/apt/index.apt	2008-01-26 13:53:20 UTC (rev 544)
@@ -15,6 +15,8 @@
 
  * {{{servlet.html}a ready to use configuration servlet that let you change logging levels on the fly}}
 
+ * {{{fileappenders.html} an extended version of the standard DailyRollingFileAppender}}
+
  []
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [543] trunk/openutils-testing

[<fg...@us...>]

Revision: 543
          http://openutils.svn.sourceforge.net/openutils/?rev=543&view=rev
Author:   fgiust
Date:     2008-01-22 13:17:56 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
minor changes

Modified Paths:
--------------
    trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java
    trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java
    trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java	2008-01-21 09:07:23 UTC (rev 542)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java	2008-01-22 21:17:56 UTC (rev 543)
@@ -15,7 +15,11 @@
  */
 package it.openutils.testing;
 
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.net.URL;
 import java.sql.SQLException;
 import java.util.HashMap;
@@ -32,8 +36,10 @@
 import org.dbunit.dataset.DataSetException;
 import org.dbunit.dataset.FilteredDataSet;
 import org.dbunit.dataset.IDataSet;
+import org.dbunit.dataset.excel.XlsDataSet;
 import org.dbunit.dataset.filter.ITableFilter;
 import org.dbunit.dataset.filter.SequenceTableFilter;
+import org.dbunit.dataset.xml.XmlDataSet;
 import org.dbunit.operation.DatabaseOperation;
 import org.dbunit.operation.DeleteAllOperation;
 import org.dbunit.operation.DeleteOperation;
@@ -99,7 +105,7 @@
     {
         DbUnitExecution singleDbUnitExecution = testcase.getClass().getAnnotation(DbUnitExecution.class);
 
-        DbUnitExecution[] executions;
+        DbUnitExecution[] executions = null;
         if (singleDbUnitExecution != null)
         {
             executions = new DbUnitExecution[]{singleDbUnitExecution };
@@ -107,43 +113,48 @@
         else
         {
             DbUnitConfiguration dbUnitConfiguration = testcase.getClass().getAnnotation(DbUnitConfiguration.class);
-            executions = dbUnitConfiguration.dbUnitExecutions();
+            if (dbUnitConfiguration != null)
+            {
+                executions = dbUnitConfiguration.dbUnitExecutions();
+            }
         }
-
-        for (DbUnitExecution dbUnitExecution : executions)
+        if (executions != null)
         {
-            String[] datasets = dbUnitExecution.datasets();
-            String dataSourceName = dbUnitExecution.dataSource();
-            String schema = dbUnitExecution.schema();
-            if (StringUtils.isEmpty(schema))
+            for (DbUnitExecution dbUnitExecution : executions)
             {
-                schema = null;
-            }
+                String[] datasets = dbUnitExecution.datasets();
+                String dataSourceName = dbUnitExecution.dataSource();
+                String schema = dbUnitExecution.schema();
+                if (StringUtils.isEmpty(schema))
+                {
+                    schema = null;
+                }
 
-            IDatabaseConnection connection = new DatabaseConnection(
-                getDatasource(dataSourceName).getConnection(),
-                schema);
+                IDatabaseConnection connection = new DatabaseConnection(
+                    getDatasource(dataSourceName).getConnection(),
+                    schema);
 
-            try
-            {
-                ITableFilter tableFilter = new RegExpTableFilter(dbUnitExecution.excludedTables());
+                try
+                {
+                    ITableFilter tableFilter = new RegExpTableFilter(dbUnitExecution.excludedTables());
 
-                if (dbUnitExecution.truncateAll())
-                {
-                    truncateAll(connection, tableFilter, dataSourceName, getDatabaseOperation(dbUnitExecution
-                        .truncateOperation()));
+                    if (dbUnitExecution.truncateAll())
+                    {
+                        truncateAll(connection, tableFilter, dataSourceName, getDatabaseOperation(dbUnitExecution
+                            .truncateOperation()));
+                    }
+
+                    DatabaseOperation dbOperation = getDatabaseOperation(dbUnitExecution.insertOperation());
+                    for (String datasetFile : datasets)
+                    {
+                        importDataSet(createDataset(datasetFile), connection, tableFilter, dataSourceName, dbOperation);
+                    }
                 }
-
-                DatabaseOperation dbOperation = getDatabaseOperation(dbUnitExecution.insertOperation());
-                for (String datasetFile : datasets)
+                finally
                 {
-                    importDataSet(createDataset(datasetFile), connection, tableFilter, dataSourceName, dbOperation);
+                    connection.close();
                 }
             }
-            finally
-            {
-                connection.close();
-            }
         }
     }
 
@@ -310,4 +321,40 @@
         }
         return (DataSource) applicationContext.getBean(name);
     }
+
+    /**
+     * Exports a list of table to an xml/xsl file
+     * @param file The file name we save the dataset to
+     * @param dataSource datasource to use
+     * @param schema optional schema name
+     * @param tableNames optional list of table names
+     * @throws IOException An IO Exception.
+     * @throws DataSetException A dataset exception.
+     * @throws SQLException A SQL Exception.
+     */
+    public void exportDataset(File file, DataSource dataSource, String schema, String[] tableNames) throws IOException,
+        DataSetException, SQLException
+    {
+        IDatabaseConnection connection = new DatabaseConnection(dataSource.getConnection(), schema);
+
+        IDataSet fullDataSet = connection.createDataSet();
+
+        if (tableNames != null && tableNames.length > 0)
+        {
+            fullDataSet = new FilteredDataSet(tableNames, fullDataSet);
+        }
+
+        OutputStream fos = new BufferedOutputStream(new FileOutputStream(file));
+        if (file.getName().toLowerCase().endsWith(".xls"))
+        {
+            XlsDataSet.write(fullDataSet, fos);
+        }
+        else
+        {
+            XmlDataSet.write(fullDataSet, fos);
+        }
+        fos.close();
+
+        log.info("Dataset exported at {}", file.getAbsolutePath());
+    }
 }

Modified: trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java
===================================================================
--- trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java	2008-01-21 09:07:23 UTC (rev 542)
+++ trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java	2008-01-22 21:17:56 UTC (rev 543)
@@ -38,7 +38,7 @@
     /**
      * DBUnit text context.
      */
-    private DbUnitTestContext dbUnitTestContext;
+    protected DbUnitTestContext dbUnitTestContext;
 
     /**
      * Setup the Database before running the test method.

Modified: trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java
===================================================================
--- trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java	2008-01-21 09:07:23 UTC (rev 542)
+++ trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java	2008-01-22 21:17:56 UTC (rev 543)
@@ -38,7 +38,7 @@
     /**
      * DBUnit text context.
      */
-    private DbUnitTestContext dbUnitTestContext;
+    protected DbUnitTestContext dbUnitTestContext;
 
     /**
      * Setup the Database before running the test method.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [542] trunk

[<fg...@us...>]

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.

[Openutils-svn] SF.net SVN: openutils: [541] trunk/openutils-testing

[<fg...@us...>]

Revision: 541
          http://openutils.svn.sourceforge.net/openutils/?rev=541&view=rev
Author:   fgiust
Date:     2008-01-20 12:47:20 -0800 (Sun, 20 Jan 2008)

Log Message:
-----------
standard dbunit operations can now be used

Modified Paths:
--------------
    trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java
    trunk/openutils-testing/src/site/apt/index.apt
    trunk/openutils-testing-testng/derby.log
    trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java	2008-01-20 19:29:56 UTC (rev 540)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java	2008-01-20 20:47:20 UTC (rev 541)
@@ -35,6 +35,12 @@
 import org.dbunit.dataset.filter.ITableFilter;
 import org.dbunit.dataset.filter.SequenceTableFilter;
 import org.dbunit.operation.DatabaseOperation;
+import org.dbunit.operation.DeleteAllOperation;
+import org.dbunit.operation.DeleteOperation;
+import org.dbunit.operation.InsertOperation;
+import org.dbunit.operation.RefreshOperation;
+import org.dbunit.operation.TruncateTableOperation;
+import org.dbunit.operation.UpdateOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
@@ -48,12 +54,24 @@
 {
 
     /**
+     * Truncate dataset cache. This is kept as a static attribute since the creation of the dataset is very expensive
+     * and it doesn't change across tests.
+     */
+    protected static Map<String, IDataSet> truncateDataSetCache = new HashMap<String, IDataSet>();
+
+    /**
      * Logger.
      */
     private static Logger log = LoggerFactory.getLogger(DbUnitTestContext.class);
 
+    /**
+     * The test instance.
+     */
     private Object testcase;
 
+    /**
+     * Spring application context.
+     */
     private ApplicationContext applicationContext;
 
     /**
@@ -62,11 +80,10 @@
     private Map<String, IDataSet> datasetCache = new HashMap<String, IDataSet>();
 
     /**
-     * Truncate dataset cache. This is kept as a static attribute since the creation of the dataset is very expensive
-     * and it doesn't change across tests.
+     * Instantiates a new DbUnitTestContext
+     * @param testcase test instance
+     * @param applicationContext Spring application context
      */
-    protected static Map<String, IDataSet> truncateDataSetCache = new HashMap<String, IDataSet>();
-
     public DbUnitTestContext(Object testcase, ApplicationContext applicationContext)
     {
         this.testcase = testcase;
@@ -113,12 +130,11 @@
 
                 if (dbUnitExecution.truncateAll())
                 {
-                    truncateAll(connection, tableFilter, dataSourceName, dbUnitExecution
-                        .truncateOperation()
-                        .newInstance());
+                    truncateAll(connection, tableFilter, dataSourceName, getDatabaseOperation(dbUnitExecution
+                        .truncateOperation()));
                 }
 
-                DatabaseOperation dbOperation = dbUnitExecution.insertOperation().newInstance();
+                DatabaseOperation dbOperation = getDatabaseOperation(dbUnitExecution.insertOperation());
                 for (String datasetFile : datasets)
                 {
                     importDataSet(createDataset(datasetFile), connection, tableFilter, dataSourceName, dbOperation);
@@ -132,8 +148,54 @@
     }
 
     /**
-     * @param datasetFile
-     * @return
+     * Instantiates the givec Database Operation. Standard operations in the <code>org.dbunit.operation</code> package
+     * have protected constructors and needs to be accessed using the public static fields in
+     * <code>org.dbunit.operation.DatabaseOperation</code>.
+     * @param dboperationClass db operation class
+     * @return db operation instance
+     * @throws InstantiationException if the given db operation class cannot be instantiated
+     * @throws IllegalAccessException if the given db operation class cannot be instantiated
+     */
+    private DatabaseOperation getDatabaseOperation(Class< ? extends DatabaseOperation> dboperationClass)
+        throws InstantiationException, IllegalAccessException
+    {
+        if (UpdateOperation.class.equals(dboperationClass))
+        {
+            return DatabaseOperation.UPDATE;
+        }
+        else if (InsertOperation.class.equals(dboperationClass))
+        {
+            return DatabaseOperation.INSERT;
+        }
+        else if (RefreshOperation.class.equals(dboperationClass))
+        {
+            return DatabaseOperation.REFRESH;
+        }
+        else if (DeleteOperation.class.equals(dboperationClass))
+        {
+            return DatabaseOperation.DELETE;
+        }
+        else if (DeleteAllOperation.class.equals(dboperationClass))
+        {
+            return DatabaseOperation.DELETE_ALL;
+        }
+        else if (TruncateTableOperation.class.equals(dboperationClass))
+        {
+            return DatabaseOperation.TRUNCATE_TABLE;
+        }
+        else if (DeleteOperation.class.equals(dboperationClass))
+        {
+            return DatabaseOperation.UPDATE;
+        }
+
+        return dboperationClass.newInstance();
+
+    }
+
+    /**
+     * Creates a dataset instance by fetching a file from the classpath
+     * @param datasetFile name of the file, will be loaded from the classpath
+     * @return IDataSet instance
      * @throws IOException
      * @throws DataSetException
      */
@@ -227,6 +289,11 @@
         return truncateDataSetCache.put(datasourceName + "_" + StringUtils.defaultString(schema), dataset);
     }
 
+    /**
+     * Loads a named datasource from the spring context.
+     * @param name datasource name.
+     * @return Datasource instance
+     */
     @SuppressWarnings("unchecked")
     protected DataSource getDatasource(String name)
     {

Modified: trunk/openutils-testing/src/site/apt/index.apt
===================================================================
--- trunk/openutils-testing/src/site/apt/index.apt	2008-01-20 19:29:56 UTC (rev 540)
+++ trunk/openutils-testing/src/site/apt/index.apt	2008-01-20 20:47:20 UTC (rev 541)
@@ -6,3 +6,10 @@
 
 openutils-testing
 
+
+
+
+Released versions
+
+ Check it at {{{http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-testing}http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-testing}}
+

Modified: trunk/openutils-testing-testng/derby.log
===================================================================
--- trunk/openutils-testing-testng/derby.log	2008-01-20 19:29:56 UTC (rev 540)
+++ trunk/openutils-testing-testng/derby.log	2008-01-20 20:47:20 UTC (rev 541)
@@ -1,12 +1,6 @@
 ----------------------------------------------------------------
-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
+2008-01-20 20:42:12.281 GMT:
+ Booting Derby version The Apache Software Foundation - Apache Derby - 10.2.2.0 - (485682): instance c013800d-0117-98ef-dce7-000001d801b8
 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/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java
===================================================================
--- trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java	2008-01-20 19:29:56 UTC (rev 540)
+++ trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java	2008-01-20 20:47:20 UTC (rev 541)
@@ -17,6 +17,7 @@
 
 import it.openutils.testing.DbUnitExecution;
 
+import org.dbunit.operation.InsertOperation;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.transaction.TransactionConfiguration;
@@ -30,7 +31,7 @@
  * @version $Id: $
  */
 @ContextConfiguration(locations = {"/spring-tests.xml" })
-@DbUnitExecution(datasets = {"/db1-load.xml" }, dataSource = "dataSource1")
+@DbUnitExecution(datasets = {"/db1-load.xml" }, dataSource = "dataSource1", insertOperation = InsertOperation.class)
 @TestExecutionListeners({TransactionalTestExecutionListener.class })
 @Transactional
 @TransactionConfiguration(transactionManager = "transactionManager1")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [540] trunk

[<fg...@us...>]

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.

[Openutils-svn] SF.net SVN: openutils: [539] tags/openutils-maven-skin-1.0/src/main/ resources

[<fg...@us...>]

Revision: 539
          http://openutils.svn.sourceforge.net/openutils/?rev=539&view=rev
Author:   fgiust
Date:     2008-01-20 11:22:22 -0800 (Sun, 20 Jan 2008)

Log Message:
-----------
minimal fixes to css

Modified Paths:
--------------
    tags/openutils-maven-skin-1.0/src/main/resources/META-INF/maven/site.vm
    tags/openutils-maven-skin-1.0/src/main/resources/css/site.css

Modified: tags/openutils-maven-skin-1.0/src/main/resources/META-INF/maven/site.vm
===================================================================
--- tags/openutils-maven-skin-1.0/src/main/resources/META-INF/maven/site.vm	2008-01-20 19:19:13 UTC (rev 538)
+++ tags/openutils-maven-skin-1.0/src/main/resources/META-INF/maven/site.vm	2008-01-20 19:22:22 UTC (rev 539)
@@ -212,7 +212,7 @@
       <div id="lastPublished">
         $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
         #if ( $versionPosition.equalsIgnoreCase( $position ) )
-          &nbsp;| $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+          <br/> $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
         #end
       </div>
     #elseif ( $datePosition.equalsIgnoreCase("left") )

Modified: tags/openutils-maven-skin-1.0/src/main/resources/css/site.css
===================================================================
--- tags/openutils-maven-skin-1.0/src/main/resources/css/site.css	2008-01-20 19:19:13 UTC (rev 538)
+++ tags/openutils-maven-skin-1.0/src/main/resources/css/site.css	2008-01-20 19:22:22 UTC (rev 539)
@@ -40,6 +40,10 @@
   text-decoration: none;
 }
 
+#leftColumn a.poweredBy {
+  border: 1px solid #000;
+}
+
 a:link {
   color: #47a;
 }
@@ -111,7 +115,7 @@
 
 #breadcrumbs a {
   font-weight: bold;
-  color: #999;
+  color: #000;
   text-decoration: underline;
 }
 
@@ -140,6 +144,11 @@
   background-color: #6bb521;
 }
 
+#navcolumn #lastPublished {
+  font-size: 10px;
+  margin: 20px 0pt 10px 15px;
+}
+
 table.bodyTable th {
   color: white;
   background-color: #1B87CA;
@@ -302,5 +311,4 @@
 
 #navcolumn li.collapsed {
   background-image: url(../images/ico-collapsed.png);
-}
-
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [538] trunk/openutils-maven-skin/src/main/resources

[<fg...@us...>]

Revision: 538
          http://openutils.svn.sourceforge.net/openutils/?rev=538&view=rev
Author:   fgiust
Date:     2008-01-20 11:19:13 -0800 (Sun, 20 Jan 2008)

Log Message:
-----------
minor improvements

Modified Paths:
--------------
    trunk/openutils-maven-skin/src/main/resources/META-INF/maven/site.vm
    trunk/openutils-maven-skin/src/main/resources/css/site.css

Modified: trunk/openutils-maven-skin/src/main/resources/META-INF/maven/site.vm
===================================================================
--- trunk/openutils-maven-skin/src/main/resources/META-INF/maven/site.vm	2008-01-20 17:20:20 UTC (rev 537)
+++ trunk/openutils-maven-skin/src/main/resources/META-INF/maven/site.vm	2008-01-20 19:19:13 UTC (rev 538)
@@ -212,7 +212,7 @@
       <div id="lastPublished">
         $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
         #if ( $versionPosition.equalsIgnoreCase( $position ) )
-          &nbsp;| $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+          <br/> $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
         #end
       </div>
     #elseif ( $datePosition.equalsIgnoreCase("left") )

Modified: trunk/openutils-maven-skin/src/main/resources/css/site.css
===================================================================
--- trunk/openutils-maven-skin/src/main/resources/css/site.css	2008-01-20 17:20:20 UTC (rev 537)
+++ trunk/openutils-maven-skin/src/main/resources/css/site.css	2008-01-20 19:19:13 UTC (rev 538)
@@ -40,6 +40,10 @@
   text-decoration: none;
 }
 
+#leftColumn a.poweredBy {
+  border: 1px solid #000;
+}
+
 a:link {
   color: #47a;
 }
@@ -111,7 +115,7 @@
 
 #breadcrumbs a {
   font-weight: bold;
-  color: #999;
+  color: #000;
   text-decoration: underline;
 }
 
@@ -140,6 +144,11 @@
   background-color: #6bb521;
 }
 
+#navcolumn #lastPublished {
+  font-size: 10px;
+  margin: 20px 0pt 10px 15px;
+}
+
 table.bodyTable th {
   color: white;
   background-color: #1B87CA;
@@ -302,5 +311,4 @@
 
 #navcolumn li.collapsed {
   background-image: url(../images/ico-collapsed.png);
-}
-
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [537] trunk

[<fg...@us...>]

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;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;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;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;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;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;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;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;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;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;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;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;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;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;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;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;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;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;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;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.

[Openutils-svn] SF.net SVN: openutils: [536] trunk/pom.xml

[<fg...@us...>]

Revision: 536
          http://openutils.svn.sourceforge.net/openutils/?rev=536&view=rev
Author:   fgiust
Date:     2008-01-20 09:02:17 -0800 (Sun, 20 Jan 2008)

Log Message:
-----------
added reports

Modified Paths:
--------------
    trunk/pom.xml

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2008-01-20 17:00:10 UTC (rev 535)
+++ trunk/pom.xml	2008-01-20 17:02:17 UTC (rev 536)
@@ -142,37 +142,35 @@
       </plugin>
     </plugins>
   </build>
-  <!--
-    <reporting>
+  <reporting>
     <plugins>
-    <plugin>
-    <artifactId>maven-project-info-reports-plugin</artifactId>
-    </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>
-    </plugin>
-    <plugin>
-    <artifactId>maven-changelog-plugin</artifactId>
-    </plugin>
-    <plugin>
-    <artifactId>maven-jxr-plugin</artifactId>
-    </plugin>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+      </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>
+      </plugin>
+      <plugin>
+        <artifactId>maven-changelog-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jxr-plugin</artifactId>
+      </plugin>
     </plugins>
-    </reporting>
-  -->
+  </reporting>
   <distributionManagement>
     <site>
       <id>sourceforge</id>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [535] tags/openutils-maven-skin-1.0/pom.xml

[<fg...@us...>]

Revision: 535
          http://openutils.svn.sourceforge.net/openutils/?rev=535&view=rev
Author:   fgiust
Date:     2008-01-20 09:00:10 -0800 (Sun, 20 Jan 2008)

Log Message:
-----------
fixed bad version

Modified Paths:
--------------
    tags/openutils-maven-skin-1.0/pom.xml

Modified: tags/openutils-maven-skin-1.0/pom.xml
===================================================================
--- tags/openutils-maven-skin-1.0/pom.xml	2008-01-20 16:57:49 UTC (rev 534)
+++ tags/openutils-maven-skin-1.0/pom.xml	2008-01-20 17:00:10 UTC (rev 535)
@@ -10,7 +10,7 @@
   </parent>
   <artifactId>openutils-maven-skin</artifactId>
   <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0</version>
   <name>maven skin for openutils site</name>
   <description>maven skin for openutils site</description>
 </project>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [534] trunk/openutils-maven-skin/pom.xml

[<fg...@us...>]

Revision: 534
          http://openutils.svn.sourceforge.net/openutils/?rev=534&view=rev
Author:   fgiust
Date:     2008-01-20 08:57:49 -0800 (Sun, 20 Jan 2008)

Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    trunk/openutils-maven-skin/pom.xml

Modified: trunk/openutils-maven-skin/pom.xml
===================================================================
--- trunk/openutils-maven-skin/pom.xml	2008-01-20 16:57:41 UTC (rev 533)
+++ trunk/openutils-maven-skin/pom.xml	2008-01-20 16:57:49 UTC (rev 534)
@@ -1,6 +1,5 @@
 <?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 ">
+<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>
@@ -10,7 +9,7 @@
   </parent>
   <artifactId>openutils-maven-skin</artifactId>
   <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.1-SNAPSHOT</version>
   <name>maven skin for openutils site</name>
   <description>maven skin for openutils site</description>
 </project>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [533] tags/openutils-maven-skin-1.0/

[<fg...@us...>]

Revision: 533
          http://openutils.svn.sourceforge.net/openutils/?rev=533&view=rev
Author:   fgiust
Date:     2008-01-20 08:57:41 -0800 (Sun, 20 Jan 2008)

Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-maven-skin-1.0

Added Paths:
-----------
    tags/openutils-maven-skin-1.0/

Copied: tags/openutils-maven-skin-1.0 (from rev 532, trunk/openutils-maven-skin)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [532] trunk/openutils-maven-skin/

[<fg...@us...>]

Revision: 532
          http://openutils.svn.sourceforge.net/openutils/?rev=532&view=rev
Author:   fgiust
Date:     2008-01-20 08:57:14 -0800 (Sun, 20 Jan 2008)

Log Message:
-----------
ignores

Property Changed:
----------------
    trunk/openutils-maven-skin/


Property changes on: trunk/openutils-maven-skin
___________________________________________________________________
Name: svn:ignore
   - .settings
.checkstyle
target
.classpath
.project

   + .settings
.checkstyle
target
.classpath
.project
pom.xml.releaseBackup
release.properties



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [531] trunk

[<fg...@us...>]

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.

[Openutils-svn] SF.net SVN: openutils: [530] trunk

[<fg...@us...>]

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;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 )
+      &gt;
+    #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 = "&nbsp;|" )
+  #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 ) )
+        &nbsp;| $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 ) )
+          &nbsp;| $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 ) )
+          &nbsp;| $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">&#169;#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;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]

[Openutils-svn] SF.net SVN: openutils: [529] trunk/openutils-testing/src/main/java/it/ openutils/testing/TestUtils.java

[<fg...@us...>]

Revision: 529
          http://openutils.svn.sourceforge.net/openutils/?rev=529&view=rev
Author:   fgiust
Date:     2008-01-20 00:58:09 -0800 (Sun, 20 Jan 2008)

Log Message:
-----------
new TestUtils class

Added Paths:
-----------
    trunk/openutils-testing/src/main/java/it/openutils/testing/TestUtils.java

Added: trunk/openutils-testing/src/main/java/it/openutils/testing/TestUtils.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/TestUtils.java	                        (rev 0)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/TestUtils.java	2008-01-20 08:58:09 UTC (rev 529)
@@ -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.testing;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+
+/**
+ * @author fgiust
+ * @version $Id: $
+ */
+public final class TestUtils
+{
+
+    private TestUtils()
+    {
+    }
+
+    /**
+     * Create a new set with all the elements.
+     * @param <T> the type of the elements. Also used to allocate the set.
+     * @param elements to put in the set.
+     * @return new allocated set.
+     */
+    public static <T> Set<T> setWith(T... elements)
+    {
+        Set<T> newSet = new HashSet<T>(elements.length);
+        for (T element : elements)
+        {
+            newSet.add(element);
+        }
+        return newSet;
+    }
+
+    /**
+     * Create a new list with all the elements.
+     * @param <T> the type of the elements. Also used to allocate the list.
+     * @param elements to put in the list.
+     * @return new allocated list.
+     */
+    public static <T> List<T> listWith(T... elements)
+    {
+        List<T> newList = new ArrayList<T>(elements.length);
+        for (T element : elements)
+        {
+            newList.add(element);
+        }
+        return newList;
+    }
+}


Property changes on: trunk/openutils-testing/src/main/java/it/openutils/testing/TestUtils.java
___________________________________________________________________
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.

[Openutils-svn] SF.net SVN: openutils: [528] trunk/openutils-bshd5/pom.xml

[<fg...@us...>]

Revision: 528
          http://openutils.svn.sourceforge.net/openutils/?rev=528&view=rev
Author:   fgiust
Date:     2008-01-14 04:01:26 -0800 (Mon, 14 Jan 2008)

Log Message:
-----------
bump version

Modified Paths:
--------------
    trunk/openutils-bshd5/pom.xml

Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml	2008-01-14 12:01:09 UTC (rev 527)
+++ trunk/openutils-bshd5/pom.xml	2008-01-14 12:01:26 UTC (rev 528)
@@ -9,7 +9,7 @@
   </parent>
   <artifactId>openutils-bshd5</artifactId>
   <name>openutils base Spring-Hibernate DAO for java 5.0</name>
-  <version>1.0.10-SNAPSHOT</version>
+  <version>2.0-SNAPSHOT</version>
   <description>openutils base Spring-Hibernate DAO for java 5.0</description>
   <dependencies>
     <dependency>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [527] trunk/openutils-spring

[<fg...@us...>]

Revision: 527
          http://openutils.svn.sourceforge.net/openutils/?rev=527&view=rev
Author:   fgiust
Date:     2008-01-14 04:01:09 -0800 (Mon, 14 Jan 2008)

Log Message:
-----------
cleanup and email service draft

Modified Paths:
--------------
    trunk/openutils-spring/pom.xml
    trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextHolder.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextListener.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSetPropertyEditor.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSinglePropertyEditor.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java
    trunk/openutils-spring/src/main/java/it/openutils/web/spring/BaseFormController.java
    trunk/openutils-spring/src/main/java/it/openutils/web/spring/EasyDoubleCustomEditor.java
    trunk/openutils-spring/src/main/java/it/openutils/web/spring/MultiController.java
    trunk/openutils-spring/src/main/java/it/openutils/web/spring/ParamNameUrlHandlerMapping.java
    trunk/openutils-spring/src/main/java/it/openutils/web/spring/SimpleController.java
    trunk/openutils-spring/src/main/java/it/openutils/web/util/MessageUtils.java

Added Paths:
-----------
    trunk/openutils-spring/src/main/java/it/openutils/spring/email/
    trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java
    trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java

Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2008-01-14 12:00:28 UTC (rev 526)
+++ trunk/openutils-spring/pom.xml	2008-01-14 12:01:09 UTC (rev 527)
@@ -9,7 +9,7 @@
   </parent>
   <artifactId>openutils-spring</artifactId>
   <name>openutils spring tools</name>
-  <version>1.0.5-SNAPSHOT</version>
+  <version>2.0-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
@@ -53,6 +53,7 @@
       <artifactId>json-lib</artifactId>
       <version>1.1</version>
       <classifier>jdk15</classifier>
+      <optional>true</optional>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
@@ -108,6 +109,23 @@
       <version>2.1_3</version>
     </dependency>
     <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.freemarker</groupId>
+      <artifactId>freemarker</artifactId>
+      <version>2.3.11</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.4</version>

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextHolder.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextHolder.java	2008-01-14 12:00:28 UTC (rev 526)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextHolder.java	2008-01-14 12:01:09 UTC (rev 527)
@@ -1,3 +1,18 @@
+/*
+ * 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.context;
 
 import org.springframework.web.context.WebApplicationContext;

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextListener.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextListener.java	2008-01-14 12:00:28 UTC (rev 526)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextListener.java	2008-01-14 12:01:09 UTC (rev 527)
@@ -1,3 +1,18 @@
+/*
+ * 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.context;
 
 import javax.servlet.ServletRequestEvent;

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSetPropertyEditor.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSetPropertyEditor.java	2008-01-14 12:00:28 UTC (rev 526)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSetPropertyEditor.java	2008-01-14 12:01:09 UTC (rev 527)
@@ -1,3 +1,18 @@
+/*
+ * 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.editors;
 
 import java.beans.PropertyEditorSupport;
@@ -128,7 +143,8 @@
                             parameters[0] = new Long(id);
                         }
 
-                        T value = (T) MethodUtils.invokeMethod(dao, "load", parameters, new Class[]{this.propertyType});
+                        T value = (T) MethodUtils
+                            .invokeMethod(dao, "load", parameters, new Class[]{this.propertyType });
                         set.add(value);
                     }
                     catch (Throwable e)

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSinglePropertyEditor.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSinglePropertyEditor.java	2008-01-14 12:00:28 UTC (rev 526)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSinglePropertyEditor.java	2008-01-14 12:01:09 UTC (rev 527)
@@ -1,3 +1,18 @@
+/*
+ * 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.editors;
 
 import java.beans.PropertyEditorSupport;

Added: trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java	                        (rev 0)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java	2008-01-14 12:01:09 UTC (rev 527)
@@ -0,0 +1,100 @@
+package it.openutils.spring.email;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMessage.RecipientType;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author fgiust
+ * @version $Id: $
+ */
+public class FileMessageStore implements MessageStore
+{
+
+    /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(FileMessageStore.class);
+
+    private String outputDirectory;
+
+    /**
+     * Sets the outputDirectory.
+     * @param outputDirectory the outputDirectory to set
+     */
+    public void setOutputDirectory(String outputDirectory)
+    {
+        this.outputDirectory = outputDirectory;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void saveMessage(MimeMessage message, String template)
+    {
+        File dir = new File(outputDirectory);
+        dir.mkdirs();
+        File file = new File(dir, template + "." + System.currentTimeMillis() + ".html");
+
+        StringBuffer buffer = new StringBuffer();
+
+        try
+        {
+            buffer.append("From: ");
+            buffer.append(StringEscapeUtils.escapeXml(ArrayUtils.toString(message.getFrom())));
+            buffer.append("\n");
+
+            if (message.getReplyTo() != null)
+            {
+                buffer.append("Reply-to: ");
+                buffer.append(StringEscapeUtils.escapeXml(ArrayUtils.toString(message.getReplyTo())));
+                buffer.append("\n");
+            }
+
+            buffer.append("To: ");
+            buffer.append(StringEscapeUtils.escapeXml(ArrayUtils.toString(message.getRecipients(RecipientType.TO))));
+            buffer.append("\n");
+
+            if (message.getRecipients(RecipientType.CC) != null)
+            {
+                buffer.append("CC: ");
+                buffer
+                    .append(StringEscapeUtils.escapeXml(ArrayUtils.toString(message.getRecipients(RecipientType.CC))));
+                buffer.append("\n");
+            }
+
+            if (message.getRecipients(RecipientType.BCC) != null)
+            {
+                buffer.append("BCC: ");
+                buffer.append(StringEscapeUtils
+                    .escapeXml(ArrayUtils.toString(message.getRecipients(RecipientType.BCC))));
+                buffer.append("\n");
+            }
+            buffer.append("\n");
+
+            buffer.append(ObjectUtils.toString(message.getContent()));
+
+            FileUtils.writeStringToFile(file, buffer.toString());
+        }
+        catch (MessagingException e)
+        {
+            log.error(e.getMessage(), e);
+        }
+        catch (IOException e)
+        {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+}


Property changes on: trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java	                        (rev 0)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java	2008-01-14 12:01:09 UTC (rev 527)
@@ -0,0 +1,14 @@
+package it.openutils.spring.email;
+
+import javax.mail.internet.MimeMessage;
+
+
+/**
+ * @author fgiust
+ * @version $Id: $
+ */
+public interface MessageStore
+{
+
+    void saveMessage(MimeMessage message, String template);
+}


Property changes on: trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java	                        (rev 0)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java	2008-01-14 12:01:09 UTC (rev 527)
@@ -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.email;
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @author fgiust
+ * @version $Id: $
+ */
+public interface TemplatedMailSender
+{
+
+    /**
+     * Compiles the freemarker template with the model data and send it to the given addresses, adding a cc to the given
+     * addresses.
+     * @param templateFile Freemarker template file name
+     * @param model Map merged into template
+     * @param from Mail that will result as sender of the compiled mail.
+     * @param to mail to list
+     * @param cc mail cc list
+     * @param replyto TODO
+     * @param async send mail asynchrounisly (if allowed in configuration)
+     * @param attachments list of attachments
+     */
+    void prepareAndSendMail(final String templateFile, final Map<String, Object> model, final String from,
+        final String[] to, final String[] cc, final String[] bcc, String replyto, boolean async, List<File> attachments);
+
+}


Property changes on: trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java	                        (rev 0)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java	2008-01-14 12:01:09 UTC (rev 527)
@@ -0,0 +1,216 @@
+/*
+ * 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.email;
+
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import javax.mail.internet.MimeMessage;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.exception.NestableRuntimeException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.InputStreamSource;
+import org.springframework.mail.MailException;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.mail.javamail.MimeMessagePreparator;
+import org.springframework.ui.freemarker.FreeMarkerTemplateUtils;
+
+
+/**
+ * @author fgiust
+ * @version $Id: $
+ */
+public class TemplatedMailSenderImpl implements TemplatedMailSender
+{
+
+    /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(TemplatedMailSenderImpl.class);
+
+    /**
+     * Spring mail sender.
+     */
+    private JavaMailSender mailSender;
+
+    private Configuration freemarkerConfiguration;
+
+    private MessageStore store;
+
+    /**
+     * Allow async delivery.
+     */
+    private boolean allowAsync;
+
+    /**
+     * Sets the mailSender.
+     * @param mailSender the mailSender to set
+     */
+    public void setMailSender(JavaMailSender mailSender)
+    {
+        this.mailSender = mailSender;
+    }
+
+    /**
+     * Sets the freemarkerConfiguration.
+     * @param freemarkerConfiguration the freemarkerConfiguration to set
+     */
+    public void setFreemarkerConfiguration(Configuration freemarkerConfiguration)
+    {
+        this.freemarkerConfiguration = freemarkerConfiguration;
+    }
+
+    /**
+     * Sets the allowAsync.
+     * @param allowAsync the allowAsync to set
+     */
+    public void setAllowAsync(boolean allowAsync)
+    {
+        this.allowAsync = allowAsync;
+    }
+
+    /**
+     * Sets the store.
+     * @param store the store to set
+     */
+    public void setStore(MessageStore store)
+    {
+        this.store = store;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void prepareAndSendMail(final String template, final Map<String, Object> model, final String from,
+        final String[] to, final String[] cc, final String[] bcc, final String replyto, boolean async,
+        final List<File> attachments)
+    {
+
+        String errorMessageTmp = "Error sending mail to " + ArrayUtils.toString(to);
+        String infoMsg = "Mail is sent to " + ArrayUtils.toString(to);
+        String infoPrepareMsg = "Preparing to send mail to " + ArrayUtils.toString(to);
+
+        StringBuffer infoBuf = new StringBuffer();
+        StringBuffer prepareBuf = new StringBuffer();
+
+        final String infoMessage = infoMsg + infoBuf.toString();
+        final String infoPrepareMessage = infoPrepareMsg + prepareBuf.toString();
+        final String errorMessage = errorMessageTmp;
+
+        if (StringUtils.isEmpty(from))
+        {
+            log.error(errorMessage + "sender not set", new Exception("Stacktrace added for debug only"));
+            return;
+        }
+
+        log.info(infoPrepareMessage);
+
+        Thread sendmailThread = new Thread()
+        {
+
+            @Override
+            public void run()
+            {
+                MimeMessagePreparator preparator = new MimeMessagePreparator()
+                {
+
+                    public void prepare(MimeMessage mimeMessage) throws Exception
+                    {
+                        MimeMessageHelper message = new MimeMessageHelper(mimeMessage, attachments != null
+                            && !attachments.isEmpty());
+                        message.setFrom(from);
+                        message.setTo(to);
+                        if (StringUtils.isNotEmpty(replyto))
+                        {
+                            message.setReplyTo(replyto);
+                        }
+                        if (cc != null && cc.length > 0)
+                        {
+                            message.setCc(cc);
+                        }
+                        if (bcc != null && bcc.length > 0)
+                        {
+                            message.setBcc(bcc);
+                        }
+                        String text;
+                        try
+                        {
+                            Template freemarkerTemplate = freemarkerConfiguration.getTemplate(template, "UTF-8");
+                            text = FreeMarkerTemplateUtils.processTemplateIntoString(freemarkerTemplate, model);
+                        }
+                        catch (IOException e)
+                        {
+                            throw new NestableRuntimeException(e);
+                        }
+                        catch (TemplateException e)
+                        {
+                            throw new NestableRuntimeException(e);
+                        }
+                        String subject = StringUtils.trim(StringUtils.substringBefore(text, "\n"));
+
+                        message.setSubject(subject);
+                        message.setText(StringUtils.substringAfter(text, "\n"), true);
+                        if (attachments != null && !attachments.isEmpty())
+                        {
+                            for (File file : attachments)
+                            {
+                                InputStreamSource attachment = new FileSystemResource(file);
+                                message.addAttachment(file.getName(), attachment);
+                            }
+                        }
+
+                        if (store != null)
+                        {
+                            store.saveMessage(mimeMessage, template);
+                        }
+                    }
+                };
+                try
+                {
+                    mailSender.send(preparator);
+                    log.info(infoMessage);
+                }
+                catch (MailException me)
+                {
+                    log.error(errorMessage, me);
+                    throw me;
+                }
+            }
+        };
+
+        if (async && allowAsync)
+        {
+            sendmailThread.start();
+        }
+        else
+        {
+            sendmailThread.run();
+        }
+
+    }
+
+}


Property changes on: trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

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-14 12:00:28 UTC (rev 526)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java	2008-01-14 12:01:09 UTC (rev 527)
@@ -1,3 +1,18 @@
+/*
+ * 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.remoting.exporters;
 
 import java.beans.BeanInfo;

Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java	2008-01-14 12:00:28 UTC (rev 526)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java	2008-01-14 12:01:09 UTC (rev 527)
@@ -1,3 +1,18 @@
+/*
+ * 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.validation.hibernate;
 
 import java.util.Enumeration;

Modified: trunk/openutils-spring/src/main/java/it/openutils/web/spring/BaseFormController.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/spring/BaseFormController.java	2008-01-14 12:00:28 UTC (rev 526)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/spring/BaseFormController.java	2008-01-14 12:01:09 UTC (rev 527)
@@ -1,3 +1,18 @@
+/*
+ * 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.web.spring;
 
 import it.openutils.web.util.MessageUtils;

Modified: trunk/openutils-spring/src/main/java/it/openutils/web/spring/EasyDoubleCustomEditor.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/spring/EasyDoubleCustomEditor.java	2008-01-14 12:00:28 UTC (rev 526)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/spring/EasyDoubleCustomEditor.java	2008-01-14 12:01:09 UTC (rev 527)
@@ -1,3 +1,18 @@
+/*
+ * 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.web.spring;
 
 import java.text.NumberFormat;

Modified: trunk/openutils-spring/src/main/java/it/openutils/web/spring/MultiController.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/spring/MultiController.java	2008-01-14 12:00:28 UTC (rev 526)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/spring/MultiController.java	2008-01-14 12:01:09 UTC (rev 527)
@@ -1,3 +1,18 @@
+/*
+ * 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.web.spring;
 
 import it.openutils.web.util.MessageUtils;

Modified: trunk/openutils-spring/src/main/java/it/openutils/web/spring/ParamNameUrlHandlerMapping.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/spring/ParamNameUrlHandlerMapping.java	2008-01-14 12:00:28 UTC (rev 526)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/spring/ParamNameUrlHandlerMapping.java	2008-01-14 12:01:09 UTC (rev 527)
@@ -1,3 +1,18 @@
+/*
+ * 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.web.spring;
 
 import java.util.HashMap;

Modified: trunk/openutils-spring/src/main/java/it/openutils/web/spring/SimpleController.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/spring/SimpleController.java	2008-01-14 12:00:28 UTC (rev 526)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/spring/SimpleController.java	2008-01-14 12:01:09 UTC (rev 527)
@@ -1,3 +1,18 @@
+/*
+ * 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.web.spring;
 
 import it.openutils.web.util.MessageUtils;
@@ -71,7 +86,7 @@
      */
     public String getText(String msgKey, Object arg)
     {
-        return getText(msgKey, new Object[]{arg});
+        return getText(msgKey, new Object[]{arg });
     }
 
     public void saveMessage(HttpServletRequest request, String message)

Modified: trunk/openutils-spring/src/main/java/it/openutils/web/util/MessageUtils.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/util/MessageUtils.java	2008-01-14 12:00:28 UTC (rev 526)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/util/MessageUtils.java	2008-01-14 12:01:09 UTC (rev 527)
@@ -1,3 +1,18 @@
+/*
+ * 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.web.util;
 
 import java.util.ArrayList;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [526] trunk/openutils-dbmigration

[<fg...@us...>]

Revision: 526
          http://openutils.svn.sourceforge.net/openutils/?rev=526&view=rev
Author:   fgiust
Date:     2008-01-14 04:00:28 -0800 (Mon, 14 Jan 2008)

Log Message:
-----------
new sqlserver update tasks and generic jdbc tasks for tables and columns

Modified Paths:
--------------
    trunk/openutils-dbmigration/pom.xml
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManager.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbVersionManager.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreationTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerGenericAlterTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerObjCreationTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerScriptBasedUnconditionalTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerSynonymCreationTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerTableCreationTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerTriggerCreationTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreateOrUpdateTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreationTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseDbTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DbTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericConditionalTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ScriptBasedUnconditionalTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/DbUpdate.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/ScriptBasedDbUpdate.java

Added Paths:
-----------
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcConditionalTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcTableCreationTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcViewCreationTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreationTask.java

Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/pom.xml	2008-01-14 12:00:28 UTC (rev 526)
@@ -9,7 +9,7 @@
   </parent>
   <artifactId>openutils-dbmigration</artifactId>
   <name>openutils db migration framework</name>
-  <version>0.7.4-SNAPSHOT</version>
+  <version>2.0-SNAPSHOT</version>
   <description />
   <dependencies>
     <dependency>
@@ -78,13 +78,20 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.0</version>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <classifier>jdk15</classifier>
+      <version>5.1</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
     </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-dbmigration/src/main/java/it/openutils/migration/DbSetupManager.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManager.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManager.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbVersionManager.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbVersionManager.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbVersionManager.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration;
 
@@ -24,7 +36,7 @@
  *   &lt;/property>
  * &lt;/bean>
  * </pre>
- * 
+ *
  * @author fgiust
  * @version $Id$
  */

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcConditionalTask.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcConditionalTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -0,0 +1,78 @@
+/*
+ * 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.migration.generic;
+
+import it.openutils.migration.task.setup.BaseDbTask;
+import it.openutils.migration.task.setup.DbTask;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+
+
+/**
+ * @author fgiust
+ * @version $Id:SqlServerObjCreationTask.java 3143 2007-09-24 19:50:49Z fgiust $
+ */
+public abstract class JdbcConditionalTask extends BaseDbTask implements DbTask
+{
+
+    private String ddl;
+
+    private boolean not;
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setDdl(String ddls)
+    {
+        this.ddl = ddls;
+    }
+
+    /**
+     * Sets the not.
+     * @param not the not to set
+     */
+    public void setNot(boolean not)
+    {
+        this.not = not;
+    }
+
+    public abstract boolean check(SimpleJdbcTemplate jdbcTemplate);
+
+    /**
+     * {@inheritDoc}
+     */
+    public void execute(DataSource dataSource)
+    {
+        SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+
+        if (check(jdbcTemplate) ^ !not)
+        {
+
+            String[] ddls = StringUtils.split(ddl, ';');
+            for (String statement : ddls)
+            {
+                if (StringUtils.isNotBlank(statement))
+                {
+                    jdbcTemplate.update(statement);
+                }
+            }
+        }
+    }
+
+}


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcConditionalTask.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -0,0 +1,61 @@
+package it.openutils.migration.generic;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.ConnectionCallback;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+
+
+/**
+ * @author fgiust
+ * @version $Id: $
+ */
+public class JdbcIfColumnExistsConditionalTask extends JdbcConditionalTask
+{
+
+    private String column;
+
+    /**
+     * Sets the column.
+     * @param column the column to set
+     */
+    public void setColumn(String column)
+    {
+        this.column = column;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean check(SimpleJdbcTemplate jdbcTemplate)
+    {
+        final String catalog = null;
+        final String schema = null;
+
+        String columnTrim = StringUtils.trim(column);
+
+        final String tableName = StringUtils.substringBefore(columnTrim, ".");
+        final String columnName = StringUtils.substringAfter(columnTrim, ".");
+        return (Boolean) jdbcTemplate.getJdbcOperations().execute(new ConnectionCallback()
+        {
+
+            public Object doInConnection(Connection con) throws SQLException, DataAccessException
+            {
+
+                DatabaseMetaData dbMetadata = con.getMetaData();
+                ResultSet rs = dbMetadata.getColumns(catalog, schema, tableName, columnName);
+                boolean tableExists = rs.first();
+                rs.close();
+
+                return !tableExists;
+            }
+        });
+    }
+
+}


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -0,0 +1,144 @@
+/*
+ * 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.migration.generic;
+
+import it.openutils.migration.task.setup.GenericScriptBasedConditionalTask;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.Resource;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.ConnectionCallback;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+
+
+/**
+ * @author fgiust
+ * @version $Id:SqlServerObjCreationTask.java 3143 2007-09-24 19:50:49Z fgiust $
+ */
+public class JdbcObjectCreationTask extends GenericScriptBasedConditionalTask
+{
+
+    /**
+     * Logger.
+     */
+    protected Logger log = LoggerFactory.getLogger(getClass());
+
+    protected String objectType = "TABLE";
+
+    protected String catalog;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void execute(DataSource dataSource)
+    {
+        SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+
+        for (Resource script : scripts)
+        {
+
+            if (script == null || !script.exists())
+            {
+                log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
+                return;
+            }
+
+            String fqTableName = this.objectNameFromFileName(script);
+            String tmptableName = null;
+            String tmpschema = null;
+
+            if (StringUtils.contains(fqTableName, "."))
+            {
+                String[] tokens = StringUtils.split(fqTableName, ".");
+                tmptableName = tokens[1];
+                tmpschema = tokens[0];
+            }
+            else
+            {
+                tmptableName = fqTableName;
+            }
+
+            final String tableName = tmptableName;
+            final String schema = tmpschema;
+
+            boolean result = (Boolean) new JdbcTemplate(dataSource).execute(new ConnectionCallback()
+            {
+
+                public Object doInConnection(Connection con) throws SQLException, DataAccessException
+                {
+
+                    DatabaseMetaData dbMetadata = con.getMetaData();
+                    ResultSet rs = dbMetadata.getTables(catalog, schema, tableName, new String[]{objectType });
+                    boolean tableExists = rs.first();
+                    rs.close();
+
+                    return tableExists;
+                }
+            });
+
+            if (!result)
+            {
+                String scriptContent;
+                InputStream is = null;
+
+                try
+                {
+                    is = script.getInputStream();
+                    scriptContent = IOUtils.toString(is, "UTF8");
+                }
+                catch (IOException e)
+                {
+                    log.error(
+                        "Unable to execute db task \"{}\", script \"{}\" can't be read.",
+                        getDescription(),
+                        script);
+                    return;
+                }
+                finally
+                {
+                    IOUtils.closeQuietly(is);
+                }
+
+                String[] ddls = StringUtils.split(scriptContent, ";");
+
+                log.info("Creating new {} {}", objectType, tableName);
+
+                for (String ddl : ddls)
+                {
+                    if (StringUtils.isNotBlank(ddl))
+                    {
+                        log.debug("Executing:\n{}", ddl);
+                        jdbcTemplate.update(ddl);
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcTableCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcTableCreationTask.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcTableCreationTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -0,0 +1,26 @@
+/*
+ * 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.migration.generic;
+
+/**
+ * @author fgiust
+ * @version $Id:SqlServerObjCreationTask.java 3143 2007-09-24 19:50:49Z fgiust $
+ */
+public class JdbcTableCreationTask extends JdbcObjectCreationTask
+{
+
+    protected String objectType = "TABLE";
+}
\ No newline at end of file


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcTableCreationTask.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcViewCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcViewCreationTask.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcViewCreationTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -0,0 +1,26 @@
+/*
+ * 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.migration.generic;
+
+/**
+ * @author fgiust
+ * @version $Id:SqlServerObjCreationTask.java 3143 2007-09-24 19:50:49Z fgiust $
+ */
+public class JdbcViewCreationTask extends JdbcObjectCreationTask
+{
+
+    protected String objectType = "VIEW";
+}
\ No newline at end of file


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcViewCreationTask.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -0,0 +1,160 @@
+/*
+ * 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.migration.sqlserver;
+
+import it.openutils.migration.task.setup.GenericScriptBasedConditionalTask;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.Resource;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+
+
+/**
+ * Compares the function script with the one stored in the db and drops and recreates it if the scripts differs. Be
+ * aware that tabs chars are ALWAYS considered different, so remove them from your scripts! This works ONLY for SQL
+ * Server 2005.
+ * @author Danilo Ghirardelli
+ * @version $Id$
+ */
+public class SqlServerFunctionCreateOrUpdateTask extends GenericScriptBasedConditionalTask
+{
+
+    /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(SqlServerObjCreationTask.class);
+
+    /**
+     * The db with the objects, may differ from the current.
+     */
+    private String sourceDb;
+
+    /**
+     * Sets the sourceDb.
+     * @param sourceDb the sourceDb to set
+     */
+    public void setSourceDb(String sourceDb)
+    {
+        this.sourceDb = sourceDb;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public void execute(DataSource dataSource)
+    {
+        String checkQuery = "select count(*) from dbo.sysobjects where id = object_id(?) and xtype in (N'FN', N'IF', N'TF')";
+
+        SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+        for (Resource script : scripts)
+        {
+            String functionName = this.objectNameFromFileName(script);
+            int result = jdbcTemplate.queryForInt(checkQuery, functionName);
+            String scriptContent = readFully(script);
+            scriptContent = StringUtils.replace(scriptContent, "\t", " ");
+            if (StringUtils.isBlank(scriptContent))
+            {
+                continue;
+            }
+            if (result == 0)
+            {
+                log.info("Function {} not existing. Creating new function", functionName);
+                createFunction(jdbcTemplate, scriptContent);
+            }
+            else
+            { // If the script is too long a list will be returned, and it must be joined to get the original script.
+                List<String> previousDDlList = jdbcTemplate.getJdbcOperations().queryForList(
+                    "exec sp_helptext ?",
+                    new Object[]{functionName },
+                    String.class);
+                String previousDDl = StringUtils.join(previousDDlList.toArray(new String[previousDDlList.size()]));
+                if (!StringUtils.equals(previousDDl, scriptContent))
+                {
+                    log.info(
+                        "Previous definition of function {} differs from actual. Dropping and recreating function",
+                        new Object[]{functionName });
+                    jdbcTemplate.update("DROP FUNCTION [" + functionName + "]");
+                    createFunction(jdbcTemplate, scriptContent);
+                }
+            }
+        }
+
+    }
+
+    /**
+     * Creates a function executing the given script.
+     * @param jdbcTemplate Jdbc connection.
+     * @param script Function script.
+     * @return
+     */
+    private void createFunction(SimpleJdbcTemplate jdbcTemplate, String script)
+    {
+        String[] ddls = StringUtils.split(script, ";");
+        for (String ddl : ddls)
+        {
+            if (StringUtils.isNotBlank(ddl))
+            {
+                log.debug("Executing:\n{}", ddl);
+                jdbcTemplate.update(ddl);
+            }
+        }
+    }
+
+    /**
+     * Reads the script from the given resource and convert it to a string suitable for update query.
+     * @param script The script file
+     * @return The script content
+     */
+    private String readFully(Resource script)
+    {
+        if (script == null || !script.exists())
+        {
+            log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
+            return null;
+        }
+        String scriptContent;
+        InputStream is = null;
+
+        try
+        {
+            is = script.getInputStream();
+            scriptContent = IOUtils.toString(is, "UTF8");
+        }
+        catch (IOException e)
+        {
+            log.error("Unable to execute db task \"{}\", script \"{}\" can't be read.", getDescription(), script);
+            return null;
+        }
+        finally
+        {
+            IOUtils.closeQuietly(is);
+        }
+        return StringUtils.stripEnd(
+            StringUtils.trim(StringUtils.replace(scriptContent, "${sourceDb}", this.sourceDb)),
+            ";");
+    }
+}
\ No newline at end of file


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreationTask.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreationTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration.sqlserver;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerGenericAlterTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerGenericAlterTask.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerGenericAlterTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration.sqlserver;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerObjCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerObjCreationTask.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerObjCreationTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration.sqlserver;
 

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -0,0 +1,159 @@
+/*
+ * 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.migration.sqlserver;
+
+import it.openutils.migration.task.setup.GenericScriptBasedConditionalTask;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.Resource;
+import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+
+
+/**
+ * Compares the procedure script with the one stored in the db and drops and recreates it if the scripts differs. Be
+ * aware that tabs chars are ALWAYS considered different, so remove them from your scripts! This works ONLY for SQL
+ * Server 2005.
+ * @author Danilo Ghirardelli
+ * @version $Id$
+ */
+public class SqlServerProcedureCreateOrUpdateTask extends GenericScriptBasedConditionalTask
+{
+
+    /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(SqlServerObjCreationTask.class);
+
+    /**
+     * The db with the objects, may differ from the current.
+     */
+    private String sourceDb;
+
+    /**
+     * Sets the sourceDb.
+     * @param sourceDb the sourceDb to set
+     */
+    public void setSourceDb(String sourceDb)
+    {
+        this.sourceDb = sourceDb;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public void execute(DataSource dataSource)
+    {
+        String checkQuery = "select count(*) from dbo.sysobjects where id = object_id(?) and (OBJECTPROPERTY(id, N'IsProcedure') = 1)";
+        SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+        for (Resource script : scripts)
+        {
+            String procedureName = this.objectNameFromFileName(script);
+            int result = jdbcTemplate.queryForInt(checkQuery, procedureName);
+            String scriptContent = readFully(script);
+            scriptContent = StringUtils.replace(scriptContent, "\t", " ");
+            if (StringUtils.isBlank(scriptContent))
+            {
+                continue;
+            }
+            if (result == 0)
+            {
+                log.info("Procedure {} not existing. Creating new procedure", procedureName);
+                createProcedure(jdbcTemplate, scriptContent);
+            }
+            else
+            { // If the script is too long a list will be returned, and it must be joined to get the original script.
+                List<String> previousDDlList = jdbcTemplate.getJdbcOperations().queryForList(
+                    "exec sp_helptext ?",
+                    new Object[]{procedureName },
+                    String.class);
+                String previousDDl = StringUtils.join(previousDDlList.toArray(new String[previousDDlList.size()]));
+                if (!StringUtils.equals(previousDDl, scriptContent))
+                {
+                    log.info(
+                        "Previous definition of procedure {} differs from actual. Dropping and recreating procedure",
+                        new Object[]{procedureName });
+                    jdbcTemplate.update("DROP PROCEDURE [" + procedureName + "]");
+                    createProcedure(jdbcTemplate, scriptContent);
+                }
+            }
+        }
+
+    }
+
+    /**
+     * Creates a stored procedure executing the given script.
+     * @param jdbcTemplate Jdbc connection.
+     * @param script Stored procedure script.
+     * @return
+     */
+    private void createProcedure(SimpleJdbcTemplate jdbcTemplate, String script)
+    {
+        String[] ddls = StringUtils.split(script, ";");
+        for (String ddl : ddls)
+        {
+            if (StringUtils.isNotBlank(ddl))
+            {
+                log.debug("Executing:\n{}", ddl);
+                jdbcTemplate.update(ddl);
+            }
+        }
+    }
+
+    /**
+     * Reads the script from the given resource and convert it to a string suitable for update query.
+     * @param script The script file
+     * @return The script content
+     */
+    private String readFully(Resource script)
+    {
+        if (script == null || !script.exists())
+        {
+            log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
+            return null;
+        }
+        String scriptContent;
+        InputStream is = null;
+
+        try
+        {
+            is = script.getInputStream();
+            scriptContent = IOUtils.toString(is, "UTF8");
+        }
+        catch (IOException e)
+        {
+            log.error("Unable to execute db task \"{}\", script \"{}\" can't be read.", getDescription(), script);
+            return null;
+        }
+        finally
+        {
+            IOUtils.closeQuietly(is);
+        }
+        return StringUtils.stripEnd(
+            StringUtils.trim(StringUtils.replace(scriptContent, "${sourceDb}", this.sourceDb)),
+            ";");
+    }
+}
\ No newline at end of file


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreationTask.java	                        (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreationTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -0,0 +1,38 @@
+/*
+ * 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.migration.sqlserver;
+
+import javax.sql.DataSource;
+
+
+/**
+ * @author Danilo Ghirardelli
+ * @version $Id:SqlServerProcedureCreationTask.java 3143 2007-09-24 19:50:49Z fgiust $
+ */
+public class SqlServerProcedureCreationTask extends SqlServerObjCreationTask
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void execute(DataSource dataSource)
+    {
+        setQualifiedObjQuery("select count(*) from dbo.sysobjects where id = object_id(?) and (OBJECTPROPERTY(id, N'IsProcedure') = 1)");
+        setUnqualifiedObjQuery("select count(*) from dbo.sysobjects where id = object_id(?) and (OBJECTPROPERTY(id, N'IsProcedure') = 1)");
+        super.execute(dataSource);
+    }
+}
\ No newline at end of file


Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreationTask.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerScriptBasedUnconditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerScriptBasedUnconditionalTask.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerScriptBasedUnconditionalTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,3 +1,18 @@
+/*
+ * 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.migration.sqlserver;
 
 import it.openutils.migration.task.setup.BaseDbTask;

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerSynonymCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerSynonymCreationTask.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerSynonymCreationTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration.sqlserver;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerTableCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerTableCreationTask.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerTableCreationTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration.sqlserver;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerTriggerCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerTriggerCreationTask.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerTriggerCreationTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration.sqlserver;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreateOrUpdateTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreateOrUpdateTask.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreateOrUpdateTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration.sqlserver;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreationTask.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreationTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration.sqlserver;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseDbTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseDbTask.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseDbTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration.task.setup;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DbTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DbTask.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DbTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration.task.setup;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration.task.setup;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericConditionalTask.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericConditionalTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration.task.setup;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration.task.setup;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ScriptBasedUnconditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ScriptBasedUnconditionalTask.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ScriptBasedUnconditionalTask.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration.task.setup;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/DbUpdate.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/DbUpdate.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/DbUpdate.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration.task.update;
 

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/ScriptBasedDbUpdate.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/ScriptBasedDbUpdate.java	2008-01-12 10:46:12 UTC (rev 525)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/ScriptBasedDbUpdate.java	2008-01-14 12:00:28 UTC (rev 526)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.migration.task.update;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [525] trunk/openutils-testing

[<fg...@us...>]

Revision: 525
          http://openutils.svn.sourceforge.net/openutils/?rev=525&view=rev
Author:   fgiust
Date:     2008-01-12 02:46:12 -0800 (Sat, 12 Jan 2008)

Log Message:
-----------
cleaning up

Modified Paths:
--------------
    trunk/openutils-testing/pom.xml
    trunk/openutils-testing/src/main/java/it/openutils/testing/DateAssert.java
    trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitConfiguration.java
    trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java
    trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java
    trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java
    trunk/openutils-testing-junit/pom.xml
    trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java
    trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/GenericsDbUnitTestCase.java
    trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/SpringTestCase.java
    trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java
    trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/DbUnitTestCase.java
    trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/GenericsDbUnitTestCase.java
    trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/SpringTestCase.java
    trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/utils/DateAssert.java
    trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java
    trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java

Added Paths:
-----------
    trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java
    trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java

Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing/pom.xml	2008-01-12 10:46:12 UTC (rev 525)
@@ -28,6 +28,17 @@
       <version>2.3</version>
     </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.dbunit</groupId>
       <artifactId>dbunit</artifactId>
       <version>2.2</version>

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DateAssert.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DateAssert.java	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DateAssert.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import java.text.DateFormat;

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitConfiguration.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitConfiguration.java	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitConfiguration.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import java.lang.annotation.Documented;

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import java.lang.annotation.Documented;
@@ -7,7 +22,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.dbunit.operation.DatabaseOperation;
 
+
 /**
  * @author fgiust
  * @version $Id: $
@@ -31,4 +48,8 @@
 
     boolean truncateAll() default true;
 
+    Class< ? extends DatabaseOperation> truncateOperation() default org.dbunit.operation.TruncateTableOperation.class;
+
+    Class< ? extends DatabaseOperation> insertOperation() default org.dbunit.operation.InsertOperation.class;
+
 }
\ No newline at end of file

Added: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java	                        (rev 0)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -0,0 +1,246 @@
+/*
+ * 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;
+
+import java.io.IOException;
+import java.net.URL;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
+import org.dbunit.DatabaseUnitException;
+import org.dbunit.database.DatabaseConnection;
+import org.dbunit.database.DatabaseSequenceFilter;
+import org.dbunit.database.IDatabaseConnection;
+import org.dbunit.dataset.DataSetException;
+import org.dbunit.dataset.FilteredDataSet;
+import org.dbunit.dataset.IDataSet;
+import org.dbunit.dataset.filter.ITableFilter;
+import org.dbunit.dataset.filter.SequenceTableFilter;
+import org.dbunit.operation.DatabaseOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContext;
+
+
+/**
+ * @author fgiust
+ * @version $Id: $
+ */
+public class DbUnitTestContext
+{
+
+    /**
+     * Logger.
+     */
+    private static Logger log = LoggerFactory.getLogger(DbUnitTestContext.class);
+
+    private Object testcase;
+
+    private ApplicationContext applicationContext;
+
+    /**
+     * Dataset cache.
+     */
+    private Map<String, IDataSet> datasetCache = new HashMap<String, IDataSet>();
+
+    /**
+     * Truncate dataset cache. This is kept as a static attribute since the creation of the dataset is very expensive
+     * and it doesn't change across tests.
+     */
+    protected static Map<String, IDataSet> truncateDataSetCache = new HashMap<String, IDataSet>();
+
+    public DbUnitTestContext(Object testcase, ApplicationContext applicationContext)
+    {
+        this.testcase = testcase;
+        this.applicationContext = applicationContext;
+    }
+
+    /**
+     * Setup the Database before running the test method.
+     * @throws Exception Any exception.
+     */
+    @SuppressWarnings("unchecked")
+    public void setUpDbUnit() throws Exception
+    {
+        DbUnitExecution singleDbUnitExecution = testcase.getClass().getAnnotation(DbUnitExecution.class);
+
+        DbUnitExecution[] executions;
+        if (singleDbUnitExecution != null)
+        {
+            executions = new DbUnitExecution[]{singleDbUnitExecution };
+        }
+        else
+        {
+            DbUnitConfiguration dbUnitConfiguration = testcase.getClass().getAnnotation(DbUnitConfiguration.class);
+            executions = dbUnitConfiguration.dbUnitExecutions();
+        }
+
+        for (DbUnitExecution dbUnitExecution : executions)
+        {
+            String[] datasets = dbUnitExecution.datasets();
+            String dataSourceName = dbUnitExecution.dataSource();
+            String schema = dbUnitExecution.schema();
+            if (StringUtils.isEmpty(schema))
+            {
+                schema = null;
+            }
+
+            IDatabaseConnection connection = new DatabaseConnection(
+                getDatasource(dataSourceName).getConnection(),
+                schema);
+
+            try
+            {
+                ITableFilter tableFilter = new RegExpTableFilter(dbUnitExecution.excludedTables());
+
+                if (dbUnitExecution.truncateAll())
+                {
+                    truncateAll(connection, tableFilter, dataSourceName, dbUnitExecution
+                        .truncateOperation()
+                        .newInstance());
+                }
+
+                DatabaseOperation dbOperation = dbUnitExecution.insertOperation().newInstance();
+                for (String datasetFile : datasets)
+                {
+                    importDataSet(createDataset(datasetFile), connection, tableFilter, dataSourceName, dbOperation);
+                }
+            }
+            finally
+            {
+                connection.close();
+            }
+        }
+    }
+
+    /**
+     * @param datasetFile
+     * @return
+     * @throws IOException
+     * @throws DataSetException
+     */
+    private IDataSet createDataset(String datasetFile) throws IOException, DataSetException
+    {
+        IDataSet dataSet = datasetCache.get(datasetFile);
+        if (dataSet == null)
+        {
+            URL datasetUrl = getClass().getResource(datasetFile);
+            if (datasetUrl == null)
+            {
+                throw new IllegalArgumentException("Dataset " + datasetFile + " not found");
+            }
+            dataSet = DbUnitUtils.loadDataset(datasetUrl);
+            datasetCache.put(datasetFile, dataSet);
+        }
+        return dataSet;
+    }
+
+    private void importDataSet(IDataSet dataSet, IDatabaseConnection connection, ITableFilter tableFilter,
+        String dataSourceName, DatabaseOperation databaseOperation) throws SQLException, DataSetException,
+        DatabaseUnitException
+    {
+
+        if (dataSet == null)
+        {
+            throw new IllegalArgumentException("dataSet is null");
+        }
+
+        IDataSet orderedDataset = new FilteredDataSet(tableFilter, dataSet);
+        if (log.isDebugEnabled())
+        {
+            log.debug("Tables: {}", ArrayUtils.toString(orderedDataset.getTableNames()));
+        }
+
+        // if a sorted dataset is available, use table sequence for sorting
+        IDataSet truncateDataSet = getTruncateDataset(dataSourceName, connection.getSchema());
+        if (truncateDataSet != null)
+        {
+            ITableFilter filter = new SequenceTableFilter(truncateDataSet.getTableNames());
+            orderedDataset = new FilteredDataSet(filter, dataSet);
+        }
+
+        if (dataSet != null)
+        {
+            databaseOperation.execute(connection, orderedDataset);
+        }
+
+    }
+
+    /**
+     * @param connection
+     * @param tableFilter
+     * @throws SQLException
+     * @throws DataSetException
+     * @throws DatabaseUnitException
+     */
+    private void truncateAll(IDatabaseConnection connection, ITableFilter tableFilter, String dataSourceName,
+        DatabaseOperation databaseOperation) throws SQLException, DataSetException, DatabaseUnitException
+    {
+        IDataSet truncateDataSet = getTruncateDataset(dataSourceName, connection.getSchema());
+        if (truncateDataSet == null)
+        {
+            log.debug("Generating sorted dataset for initial cleanup");
+            IDataSet unsortedDataSet = connection.createDataSet();
+
+            log.debug("Unfiltered truncateDataSet: {}", ArrayUtils.toString(unsortedDataSet.getTableNames()));
+
+            ITableFilter filter = new DatabaseSequenceFilter(connection, new FilteredDataSet(
+                tableFilter,
+                unsortedDataSet).getTableNames());
+            truncateDataSet = new FilteredDataSet(tableFilter, new FilteredDataSet(filter, unsortedDataSet));
+            storeTruncateDataset(dataSourceName, connection.getSchema(), truncateDataSet);
+            log.debug("Sorted dataset generated");
+        }
+
+        log.debug("Tables truncateDataSet: {}", ArrayUtils.toString(truncateDataSet.getTableNames()));
+        if (truncateDataSet != null)
+        {
+            databaseOperation.execute(connection, truncateDataSet);
+        }
+    }
+
+    private IDataSet getTruncateDataset(String datasourceName, String schema)
+    {
+        return truncateDataSetCache.get(datasourceName + "_" + StringUtils.defaultString(schema));
+    }
+
+    private IDataSet storeTruncateDataset(String datasourceName, String schema, IDataSet dataset)
+    {
+        return truncateDataSetCache.put(datasourceName + "_" + StringUtils.defaultString(schema), dataset);
+    }
+
+    @SuppressWarnings("unchecked")
+    protected DataSource getDatasource(String name)
+    {
+        if (StringUtils.isEmpty(name))
+        {
+            Map<String, DataSource> dsMap = applicationContext.getBeansOfType(DataSource.class);
+            if (dsMap == null || dsMap.size() != 1)
+            {
+                throw new RuntimeException(
+                    "Unable to find a datasource in spring applicationContext, please specify the datasource bean name "
+                        + "using the \"datasource\" attribute of @DbUnitConfiguration");
+            }
+            return dsMap.values().iterator().next();
+        }
+        return (DataSource) applicationContext.getBean(name);
+    }
+}


Property changes on: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import java.io.File;

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -1,3 +1,18 @@
+/*
+ * 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;
 
 import java.util.regex.Pattern;

Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing-junit/pom.xml	2008-01-12 10:46:12 UTC (rev 525)
@@ -97,7 +97,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.4</version>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>

Added: trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java
===================================================================
--- trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java	                        (rev 0)
+++ trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -0,0 +1,54 @@
+/*
+ * 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;
+
+import it.openutils.testing.DbUnitTestContext;
+
+import org.junit.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+
+/**
+ * @author fgiust
+ * @version $Id: $
+ */
+public class AbstractDbUnitJunitSpringContextTests extends AbstractJUnit4SpringContextTests
+{
+
+    /**
+     * Slf4j logger that can be reused in subclasses.
+     */
+    protected Logger log = LoggerFactory.getLogger(getClass());
+
+    /**
+     * DBUnit text context.
+     */
+    private DbUnitTestContext dbUnitTestContext;
+
+    /**
+     * Setup the Database before running the test method.
+     * @throws Exception Any exception.
+     */
+    @SuppressWarnings("unchecked")
+    @Before
+    protected void setUpDbUnit() throws Exception
+    {
+        dbUnitTestContext = new DbUnitTestContext(this, applicationContext);
+        dbUnitTestContext.setUpDbUnit();
+    }
+}


Property changes on: trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java
===================================================================
--- trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 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.
@@ -45,7 +45,9 @@
  * Base class for running DAO tests.
  * @author fgiust
  * @version $Revision $ ($Author $)
+ * @deprecated use {@link AbstractDbUnitJunitSpringContextTests}
  */
+@Deprecated
 public abstract class DbUnitTestCase extends SpringTestCase
 {
 

Modified: trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/GenericsDbUnitTestCase.java
===================================================================
--- trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/GenericsDbUnitTestCase.java	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/GenericsDbUnitTestCase.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 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.
@@ -28,7 +28,9 @@
  * from Spring is made available through the <code>instance</code> protected field.
  * @author fgiust
  * @version $Id$
+ * @deprecated use {@link AbstractDbUnitJunitSpringContextTests}
  */
+@Deprecated
 public class GenericsDbUnitTestCase<D> extends DbUnitTestCase
 {
 

Modified: trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/SpringTestCase.java
===================================================================
--- trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/SpringTestCase.java	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/SpringTestCase.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 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.
@@ -27,7 +27,9 @@
  * Base class for running spring-based tests.
  * @author fgiust
  * @version $Revision $ ($Author $)
+ * @deprecated {@link org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests}
  */
+@Deprecated
 public abstract class SpringTestCase extends TestCase
 {
 
@@ -56,7 +58,7 @@
         if (ctx == null)
         {
             // load Spring's BeanFactory
-            String[] paths = {DEFAULT_TEST_CONTEXT_FILE};
+            String[] paths = {DEFAULT_TEST_CONTEXT_FILE };
             ctx = new ClassPathXmlApplicationContext(paths);
         }
 

Modified: trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java
===================================================================
--- trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -1,30 +1,22 @@
+/*
+ * 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.testng;
 
-import it.openutils.testing.DbUnitConfiguration;
-import it.openutils.testing.DbUnitExecution;
-import it.openutils.testing.DbUnitUtils;
-import it.openutils.testing.RegExpTableFilter;
+import it.openutils.testing.DbUnitTestContext;
 
-import java.io.IOException;
-import java.net.URL;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
-import org.dbunit.DatabaseUnitException;
-import org.dbunit.database.DatabaseConnection;
-import org.dbunit.database.DatabaseSequenceFilter;
-import org.dbunit.database.IDatabaseConnection;
-import org.dbunit.dataset.DataSetException;
-import org.dbunit.dataset.FilteredDataSet;
-import org.dbunit.dataset.IDataSet;
-import org.dbunit.dataset.filter.ITableFilter;
-import org.dbunit.dataset.filter.SequenceTableFilter;
-import org.dbunit.operation.DatabaseOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
@@ -39,22 +31,16 @@
 {
 
     /**
-     * Logger.
+     * Slf4j logger that can be reused in subclasses.
      */
-    private Logger log = LoggerFactory.getLogger(getClass());
+    protected Logger log = LoggerFactory.getLogger(getClass());
 
     /**
-     * Dataset cache.
+     * DBUnit text context.
      */
-    private Map<String, IDataSet> datasetCache = new HashMap<String, IDataSet>();
+    private DbUnitTestContext dbUnitTestContext;
 
     /**
-     * Truncate dataset cache. This is kept as a static attribute since the creation of the dataset is very expensive
-     * and it doesn't change across tests.
-     */
-    protected static Map<String, IDataSet> truncateDataSetCache = new HashMap<String, IDataSet>();
-
-    /**
      * Setup the Database before running the test method.
      * @throws Exception Any exception.
      */
@@ -62,161 +48,8 @@
     @BeforeMethod
     protected void setUpDbUnit() throws Exception
     {
-        DbUnitExecution singleDbUnitExecution = getClass().getAnnotation(DbUnitExecution.class);
-
-        DbUnitExecution[] executions;
-        if (singleDbUnitExecution != null)
-        {
-            executions = new DbUnitExecution[]{singleDbUnitExecution };
-        }
-        else
-        {
-            DbUnitConfiguration dbUnitConfiguration = getClass().getAnnotation(DbUnitConfiguration.class);
-            executions = dbUnitConfiguration.dbUnitExecutions();
-        }
-
-        for (DbUnitExecution dbUnitExecution : executions)
-        {
-            String[] datasets = dbUnitExecution.datasets();
-            String dataSourceName = dbUnitExecution.dataSource();
-            String schema = dbUnitExecution.schema();
-            if (StringUtils.isEmpty(schema))
-            {
-                schema = null;
-            }
-
-            IDatabaseConnection connection = new DatabaseConnection(
-                getDatasource(dataSourceName).getConnection(),
-                schema);
-
-            try
-            {
-                ITableFilter tableFilter = new RegExpTableFilter(dbUnitExecution.excludedTables());
-
-                if (dbUnitExecution.truncateAll())
-                {
-                    truncateAll(connection, tableFilter, dataSourceName);
-                }
-
-                for (String datasetFile : datasets)
-                {
-                    importDataSet(createDataset(datasetFile), connection, tableFilter, dataSourceName);
-                }
-            }
-            finally
-            {
-                connection.close();
-            }
-        }
+        dbUnitTestContext = new DbUnitTestContext(this, applicationContext);
+        dbUnitTestContext.setUpDbUnit();
     }
 
-    /**
-     * @param datasetFile
-     * @return
-     * @throws IOException
-     * @throws DataSetException
-     */
-    private IDataSet createDataset(String datasetFile) throws IOException, DataSetException
-    {
-        IDataSet dataSet = datasetCache.get(datasetFile);
-        if (dataSet == null)
-        {
-            URL datasetUrl = getClass().getResource(datasetFile);
-            if (datasetUrl == null)
-            {
-                throw new IllegalArgumentException("Dataset " + datasetFile + " not found");
-            }
-            dataSet = DbUnitUtils.loadDataset(datasetUrl);
-            datasetCache.put(datasetFile, dataSet);
-        }
-        return dataSet;
-    }
-
-    private void importDataSet(IDataSet dataSet, IDatabaseConnection connection, ITableFilter tableFilter,
-        String dataSourceName) throws SQLException, DataSetException, DatabaseUnitException
-    {
-
-        if (dataSet == null)
-        {
-            throw new IllegalArgumentException("dataSet is null");
-        }
-        IDataSet orderedDataset = new FilteredDataSet(tableFilter, dataSet);
-
-        log.debug("Tables: {}", ArrayUtils.toString(orderedDataset.getTableNames()));
-
-        // if a sorted dataset is available, use table sequence for sorting
-        IDataSet truncateDataSet = getTruncateDataset(dataSourceName, connection.getSchema());
-        if (truncateDataSet != null)
-        {
-            ITableFilter filter = new SequenceTableFilter(truncateDataSet.getTableNames());
-            orderedDataset = new FilteredDataSet(filter, dataSet);
-        }
-
-        if (dataSet != null)
-        {
-            DatabaseOperation.INSERT.execute(connection, orderedDataset);
-        }
-
-    }
-
-    /**
-     * @param connection
-     * @param tableFilter
-     * @throws SQLException
-     * @throws DataSetException
-     * @throws DatabaseUnitException
-     */
-    private void truncateAll(IDatabaseConnection connection, ITableFilter tableFilter, String dataSourceName)
-        throws SQLException, DataSetException, DatabaseUnitException
-    {
-        IDataSet truncateDataSet = getTruncateDataset(dataSourceName, connection.getSchema());
-        if (truncateDataSet == null)
-        {
-            log.debug("Generating sorted dataset for initial cleanup");
-            IDataSet unsortedDataSet = connection.createDataSet();
-
-            log.debug("Unfiltered truncateDataSet: {}", ArrayUtils.toString(unsortedDataSet.getTableNames()));
-
-            ITableFilter filter = new DatabaseSequenceFilter(connection, new FilteredDataSet(
-                tableFilter,
-                unsortedDataSet).getTableNames());
-            truncateDataSet = new FilteredDataSet(tableFilter, new FilteredDataSet(filter, unsortedDataSet));
-            storeTruncateDataset(dataSourceName, connection.getSchema(), truncateDataSet);
-            log.debug("Sorted dataset generated");
-        }
-
-        log.debug("Tables truncateDataSet: {}", ArrayUtils.toString(truncateDataSet.getTableNames()));
-        if (truncateDataSet != null)
-        {
-            DatabaseOperation.DELETE_ALL.execute(connection, truncateDataSet);
-        }
-    }
-
-    private IDataSet getTruncateDataset(String datasourceName, String schema)
-    {
-        return truncateDataSetCache.get(datasourceName + "_" + StringUtils.defaultString(schema));
-    }
-
-    private IDataSet storeTruncateDataset(String datasourceName, String schema, IDataSet dataset)
-    {
-        return truncateDataSetCache.put(datasourceName + "_" + StringUtils.defaultString(schema), dataset);
-    }
-
-    @SuppressWarnings("unchecked")
-    protected DataSource getDatasource(String name)
-    {
-        if (StringUtils.isEmpty(name))
-        {
-            Map<String, DataSource> dsMap = applicationContext.getBeansOfType(DataSource.class);
-            if (dsMap == null || dsMap.size() != 1)
-            {
-                throw new RuntimeException(
-                    "Unable to find a datasource in spring applicationContext, please specify the datasource bean name "
-                        + "using the \"datasource\" attribute of @DbUnitConfiguration");
-            }
-            return dsMap.values().iterator().next();
-        }
-        return (DataSource) applicationContext.getBean(name);
-    }
-
 }

Modified: trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/DbUnitTestCase.java
===================================================================
--- trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/DbUnitTestCase.java	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/DbUnitTestCase.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 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.

Modified: trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/GenericsDbUnitTestCase.java
===================================================================
--- trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/GenericsDbUnitTestCase.java	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/GenericsDbUnitTestCase.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 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.

Modified: trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/SpringTestCase.java
===================================================================
--- trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/SpringTestCase.java	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/SpringTestCase.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 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.

Modified: trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/utils/DateAssert.java
===================================================================
--- trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/utils/DateAssert.java	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/utils/DateAssert.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -1,5 +1,17 @@
 /*
- * Copyright (c) Openmind.  All rights reserved. http://www.openmindonline.it
+ * 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.testng.utils;
 

Modified: trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java
===================================================================
--- trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -1,3 +1,18 @@
+/*
+ * 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.testng;
 
 import it.openutils.testing.DbUnitConfiguration;

Modified: trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java
===================================================================
--- trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java	2008-01-09 23:06:51 UTC (rev 524)
+++ trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java	2008-01-12 10:46:12 UTC (rev 525)
@@ -1,3 +1,18 @@
+/*
+ * 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.testng;
 
 import it.openutils.testing.DbUnitExecution;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [524] trunk/openutils-testing

[<fg...@us...>]

Revision: 524
          http://openutils.svn.sourceforge.net/openutils/?rev=524&view=rev
Author:   fgiust
Date:     2008-01-09 15:06:51 -0800 (Wed, 09 Jan 2008)

Log Message:
-----------
cleaning up and testing

Modified Paths:
--------------
    trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java
    trunk/openutils-testing-testng/pom.xml
    trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java	2008-01-09 22:33:43 UTC (rev 523)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java	2008-01-09 23:06:51 UTC (rev 524)
@@ -29,7 +29,7 @@
     @Override
     public boolean isValidName(String tableName) throws DataSetException
     {
-        return pattern == null || pattern.matcher(tableName).matches();
+        return pattern == null || !pattern.matcher(tableName).matches();
     }
 
 }

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2008-01-09 22:33:43 UTC (rev 523)
+++ trunk/openutils-testing-testng/pom.xml	2008-01-09 23:06:51 UTC (rev 524)
@@ -11,6 +11,17 @@
   <name>openutils test utils (testng)</name>
   <version>2.0-SNAPSHOT</version>
   <description>openutils test utils</description>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <forkMode>once</forkMode>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <dependencies>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java
===================================================================
--- trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java	2008-01-09 22:33:43 UTC (rev 523)
+++ trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java	2008-01-09 23:06:51 UTC (rev 524)
@@ -41,7 +41,7 @@
     /**
      * Logger.
      */
-    private Logger log = LoggerFactory.getLogger(AbstractDbUnitTestNGSpringContextTests.class);
+    private Logger log = LoggerFactory.getLogger(getClass());
 
     /**
      * Dataset cache.
@@ -79,10 +79,15 @@
         {
             String[] datasets = dbUnitExecution.datasets();
             String dataSourceName = dbUnitExecution.dataSource();
+            String schema = dbUnitExecution.schema();
+            if (StringUtils.isEmpty(schema))
+            {
+                schema = null;
+            }
 
             IDatabaseConnection connection = new DatabaseConnection(
                 getDatasource(dataSourceName).getConnection(),
-                dbUnitExecution.schema());
+                schema);
 
             try
             {
@@ -170,6 +175,8 @@
             log.debug("Generating sorted dataset for initial cleanup");
             IDataSet unsortedDataSet = connection.createDataSet();
 
+            log.debug("Unfiltered truncateDataSet: {}", ArrayUtils.toString(unsortedDataSet.getTableNames()));
+
             ITableFilter filter = new DatabaseSequenceFilter(connection, new FilteredDataSet(
                 tableFilter,
                 unsortedDataSet).getTableNames());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [523] trunk/openutils-testing

[<fg...@us...>]

Revision: 523
          http://openutils.svn.sourceforge.net/openutils/?rev=523&view=rev
Author:   fgiust
Date:     2008-01-09 14:33:43 -0800 (Wed, 09 Jan 2008)

Log Message:
-----------
support for multiple databases

Modified Paths:
--------------
    trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitConfiguration.java
    trunk/openutils-testing-testng/pom.xml
    trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java

Added Paths:
-----------
    trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java
    trunk/openutils-testing-testng/src/test/
    trunk/openutils-testing-testng/src/test/java/
    trunk/openutils-testing-testng/src/test/java/it/
    trunk/openutils-testing-testng/src/test/java/it/openutils/
    trunk/openutils-testing-testng/src/test/java/it/openutils/testing/
    trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/
    trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java
    trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java
    trunk/openutils-testing-testng/src/test/resources/
    trunk/openutils-testing-testng/src/test/resources/db1-load.xml
    trunk/openutils-testing-testng/src/test/resources/db2-load.xml
    trunk/openutils-testing-testng/src/test/resources/log4j.dtd
    trunk/openutils-testing-testng/src/test/resources/log4j.xml
    trunk/openutils-testing-testng/src/test/resources/spring-tests.xml

Property Changed:
----------------
    trunk/openutils-testing-testng/

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitConfiguration.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitConfiguration.java	2008-01-08 11:50:27 UTC (rev 522)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitConfiguration.java	2008-01-09 22:33:43 UTC (rev 523)
@@ -18,17 +18,6 @@
 @Documented
 public @interface DbUnitConfiguration {
 
-    /**
-     * The resource locations to use for loading dbunit dataset.
-     */
-    String[] datasets() default {};
+    DbUnitExecution[] dbUnitExecutions() default {};
 
-    String dataSource() default "";
-
-    String schema() default "";
-
-    String excludedTables() default "(^\\$(.*))"; // oracle recycle bin
-
-    boolean truncateAll() default true;
-
 }
\ No newline at end of file

Added: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java	                        (rev 0)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java	2008-01-09 22:33:43 UTC (rev 523)
@@ -0,0 +1,34 @@
+package it.openutils.testing;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ * @author fgiust
+ * @version $Id: $
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+@Documented
+public @interface DbUnitExecution {
+
+    /**
+     * The resource locations to use for loading dbunit dataset.
+     */
+    String[] datasets() default {};
+
+    String dataSource() default "";
+
+    String schema() default "";
+
+    String excludedTables() default "(^\\$(.*))"; // oracle recycle bin
+
+    boolean truncateAll() default true;
+
+}
\ No newline at end of file


Property changes on: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native


Property changes on: trunk/openutils-testing-testng
___________________________________________________________________
Name: svn:ignore
   - .checkstyle
target
.settings
.classpath
.project

   + .checkstyle
target
.settings
.classpath
.project
test-output
temp-testng-customsuite.xml


Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2008-01-08 11:50:27 UTC (rev 522)
+++ trunk/openutils-testing-testng/pom.xml	2008-01-09 22:33:43 UTC (rev 523)
@@ -129,6 +129,44 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.2.2.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>1.2.1</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>xerces</artifactId>
+          <groupId>xerces</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>xml-apis</artifactId>
+          <groupId>xml-apis</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>${spring.version}</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>

Modified: trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java
===================================================================
--- trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java	2008-01-08 11:50:27 UTC (rev 522)
+++ trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java	2008-01-09 22:33:43 UTC (rev 523)
@@ -1,6 +1,7 @@
 package it.openutils.testing.testng;
 
 import it.openutils.testing.DbUnitConfiguration;
+import it.openutils.testing.DbUnitExecution;
 import it.openutils.testing.DbUnitUtils;
 import it.openutils.testing.RegExpTableFilter;
 
@@ -26,7 +27,7 @@
 import org.dbunit.operation.DatabaseOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests;
+import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
 import org.testng.annotations.BeforeMethod;
 
 
@@ -34,7 +35,7 @@
  * @author fgiust
  * @version $Id: $
  */
-public class AbstractDbUnitTestNGSpringContextTests extends AbstractTransactionalTestNGSpringContextTests
+public class AbstractDbUnitTestNGSpringContextTests extends AbstractTestNGSpringContextTests
 {
 
     /**
@@ -47,7 +48,11 @@
      */
     private Map<String, IDataSet> datasetCache = new HashMap<String, IDataSet>();
 
-    protected static IDataSet truncateDataSet;
+    /**
+     * Truncate dataset cache. This is kept as a static attribute since the creation of the dataset is very expensive
+     * and it doesn't change across tests.
+     */
+    protected static Map<String, IDataSet> truncateDataSetCache = new HashMap<String, IDataSet>();
 
     /**
      * Setup the Database before running the test method.
@@ -57,26 +62,40 @@
     @BeforeMethod
     protected void setUpDbUnit() throws Exception
     {
-        final DbUnitConfiguration dbUnitConfiguration = getClass().getAnnotation(DbUnitConfiguration.class);
-        if (dbUnitConfiguration != null)
+        DbUnitExecution singleDbUnitExecution = getClass().getAnnotation(DbUnitExecution.class);
+
+        DbUnitExecution[] executions;
+        if (singleDbUnitExecution != null)
         {
-            String[] datasets = dbUnitConfiguration.datasets();
+            executions = new DbUnitExecution[]{singleDbUnitExecution };
+        }
+        else
+        {
+            DbUnitConfiguration dbUnitConfiguration = getClass().getAnnotation(DbUnitConfiguration.class);
+            executions = dbUnitConfiguration.dbUnitExecutions();
+        }
 
-            IDatabaseConnection connection = new DatabaseConnection(getDatasource(dbUnitConfiguration.dataSource())
-                .getConnection(), dbUnitConfiguration.schema());
+        for (DbUnitExecution dbUnitExecution : executions)
+        {
+            String[] datasets = dbUnitExecution.datasets();
+            String dataSourceName = dbUnitExecution.dataSource();
 
+            IDatabaseConnection connection = new DatabaseConnection(
+                getDatasource(dataSourceName).getConnection(),
+                dbUnitExecution.schema());
+
             try
             {
-                ITableFilter tableFilter = new RegExpTableFilter(dbUnitConfiguration.excludedTables());
+                ITableFilter tableFilter = new RegExpTableFilter(dbUnitExecution.excludedTables());
 
-                if (dbUnitConfiguration.truncateAll())
+                if (dbUnitExecution.truncateAll())
                 {
-                    truncateAll(connection, tableFilter);
+                    truncateAll(connection, tableFilter, dataSourceName);
                 }
 
                 for (String datasetFile : datasets)
                 {
-                    importDataSet(createDataset(datasetFile), connection, tableFilter);
+                    importDataSet(createDataset(datasetFile), connection, tableFilter, dataSourceName);
                 }
             }
             finally
@@ -108,9 +127,10 @@
         return dataSet;
     }
 
-    private void importDataSet(IDataSet dataSet, IDatabaseConnection connection, ITableFilter tableFilter)
-        throws SQLException, DataSetException, DatabaseUnitException
+    private void importDataSet(IDataSet dataSet, IDatabaseConnection connection, ITableFilter tableFilter,
+        String dataSourceName) throws SQLException, DataSetException, DatabaseUnitException
     {
+
         if (dataSet == null)
         {
             throw new IllegalArgumentException("dataSet is null");
@@ -120,6 +140,7 @@
         log.debug("Tables: {}", ArrayUtils.toString(orderedDataset.getTableNames()));
 
         // if a sorted dataset is available, use table sequence for sorting
+        IDataSet truncateDataSet = getTruncateDataset(dataSourceName, connection.getSchema());
         if (truncateDataSet != null)
         {
             ITableFilter filter = new SequenceTableFilter(truncateDataSet.getTableNames());
@@ -140,9 +161,10 @@
      * @throws DataSetException
      * @throws DatabaseUnitException
      */
-    private void truncateAll(IDatabaseConnection connection, ITableFilter tableFilter) throws SQLException,
-        DataSetException, DatabaseUnitException
+    private void truncateAll(IDatabaseConnection connection, ITableFilter tableFilter, String dataSourceName)
+        throws SQLException, DataSetException, DatabaseUnitException
     {
+        IDataSet truncateDataSet = getTruncateDataset(dataSourceName, connection.getSchema());
         if (truncateDataSet == null)
         {
             log.debug("Generating sorted dataset for initial cleanup");
@@ -152,6 +174,7 @@
                 tableFilter,
                 unsortedDataSet).getTableNames());
             truncateDataSet = new FilteredDataSet(tableFilter, new FilteredDataSet(filter, unsortedDataSet));
+            storeTruncateDataset(dataSourceName, connection.getSchema(), truncateDataSet);
             log.debug("Sorted dataset generated");
         }
 
@@ -162,6 +185,16 @@
         }
     }
 
+    private IDataSet getTruncateDataset(String datasourceName, String schema)
+    {
+        return truncateDataSetCache.get(datasourceName + "_" + StringUtils.defaultString(schema));
+    }
+
+    private IDataSet storeTruncateDataset(String datasourceName, String schema, IDataSet dataset)
+    {
+        return truncateDataSetCache.put(datasourceName + "_" + StringUtils.defaultString(schema), dataset);
+    }
+
     @SuppressWarnings("unchecked")
     protected DataSource getDatasource(String name)
     {

Added: trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java
===================================================================
--- trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java	                        (rev 0)
+++ trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java	2008-01-09 22:33:43 UTC (rev 523)
@@ -0,0 +1,27 @@
+package it.openutils.testing.testng;
+
+import it.openutils.testing.DbUnitConfiguration;
+import it.openutils.testing.DbUnitExecution;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.testng.annotations.Test;
+
+
+/**
+ * @author fgiust
+ * @version $Id: $
+ */
+@ContextConfiguration(locations = {"/spring-tests.xml" })
+@DbUnitConfiguration(dbUnitExecutions = {
+    @DbUnitExecution(datasets = {"/db1-load.xml" }, dataSource = "dataSource1"),
+    @DbUnitExecution(datasets = {"/db2-load.xml" }, dataSource = "dataSource2") })
+public class MultipleDatasourceDbUnitTest extends AbstractDbUnitTestNGSpringContextTests
+{
+
+    @Test
+    public void testLoad() throws Exception
+    {
+        // do nothing
+    }
+
+}


Property changes on: trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java
===================================================================
--- trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java	                        (rev 0)
+++ trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java	2008-01-09 22:33:43 UTC (rev 523)
@@ -0,0 +1,31 @@
+package it.openutils.testing.testng;
+
+import it.openutils.testing.DbUnitExecution;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestExecutionListeners;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
+import org.springframework.transaction.annotation.Transactional;
+import org.testng.annotations.Test;
+
+
+/**
+ * @author fgiust
+ * @version $Id: $
+ */
+@ContextConfiguration(locations = {"/spring-tests.xml" })
+@DbUnitExecution(datasets = {"/db1-load.xml" }, dataSource = "dataSource1")
+@TestExecutionListeners({TransactionalTestExecutionListener.class })
+@Transactional
+@TransactionConfiguration(transactionManager = "transactionManager1")
+public class SingleDatasourceDbUnitTest extends AbstractDbUnitTestNGSpringContextTests
+{
+
+    @Test
+    public void testLoad() throws Exception
+    {
+        // do nothing
+    }
+
+}


Property changes on: trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-testing-testng/src/test/resources/db1-load.xml
===================================================================
--- trunk/openutils-testing-testng/src/test/resources/db1-load.xml	                        (rev 0)
+++ trunk/openutils-testing-testng/src/test/resources/db1-load.xml	2008-01-09 22:33:43 UTC (rev 523)
@@ -0,0 +1,8 @@
+<dataset>
+  <table name="ONE">
+    <column>ONE</column>
+    <row>
+      <value>1</value>
+    </row>
+  </table>
+</dataset>


Property changes on: trunk/openutils-testing-testng/src/test/resources/db1-load.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-testing-testng/src/test/resources/db2-load.xml
===================================================================
--- trunk/openutils-testing-testng/src/test/resources/db2-load.xml	                        (rev 0)
+++ trunk/openutils-testing-testng/src/test/resources/db2-load.xml	2008-01-09 22:33:43 UTC (rev 523)
@@ -0,0 +1,8 @@
+<dataset>
+  <table name="ONE">
+    <column>TWO</column>
+    <row>
+      <value>2</value>
+    </row>
+  </table>
+</dataset>


Property changes on: trunk/openutils-testing-testng/src/test/resources/db2-load.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-testing-testng/src/test/resources/log4j.dtd
===================================================================
--- trunk/openutils-testing-testng/src/test/resources/log4j.dtd	                        (rev 0)
+++ trunk/openutils-testing-testng/src/test/resources/log4j.dtd	2008-01-09 22:33:43 UTC (rev 523)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- Authors: Chris Taylor, Ceki Gulcu. -->
+
+<!-- Version: 1.2 -->
+
+<!-- A configuration element consists of optional renderer
+elements,appender elements, categories and an optional root
+element. -->
+
+<!ELEMENT log4j:configuration (renderer*, appender*,(category|logger)*,root?,
+                               categoryFactory?)>
+
+<!-- The "threshold" attribute takes a level value such that all -->
+<!-- logging statements with a level equal or below this value are -->
+<!-- disabled. -->
+
+<!-- Setting the "debug" enable the printing of internal log4j logging   -->
+<!-- statements.                                                         -->
+
+<!-- By default, debug attribute is "null", meaning that we not do touch -->
+<!-- internal log4j logging settings. The "null" value for the threshold -->
+<!-- attribute can be misleading. The threshold field of a repository	 -->
+<!-- cannot be set to null. The "null" value for the threshold attribute -->
+<!-- simply means don't touch the threshold field, the threshold field   --> 
+<!-- keeps its old value.                                                -->
+     
+<!ATTLIST log4j:configuration
+  xmlns:log4j              CDATA #FIXED "http://jakarta.apache.org/log4j/" 
+  threshold                (all|debug|info|warn|error|fatal|off|null) "null"
+  debug                    (true|false|null)  "null"
+>
+
+<!-- renderer elements allow the user to customize the conversion of  -->
+<!-- message objects to String.                                       -->
+
+<!ELEMENT renderer EMPTY>
+<!ATTLIST renderer
+  renderedClass  CDATA #REQUIRED
+  renderingClass CDATA #REQUIRED
+>
+
+<!-- Appenders must have a name and a class. -->
+<!-- Appenders may contain an error handler, a layout, optional parameters -->
+<!-- and filters. They may also reference (or include) other appenders. -->
+<!ELEMENT appender (errorHandler?, param*, layout?, filter*, appender-ref*)>
+<!ATTLIST appender
+  name 		ID 	#REQUIRED
+  class 	CDATA	#REQUIRED
+>
+
+<!ELEMENT layout (param*)>
+<!ATTLIST layout
+  class		CDATA	#REQUIRED
+>
+
+<!ELEMENT filter (param*)>
+<!ATTLIST filter
+  class		CDATA	#REQUIRED
+>
+
+<!-- ErrorHandlers can be of any class. They can admit any number of -->
+<!-- parameters. -->
+
+<!ELEMENT errorHandler (param*, root-ref?, logger-ref*,  appender-ref?)> 
+<!ATTLIST errorHandler
+   class        CDATA   #REQUIRED 
+>
+
+<!ELEMENT root-ref EMPTY>
+
+<!ELEMENT logger-ref EMPTY>
+<!ATTLIST logger-ref
+  ref IDREF #REQUIRED
+>
+
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+  name		CDATA   #REQUIRED
+  value		CDATA	#REQUIRED
+>
+
+
+<!-- The priority class is org.apache.log4j.Level by default -->
+<!ELEMENT priority (param*)>
+<!ATTLIST priority
+  class   CDATA	#IMPLIED
+  value	  CDATA #REQUIRED
+>
+
+<!-- The level class is org.apache.log4j.Level by default -->
+<!ELEMENT level (param*)>
+<!ATTLIST level
+  class   CDATA	#IMPLIED
+  value	  CDATA #REQUIRED
+>
+
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named category. -->
+<!ELEMENT category (param*,(priority|level)?,appender-ref*)>
+<!ATTLIST category
+  class         CDATA   #IMPLIED
+  name		CDATA	#REQUIRED
+  additivity	(true|false) "true"  
+>
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named logger. -->
+<!ELEMENT logger (level?,appender-ref*)>
+<!ATTLIST logger
+  name		ID	#REQUIRED
+  additivity	(true|false) "true"  
+>
+
+
+<!ELEMENT categoryFactory (param*)>
+<!ATTLIST categoryFactory 
+   class        CDATA #REQUIRED>
+
+<!ELEMENT appender-ref EMPTY>
+<!ATTLIST appender-ref
+  ref IDREF #REQUIRED
+>
+
+<!-- If no priority element is specified, then the configurator MUST not -->
+<!-- touch the priority of root. -->
+<!-- The root category always exists and cannot be subclassed. -->
+<!ELEMENT root (param*, (priority|level)?, appender-ref*)>
+
+
+<!-- ==================================================================== -->
+<!--                       A logging event                                -->
+<!-- ==================================================================== -->
+<!ELEMENT log4j:eventSet (log4j:event*)>
+<!ATTLIST log4j:eventSet
+  xmlns:log4j             CDATA #FIXED "http://jakarta.apache.org/log4j/" 
+  version                (1.1|1.2) "1.2" 
+  includesLocationInfo   (true|false) "true"
+>
+
+
+
+<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?, 
+                       log4j:locationInfo?) >
+
+<!-- The timestamp format is application dependent. -->
+<!ATTLIST log4j:event
+    logger     CDATA #REQUIRED
+    level      CDATA #REQUIRED
+    thread     CDATA #REQUIRED
+    timestamp  CDATA #REQUIRED
+>
+
+<!ELEMENT log4j:message (#PCDATA)>
+<!ELEMENT log4j:NDC (#PCDATA)>
+
+<!ELEMENT log4j:throwable (#PCDATA)>
+
+<!ELEMENT log4j:locationInfo EMPTY>
+<!ATTLIST log4j:locationInfo
+  class  CDATA	#REQUIRED
+  method CDATA	#REQUIRED
+  file   CDATA	#REQUIRED
+  line   CDATA	#REQUIRED
+>


Property changes on: trunk/openutils-testing-testng/src/test/resources/log4j.dtd
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:eol-style
   + native

Added: trunk/openutils-testing-testng/src/test/resources/log4j.xml
===================================================================
--- trunk/openutils-testing-testng/src/test/resources/log4j.xml	                        (rev 0)
+++ trunk/openutils-testing-testng/src/test/resources/log4j.xml	2008-01-09 22:33:43 UTC (rev 523)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration>
+  <!-- log4j test configuration -->
+  <appender name="test-appender" class="org.apache.log4j.ConsoleAppender">
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%-5p %c.%M(%C{1}.java:%L)   %m%n" />
+    </layout>
+  </appender>
+  <category name="org">
+    <priority value="WARN" />
+  </category>
+  <category name="com">
+    <priority value="WARN" />
+  </category>
+  <category name="net">
+    <priority value="WARN" />
+  </category>
+  <category name="info">
+    <priority value="WARN" />
+  </category>
+  <category name="it">
+    <priority value="WARN" />
+  </category>
+  <root>
+    <priority value="debug" />
+    <appender-ref ref="test-appender" />
+  </root>
+</log4j:configuration>
\ No newline at end of file


Property changes on: trunk/openutils-testing-testng/src/test/resources/log4j.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/openutils-testing-testng/src/test/resources/spring-tests.xml
===================================================================
--- trunk/openutils-testing-testng/src/test/resources/spring-tests.xml	                        (rev 0)
+++ trunk/openutils-testing-testng/src/test/resources/spring-tests.xml	2008-01-09 22:33:43 UTC (rev 523)
@@ -0,0 +1,23 @@
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:util="http://www.springframework.org/schema/util"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+  <bean id="dataSource1" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+    <property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver" />
+    <property name="url" value="jdbc:derby:target/test-db1;create=true" />
+    <property name="username" value="test" />
+    <property name="password" value="test" />
+  </bean>
+  <bean id="transactionManager1" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+    <property name="dataSource" ref="dataSource1" />
+  </bean>
+  <bean id="dataSource2" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+    <property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver" />
+    <property name="url" value="jdbc:derby:target/test-db2;create=true" />
+    <property name="username" value="test" />
+    <property name="password" value="test" />
+  </bean>
+  <bean id="transactionManager2" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+    <property name="dataSource" ref="dataSource2" />
+  </bean>
+</beans>
\ No newline at end of file


Property changes on: trunk/openutils-testing-testng/src/test/resources/spring-tests.xml
___________________________________________________________________
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.

[Openutils-svn] SF.net SVN: openutils: [522] trunk/openutils-testing/src/main/java/it/ openutils/testing/DateAssert.java

[<fg...@us...>]

Revision: 522
          http://openutils.svn.sourceforge.net/openutils/?rev=522&view=rev
Author:   fgiust
Date:     2008-01-08 03:50:27 -0800 (Tue, 08 Jan 2008)

Log Message:
-----------
fixed wrong check

Modified Paths:
--------------
    trunk/openutils-testing/src/main/java/it/openutils/testing/DateAssert.java

Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DateAssert.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DateAssert.java	2008-01-08 09:40:54 UTC (rev 521)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DateAssert.java	2008-01-08 11:50:27 UTC (rev 522)
@@ -50,7 +50,7 @@
         {
             throw new AssertionError("Date is null");
         }
-        if (!date.equals(expected))
+        if (!date.getTime().equals(expected))
         {
             throw new AssertionError("Expected <" + expected + ">, actual <" + date.getTime() + ">");
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [521] trunk/openutils-testing-testng/pom.xml

[<fg...@us...>]

Revision: 521
          http://openutils.svn.sourceforge.net/openutils/?rev=521&view=rev
Author:   fgiust
Date:     2008-01-08 01:40:54 -0800 (Tue, 08 Jan 2008)

Log Message:
-----------
hibernate is now optional

Modified Paths:
--------------
    trunk/openutils-testing-testng/pom.xml

Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml	2008-01-08 09:39:00 UTC (rev 520)
+++ trunk/openutils-testing-testng/pom.xml	2008-01-08 09:40:54 UTC (rev 521)
@@ -117,6 +117,7 @@
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate</artifactId>
       <version>3.2.1.ga</version>
+      <optional>true</optional>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.