Menu
▾
▴
openutils-svn
|
From: <fg...@us...> - 2007-02-05 21:43:58
|
Revision: 212
http://svn.sourceforge.net/openutils/?rev=212&view=rev
Author: fgiust
Date: 2007-02-05 13:43:56 -0800 (Mon, 05 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-dbmigration-0.1
Added Paths:
-----------
tags/openutils-dbmigration-0.1/
tags/openutils-dbmigration-0.1/pom.xml
Removed Paths:
-------------
tags/openutils-dbmigration-0.1/pom.xml
Copied: tags/openutils-dbmigration-0.1 (from rev 208, trunk/openutils-dbmigration)
Deleted: tags/openutils-dbmigration-0.1/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2007-02-05 21:37:30 UTC (rev 208)
+++ tags/openutils-dbmigration-0.1/pom.xml 2007-02-05 21:43:56 UTC (rev 212)
@@ -1,88 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-dbmigration</artifactId>
- <name>openutils db migration framework</name>
- <version>1.0-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>poi</groupId>
- <artifactId>poi</artifactId>
- <version>2.5.1-final-20040804</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-dbmigration-0.1/pom.xml (from rev 211, trunk/openutils-dbmigration/pom.xml)
===================================================================
--- tags/openutils-dbmigration-0.1/pom.xml (rev 0)
+++ tags/openutils-dbmigration-0.1/pom.xml 2007-02-05 21:43:56 UTC (rev 212)
@@ -0,0 +1,93 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-dbmigration</artifactId>
+ <name>openutils db migration framework</name>
+ <version>0.1</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>2.5.1-final-20040804</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-dbmigration-0.1</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-05 21:48:04
|
Revision: 216
http://svn.sourceforge.net/openutils/?rev=216&view=rev
Author: fgiust
Date: 2007-02-05 13:47:59 -0800 (Mon, 05 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-spring-1.0.1
Added Paths:
-----------
tags/openutils-spring-1.0.1/
tags/openutils-spring-1.0.1/pom.xml
tags/openutils-spring-1.0.1/src/main/java/it/openutils/web/spring/BaseFormController.java
Removed Paths:
-------------
tags/openutils-spring-1.0.1/pom.xml
tags/openutils-spring-1.0.1/src/main/java/it/openutils/web/spring/BaseFormController.java
Copied: tags/openutils-spring-1.0.1 (from rev 208, trunk/openutils-spring)
Deleted: tags/openutils-spring-1.0.1/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2007-02-05 21:37:30 UTC (rev 208)
+++ tags/openutils-spring-1.0.1/pom.xml 2007-02-05 21:47:59 UTC (rev 216)
@@ -1,87 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-spring</artifactId>
- <name>openutils spring tools</name>
- <version>1.1-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>2.0.1</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl:jar</artifactId>
- </exclusion>
- <exclusion>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-spring-1.0.1/pom.xml (from rev 215, trunk/openutils-spring/pom.xml)
===================================================================
--- tags/openutils-spring-1.0.1/pom.xml (rev 0)
+++ tags/openutils-spring-1.0.1/pom.xml 2007-02-05 21:47:59 UTC (rev 216)
@@ -0,0 +1,92 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-spring</artifactId>
+ <name>openutils spring tools</name>
+ <version>1.0.1</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>2.0.1</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl:jar</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.2.1.ga</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-1.0.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-1.0.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-1.0.1</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: tags/openutils-spring-1.0.1/src/main/java/it/openutils/web/spring/BaseFormController.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/spring/BaseFormController.java 2007-02-05 21:37:30 UTC (rev 208)
+++ tags/openutils-spring-1.0.1/src/main/java/it/openutils/web/spring/BaseFormController.java 2007-02-05 21:47:59 UTC (rev 216)
@@ -1,118 +0,0 @@
-package it.openutils.web.spring;
-
-import it.openutils.web.util.MessageUtils;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang.ClassUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.propertyeditors.CustomDateEditor;
-import org.springframework.beans.propertyeditors.CustomNumberEditor;
-import org.springframework.beans.propertyeditors.StringTrimmerEditor;
-import org.springframework.web.bind.ServletRequestDataBinder;
-import org.springframework.web.servlet.mvc.SimpleFormController;
-
-
-/**
- * @author fgiust
- * @version $Revision$ ($Author$)
- */
-public class BaseFormController extends SimpleFormController
-{
-
- /**
- * Logger.
- */
- protected Log log = LogFactory.getLog(getClass());
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder)
- {
- // convert java.util.Date
- SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
- dateFormat.setLenient(false);
- binder.registerCustomEditor(Date.class, null, new CustomDateEditor(dateFormat, true));
-
- // convert Integers and Longs
- binder.registerCustomEditor(Long.class, null, new CustomNumberEditor(Long.class, true));
- binder.registerCustomEditor(Double.class, null, new EasyDoubleCustomEditor(Double.class, true));
- binder.registerCustomEditor(Integer.class, null, new CustomNumberEditor(Integer.class, true));
- binder.registerCustomEditor(Short.class, null, new CustomNumberEditor(Short.class, true));
-
- // trim empty strings
- binder.registerCustomEditor(String.class, new StringTrimmerEditor(true));
-
- }
-
- // /**
- // * Convenience method for getting a i18n key's value. Calling getMessageSourceAccessor() is used because the
- // * RequestContext variable is not set in unit tests b/c there's no DispatchServlet Request.
- // * @param msgKey
- // * @return String
- // */
- // public String getText(String msgKey)
- // {
- // String currentLocale = ThreadLocaleHolder.getLocale();
- // if (currentLocale != null)
- // {
- // return getMessageSourceAccessor().getMessage(msgKey, new Locale(currentLocale));
- // }
- //
- // return getMessageSourceAccessor().getMessage(msgKey);
- // }
-
- /**
- * Convenient method for getting a i18n key's value with a single string argument.
- * @param msgKey
- * @param arg
- * @return String
- */
- public String getText(String msgKey, Object arg)
- {
- return getText(msgKey, new Object[]{arg});
- }
-
- // /**
- // * Convenience method for getting a i18n key's value with arguments.
- // * @param msgKey
- // * @param args
- // * @return String
- // */
- // public String getText(String msgKey, Object[] args)
- // {
- // String currentLocale = ThreadLocaleHolder.getLocale();
- // if (currentLocale != null)
- // {
- // return getMessageSourceAccessor().getMessage(msgKey, args, new Locale(currentLocale));
- // }
- //
- // return getMessageSourceAccessor().getMessage(msgKey, args);
- // }
-
- public void saveMessage(HttpServletRequest request, String message)
- {
- MessageUtils.saveMessage(request, message);
- }
-
- public void saveError(HttpServletRequest request, String message)
- {
- MessageUtils.saveError(request, message);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String toString()
- {
- return ClassUtils.getShortClassName(getClass());
- }
-
-}
\ No newline at end of file
Copied: tags/openutils-spring-1.0.1/src/main/java/it/openutils/web/spring/BaseFormController.java (from rev 214, trunk/openutils-spring/src/main/java/it/openutils/web/spring/BaseFormController.java)
===================================================================
--- tags/openutils-spring-1.0.1/src/main/java/it/openutils/web/spring/BaseFormController.java (rev 0)
+++ tags/openutils-spring-1.0.1/src/main/java/it/openutils/web/spring/BaseFormController.java 2007-02-05 21:47:59 UTC (rev 216)
@@ -0,0 +1,84 @@
+package it.openutils.web.spring;
+
+import it.openutils.web.util.MessageUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.ClassUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.beans.propertyeditors.CustomNumberEditor;
+import org.springframework.beans.propertyeditors.StringTrimmerEditor;
+import org.springframework.web.bind.ServletRequestDataBinder;
+import org.springframework.web.servlet.mvc.SimpleFormController;
+
+
+/**
+ * @author fgiust
+ * @version $Revision$ ($Author$)
+ */
+public class BaseFormController extends SimpleFormController
+{
+
+ /**
+ * Logger.
+ */
+ protected Log log = LogFactory.getLog(getClass());
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder)
+ {
+ // convert java.util.Date
+ SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+ dateFormat.setLenient(false);
+ binder.registerCustomEditor(Date.class, null, new CustomDateEditor(dateFormat, true, 10));
+
+ // convert Integers and Longs
+ binder.registerCustomEditor(Long.class, null, new CustomNumberEditor(Long.class, true));
+ binder.registerCustomEditor(Double.class, null, new EasyDoubleCustomEditor(Double.class, true));
+ binder.registerCustomEditor(Integer.class, null, new CustomNumberEditor(Integer.class, true));
+ binder.registerCustomEditor(Short.class, null, new CustomNumberEditor(Short.class, true));
+
+ // trim empty strings
+ binder.registerCustomEditor(String.class, new StringTrimmerEditor(true));
+
+ }
+
+ /**
+ * Convenient method for getting a i18n key's value with a single string argument.
+ * @param msgKey
+ * @param arg
+ * @return String
+ */
+ public String getText(String msgKey, Object arg)
+ {
+ return getText(msgKey, new Object[]{arg });
+ }
+
+ public void saveMessage(HttpServletRequest request, String message)
+ {
+ MessageUtils.saveMessage(request, message);
+ }
+
+ public void saveError(HttpServletRequest request, String message)
+ {
+ MessageUtils.saveError(request, message);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ return ClassUtils.getShortClassName(getClass());
+ }
+
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-05 21:50:27
|
Revision: 220
http://svn.sourceforge.net/openutils/?rev=220&view=rev
Author: fgiust
Date: 2007-02-05 13:50:17 -0800 (Mon, 05 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-tags-spring-0.1
Added Paths:
-----------
tags/openutils-tags-spring-0.1/
tags/openutils-tags-spring-0.1/pom.xml
Removed Paths:
-------------
tags/openutils-tags-spring-0.1/pom.xml
Copied: tags/openutils-tags-spring-0.1 (from rev 208, trunk/openutils-tags-spring)
Deleted: tags/openutils-tags-spring-0.1/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml 2007-02-05 21:37:30 UTC (rev 208)
+++ tags/openutils-tags-spring-0.1/pom.xml 2007-02-05 21:50:17 UTC (rev 220)
@@ -1,80 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-tags-spring</artifactId>
- <name>openutils tags for spring MVC</name>
- <version>1.0-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>2.0.1</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-tags-spring-0.1/pom.xml (from rev 219, trunk/openutils-tags-spring/pom.xml)
===================================================================
--- tags/openutils-tags-spring-0.1/pom.xml (rev 0)
+++ tags/openutils-tags-spring-0.1/pom.xml 2007-02-05 21:50:17 UTC (rev 220)
@@ -0,0 +1,85 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-tags-spring</artifactId>
+ <name>openutils tags for spring MVC</name>
+ <version>0.1</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>2.0.1</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-tags-spring-0.1</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-05 21:54:05
|
Revision: 224
http://svn.sourceforge.net/openutils/?rev=224&view=rev
Author: fgiust
Date: 2007-02-05 13:53:59 -0800 (Mon, 05 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-web-0.1
Added Paths:
-----------
tags/openutils-web-0.1/
tags/openutils-web-0.1/pom.xml
Removed Paths:
-------------
tags/openutils-web-0.1/pom.xml
Copied: tags/openutils-web-0.1 (from rev 208, trunk/openutils-web)
Deleted: tags/openutils-web-0.1/pom.xml
===================================================================
--- trunk/openutils-web/pom.xml 2007-02-05 21:37:30 UTC (rev 208)
+++ tags/openutils-web-0.1/pom.xml 2007-02-05 21:53:59 UTC (rev 224)
@@ -1,43 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-web</artifactId>
- <name>openutils generic web utilities</name>
- <version>1.0-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-web-0.1/pom.xml (from rev 223, trunk/openutils-web/pom.xml)
===================================================================
--- tags/openutils-web-0.1/pom.xml (rev 0)
+++ tags/openutils-web-0.1/pom.xml 2007-02-05 21:53:59 UTC (rev 224)
@@ -0,0 +1,49 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-web</artifactId>
+ <name>openutils generic web utilities</name>
+ <version>0.1</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-web-0.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-web-0.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-web-0.1</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-05 23:08:09
|
Revision: 228
http://svn.sourceforge.net/openutils/?rev=228&view=rev
Author: fgiust
Date: 2007-02-05 15:08:07 -0800 (Mon, 05 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-tags-spring-0.2
Added Paths:
-----------
tags/openutils-tags-spring-0.2/
tags/openutils-tags-spring-0.2/pom.xml
tags/openutils-tags-spring-0.2/src/main/resources/META-INF/tags/ou/input.tag
Removed Paths:
-------------
tags/openutils-tags-spring-0.2/pom.xml
tags/openutils-tags-spring-0.2/src/main/resources/META-INF/tags/ou/input.tag
Copied: tags/openutils-tags-spring-0.2 (from rev 208, trunk/openutils-tags-spring)
Deleted: tags/openutils-tags-spring-0.2/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml 2007-02-05 21:37:30 UTC (rev 208)
+++ tags/openutils-tags-spring-0.2/pom.xml 2007-02-05 23:08:07 UTC (rev 228)
@@ -1,80 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-tags-spring</artifactId>
- <name>openutils tags for spring MVC</name>
- <version>1.0-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>2.0.1</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-tags-spring-0.2/pom.xml (from rev 227, trunk/openutils-tags-spring/pom.xml)
===================================================================
--- tags/openutils-tags-spring-0.2/pom.xml (rev 0)
+++ tags/openutils-tags-spring-0.2/pom.xml 2007-02-05 23:08:07 UTC (rev 228)
@@ -0,0 +1,85 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-tags-spring</artifactId>
+ <name>openutils tags for spring MVC</name>
+ <version>0.2</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>2.0.1</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-tags-spring-0.2</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: tags/openutils-tags-spring-0.2/src/main/resources/META-INF/tags/ou/input.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag 2007-02-05 21:37:30 UTC (rev 208)
+++ tags/openutils-tags-spring-0.2/src/main/resources/META-INF/tags/ou/input.tag 2007-02-05 23:08:07 UTC (rev 228)
@@ -1,136 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
-
- <jsp:directive.attribute name="path" required="true" />
- <jsp:directive.attribute name="name" required="false" />
- <jsp:directive.attribute name="maxlength" required="false" type="java.lang.Integer" />
- <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="bare" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="type" required="false" />
- <jsp:directive.attribute name="nobind" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="style" required="false" />
- <jsp:directive.attribute name="onkeypress" required="false" />
- <jsp:directive.attribute name="onkeydown" required="false" />
- <jsp:directive.attribute name="onkeyup" required="false" />
- <jsp:directive.attribute name="onchange" required="false" />
- <jsp:directive.attribute name="cssclass" required="false" />
- <jsp:directive.attribute name="key" required="false" />
- <jsp:directive.attribute name="onblur" required="false" />
- <jsp:directive.attribute name="label" required="false" type="java.lang.String" />
-
-
- <c:if test="${empty(key)}">
- <c:set var="key">${path}</c:set>
- </c:if>
- <c:if test="${empty(name)}">
- <c:set var="name">${su:substringAfter(path, ".")}</c:set>
- </c:if>
- <c:if test="${empty(maxlength)}">
- <c:set var="maxlength">30</c:set>
- </c:if>
- <c:if test="${type == 'key' and !empty(status.value)}">
- <c:set var="type">hidden</c:set>
- </c:if>
- <c:if test="${type == 'keyshow' and !empty(status.value)}">
- <c:set var="readonly" value="${true}" />
- </c:if>
- <c:set var="divclass">formelement</c:set>
-
-
- <c:choose>
- <c:when test="${empty(label)}">
- <c:set var="labelmsg"><fmt:message key="${key}" /></c:set>
- </c:when>
- <c:otherwise>
- <c:set var="labelmsg">${label}</c:set>
- </c:otherwise>
- </c:choose>
-
- <c:choose>
- <c:when test="${!nobind}">
- <spring:bind path="${path}">
- <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set>
-
- <c:choose>
- <c:when test="${type == 'hidden'}">
- <input type="hidden" name="${name}" id="${name}" value="${status.value}" />
- </c:when>
- <c:when test="${bare}">
-
- <c:choose>
- <c:when test="${maxlength le 256}">
- <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
- </c:when>
- <c:otherwise>
- <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea ${cssclass}" />
- </c:otherwise>
- </c:choose>
- </c:when>
- <c:when test="${type == 'password'}">
- <div class="${divclass}">
- <label for="${name}">${labelmsg}:</label>
-
-
- <ou:txtinput type="password" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
-
-
-
-
- <div class="clear"><!-- --></div>
- </div>
- </c:when>
- <c:otherwise>
- <div class="${divclass}">
- <label for="${name}">${labelmsg}:</label>
-
- <c:choose>
- <c:when test="${maxlength le 256}">
- <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
- </c:when>
- <c:otherwise>
- <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea ${cssclass}" />
- </c:otherwise>
- </c:choose>
-
-
- <div class="clear"><!-- --></div>
- </div>
- </c:otherwise>
- </c:choose>
- </spring:bind>
- </c:when>
- <c:otherwise>
-
- <c:choose>
- <c:when test="${type == 'hidden'}">
- <input type="hidden" name="${name}" id="${name}" value="${status.value}" />
- </c:when>
- <c:when test="${bare}">
- <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
- </c:when>
- <c:otherwise>
- <div class="${divclass}">
- <label for="${name}">${labelmsg}:</label>
-
- <c:choose>
- <c:when test="${maxlength le 256}">
- <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
- </c:when>
- <c:otherwise>
- <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea" />
- </c:otherwise>
- </c:choose>
-
-
- <div class="clear"><!-- --></div>
- </div>
- </c:otherwise>
- </c:choose>
- </c:otherwise>
- </c:choose>
-
-
-
-</jsp:root>
Copied: tags/openutils-tags-spring-0.2/src/main/resources/META-INF/tags/ou/input.tag (from rev 226, trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag)
===================================================================
--- tags/openutils-tags-spring-0.2/src/main/resources/META-INF/tags/ou/input.tag (rev 0)
+++ tags/openutils-tags-spring-0.2/src/main/resources/META-INF/tags/ou/input.tag 2007-02-05 23:08:07 UTC (rev 228)
@@ -0,0 +1,148 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
+
+ <jsp:directive.attribute name="path" required="true" />
+ <jsp:directive.attribute name="name" required="false" />
+ <jsp:directive.attribute name="maxlength" required="false" type="java.lang.Integer" />
+ <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="bare" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="type" required="false" />
+ <jsp:directive.attribute name="nobind" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="style" required="false" />
+ <jsp:directive.attribute name="onkeypress" required="false" />
+ <jsp:directive.attribute name="onkeydown" required="false" />
+ <jsp:directive.attribute name="onkeyup" required="false" />
+ <jsp:directive.attribute name="onchange" required="false" />
+ <jsp:directive.attribute name="cssclass" required="false" />
+ <jsp:directive.attribute name="key" required="false" />
+ <jsp:directive.attribute name="onblur" required="false" />
+ <jsp:directive.attribute name="label" required="false" type="java.lang.String" />
+
+
+ <c:if test="${empty(key)}">
+ <c:set var="key">${path}</c:set>
+ </c:if>
+ <c:if test="${empty(name)}">
+ <c:set var="name">${su:substringAfter(path, ".")}</c:set>
+ </c:if>
+ <c:if test="${empty(maxlength)}">
+ <c:set var="maxlength">30</c:set>
+ </c:if>
+ <c:if test="${type == 'key' and !empty(status.value)}">
+ <c:set var="type">hidden</c:set>
+ </c:if>
+ <c:if test="${type == 'keyshow' and !empty(status.value)}">
+ <c:set var="readonly" value="${true}" />
+ </c:if>
+ <c:if test="${type == 'date'}">
+ <c:set var="type">text</c:set>
+ <c:set var="datepicker" value="${true}" />
+ </c:if>
+ <c:set var="divclass">formelement</c:set>
+
+
+ <c:choose>
+ <c:when test="${empty(label)}">
+ <c:set var="labelmsg"><fmt:message key="${key}" /></c:set>
+ </c:when>
+ <c:otherwise>
+ <c:set var="labelmsg">${label}</c:set>
+ </c:otherwise>
+ </c:choose>
+
+ <c:choose>
+ <c:when test="${!nobind}">
+ <spring:bind path="${path}">
+ <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set>
+
+ <c:choose>
+ <c:when test="${type == 'hidden'}">
+ <input type="hidden" name="${name}" id="${name}" value="${status.value}" />
+ </c:when>
+ <c:when test="${bare}">
+
+ <c:choose>
+ <c:when test="${maxlength le 256}">
+ <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
+ </c:when>
+ <c:otherwise>
+ <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea ${cssclass}" />
+ </c:otherwise>
+ </c:choose>
+ </c:when>
+ <c:when test="${type == 'password'}">
+ <div class="${divclass}">
+ <label for="${name}">${labelmsg}:</label>
+
+
+ <ou:txtinput type="password" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
+
+
+
+
+ <div class="clear"><!-- --></div>
+ </div>
+ </c:when>
+ <c:otherwise>
+ <div class="${divclass}">
+ <label for="${name}">${labelmsg}:</label>
+
+ <c:choose>
+ <c:when test="${maxlength le 256}">
+ <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
+ </c:when>
+ <c:otherwise>
+ <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea ${cssclass}" />
+ </c:otherwise>
+ </c:choose>
+
+ <c:if test="${datepicker}">
+ <a href="javascript:showCal('divdata${name}','${name}')" title="seleziona" class="calbtn">
+ <span>C</span>
+ </a>
+ <div class="calendar" id="divdata${name}" style="display:none"><!-- --></div>
+ <!--[if gte IE 5.5]>
+ <iframe id='divdata${name}iframe' class='calendarIframe' src='javascript:false;' frameBorder='0' scrolling='no'
+ style="display:none;filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)"><!-- x --></iframe>
+ <![endif]-->
+ <script type="text/javascript">createCalendar('${status.value}', 'divdata${name}', '${name}')</script>
+ </c:if>
+
+ <div class="clear"><!-- --></div>
+ </div>
+ </c:otherwise>
+ </c:choose>
+ </spring:bind>
+ </c:when>
+ <c:otherwise>
+
+ <c:choose>
+ <c:when test="${type == 'hidden'}">
+ <input type="hidden" name="${name}" id="${name}" value="${status.value}" />
+ </c:when>
+ <c:when test="${bare}">
+ <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
+ </c:when>
+ <c:otherwise>
+ <div class="${divclass}">
+ <label for="${name}">${labelmsg}:</label>
+
+ <c:choose>
+ <c:when test="${maxlength le 256}">
+ <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
+ </c:when>
+ <c:otherwise>
+ <ou:txttextarea name="${name}" value="${status.value}" style="${style}" cssclass="inputtextarea" />
+ </c:otherwise>
+ </c:choose>
+
+
+ <div class="clear"><!-- --></div>
+ </div>
+ </c:otherwise>
+ </c:choose>
+ </c:otherwise>
+ </c:choose>
+</jsp:root>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-06 13:50:54
|
Revision: 233
http://svn.sourceforge.net/openutils/?rev=233&view=rev
Author: fgiust
Date: 2007-02-06 05:50:51 -0800 (Tue, 06 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-deployment-1.0.5
Added Paths:
-----------
tags/openutils-deployment-1.0.5/
tags/openutils-deployment-1.0.5/pom.xml
tags/openutils-deployment-1.0.5/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java
Removed Paths:
-------------
tags/openutils-deployment-1.0.5/pom.xml
tags/openutils-deployment-1.0.5/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java
Copied: tags/openutils-deployment-1.0.5 (from rev 208, trunk/openutils-deployment)
Deleted: tags/openutils-deployment-1.0.5/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2007-02-05 21:37:30 UTC (rev 208)
+++ tags/openutils-deployment-1.0.5/pom.xml 2007-02-06 13:50:51 UTC (rev 233)
@@ -1,60 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-deployment</artifactId>
- <name>openutils deployment tools</name>
- <version>1.0.5-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>2.0.1</version>
- <optional>true</optional>
- <exclusions>
- <!--
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- -->
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-deployment-1.0.5/pom.xml (from rev 232, trunk/openutils-deployment/pom.xml)
===================================================================
--- tags/openutils-deployment-1.0.5/pom.xml (rev 0)
+++ tags/openutils-deployment-1.0.5/pom.xml 2007-02-06 13:50:51 UTC (rev 233)
@@ -0,0 +1,60 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-deployment</artifactId>
+ <name>openutils deployment tools</name>
+ <version>1.0.5</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>2.0.1</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.5</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.5</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-1.0.5</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: tags/openutils-deployment-1.0.5/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java
===================================================================
--- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2007-02-05 21:37:30 UTC (rev 208)
+++ tags/openutils-deployment-1.0.5/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2007-02-06 13:50:51 UTC (rev 233)
@@ -1,214 +0,0 @@
-package it.openutils.deployment.spring;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.UnknownHostException;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.UrlResource;
-import org.springframework.util.ResourceUtils;
-import org.springframework.web.context.ServletContextAware;
-
-
-/**
- * @author fgiust
- * @version $Id: $
- */
-public class EnvironmentPropertyConfigurer extends PropertyPlaceholderConfigurer implements ServletContextAware
-{
-
- /**
- * Application name (webapp name) variable.
- */
- private static final String PROPERTY_APPL = "${appl}";
-
- /**
- * Environment (server name) variable.
- */
- private static final String PROPERTY_ENV = "${env}";
-
- /**
- * Logger.
- */
- private static Logger log = LoggerFactory.getLogger(EnvironmentPropertyConfigurer.class);
-
- /**
- * @deprecated use defaultLocation
- */
- @Deprecated
- private String defaultEnvironment;
-
- private ServletContext servletContext;
-
- private String fileLocation;
-
- /**
- * {@inheritDoc}
- */
- public void setServletContext(ServletContext servletContext)
- {
- this.servletContext = servletContext;
- }
-
- /**
- * Setter for <code>fileLocation</code>.
- * @param fileLocation The fileLocation to set.
- */
- public void setFileLocation(String fileLocation)
- {
- this.fileLocation = fileLocation;
- }
-
- /**
- * Setter for <code>defaultEnvironment</code>.
- * @param defaultEnvironment The defaultEnvironment to set.
- * @deprecated use defaultLocation
- */
- @Deprecated
- public void setDefaultEnvironment(String defaultEnvironment)
- {
- this.defaultEnvironment = defaultEnvironment;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
- {
- if (fileLocation != null)
- {
-
- String hostname = null;
- try
- {
- hostname = StringUtils.substringBefore(
- StringUtils.lowerCase(InetAddress.getLocalHost().getHostName()),
- ".");
- }
- catch (UnknownHostException e)
- {
- log.error(e.getMessage()); // should not happen
- }
-
- if (hostname != null)
- {
- System.setProperty("env", hostname);
- }
-
- String applName = getApplicationName();
- if (applName != null)
- {
- System.setProperty("appl", applName);
- }
-
- URL propertyUrl = null;
-
- String replacedLocations = StringUtils.replace(fileLocation, PROPERTY_ENV, hostname);
- replacedLocations = StringUtils.replace(replacedLocations, PROPERTY_APPL, applName);
-
- String[] locations = StringUtils.split(replacedLocations, ",");
-
- for (String loc : locations)
- {
- propertyUrl = getResource(StringUtils.strip(loc));
- if (propertyUrl != null)
- {
- break;
- }
- log.debug("Property file not found at {}", loc);
- }
-
- if (propertyUrl == null && defaultEnvironment != null)
- {
- log.warn("Usage of \"defaultEnvironment\" is deprecated, please specify the fallback location "
- + "as the last comma separated value in \"fileLocation\"");
- propertyUrl = getResource(StringUtils.replace(fileLocation, PROPERTY_ENV, this.defaultEnvironment));
-
- }
-
- if (propertyUrl == null)
- {
- log.error("No properties found at {}", replacedLocations);
- }
- else
- {
- Resource resource = new UrlResource(propertyUrl);
- super.setLocation(resource);
- }
- }
-
- super.postProcessBeanFactory(beanFactory);
- }
-
- private URL getResource(String resource)
- {
- URL url = null;
-
- if (servletContext != null)
- {
- try
- {
- url = servletContext.getResource(resource);
-
- if (url != null)
- {
- // check needed for servletUnit
- // we need to check for a connection because getResource always returns a URL, also if the resource
- // doesn't exists
- url.openConnection().connect();
- }
-
- }
- catch (MalformedURLException e)
- {
- log.error(e.getMessage(), e);
- }
- catch (IOException e)
- {
- // ignore, URL is not a valid resource
- url = null;
- }
- }
- else
- {
- try
- {
- url = ResourceUtils.getURL(resource);
- }
- catch (FileNotFoundException e)
- {
- // ignore, can be normal
- }
- }
- return url;
- }
-
- private String getApplicationName()
- {
- if (servletContext != null)
- {
- String url = servletContext.getRealPath("/");
- url = StringUtils.replace(url, "\\", "/");
- if (url.endsWith("/"))
- {
- url = StringUtils.substringBeforeLast(url, "/");
- }
-
- return StringUtils.substringAfterLast(url, "/");
- }
- return null;
- }
-
-}
Copied: tags/openutils-deployment-1.0.5/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java (from rev 230, trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java)
===================================================================
--- tags/openutils-deployment-1.0.5/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java (rev 0)
+++ tags/openutils-deployment-1.0.5/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2007-02-06 13:50:51 UTC (rev 233)
@@ -0,0 +1,221 @@
+package it.openutils.deployment.spring;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.UnknownHostException;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+import org.springframework.util.ResourceUtils;
+import org.springframework.web.context.ServletContextAware;
+
+
+/**
+ * @author fgiust
+ * @version $Id: $
+ */
+public class EnvironmentPropertyConfigurer extends PropertyPlaceholderConfigurer implements ServletContextAware
+{
+
+ /**
+ * Application name (webapp name) variable.
+ */
+ private static final String PROPERTY_APPL = "${appl}";
+
+ /**
+ * Environment (server name) variable.
+ */
+ private static final String PROPERTY_ENV = "${env}";
+
+ /**
+ * Logger.
+ */
+ private static Logger log = LoggerFactory.getLogger(EnvironmentPropertyConfigurer.class);
+
+ /**
+ * @deprecated use defaultLocation
+ */
+ @Deprecated
+ private String defaultEnvironment;
+
+ private ServletContext servletContext;
+
+ private String fileLocation;
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setServletContext(ServletContext servletContext)
+ {
+ this.servletContext = servletContext;
+ }
+
+ /**
+ * Setter for <code>fileLocation</code>.
+ * @param fileLocation The fileLocation to set.
+ */
+ public void setFileLocation(String fileLocation)
+ {
+ this.fileLocation = fileLocation;
+ }
+
+ /**
+ * Setter for <code>defaultEnvironment</code>.
+ * @param defaultEnvironment The defaultEnvironment to set.
+ * @deprecated use defaultLocation
+ */
+ @Deprecated
+ public void setDefaultEnvironment(String defaultEnvironment)
+ {
+ this.defaultEnvironment = defaultEnvironment;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
+ {
+ if (fileLocation != null)
+ {
+
+ String hostname = null;
+ try
+ {
+ hostname = StringUtils.substringBefore(
+ StringUtils.lowerCase(InetAddress.getLocalHost().getHostName()),
+ ".");
+ }
+ catch (UnknownHostException e)
+ {
+ log.error(e.getMessage()); // should not happen
+ }
+
+ if (hostname != null)
+ {
+ System.setProperty("env", hostname);
+ }
+
+ String applName = getApplicationName();
+ if (applName != null)
+ {
+ System.setProperty("appl", applName);
+ }
+
+ URL propertyUrl = null;
+
+ String replacedLocations = StringUtils.replace(fileLocation, PROPERTY_ENV, hostname);
+ replacedLocations = StringUtils.replace(replacedLocations, PROPERTY_APPL, applName);
+
+ String[] locations = StringUtils.split(replacedLocations, ",");
+
+ for (String loc : locations)
+ {
+ propertyUrl = getResource(StringUtils.strip(loc));
+ if (propertyUrl != null)
+ {
+ break;
+ }
+ log.debug("Property file not found at {}", loc);
+ }
+
+ if (propertyUrl == null && defaultEnvironment != null)
+ {
+ log.warn("Usage of \"defaultEnvironment\" is deprecated, please specify the fallback location "
+ + "as the last comma separated value in \"fileLocation\"");
+ propertyUrl = getResource(StringUtils.replace(fileLocation, PROPERTY_ENV, this.defaultEnvironment));
+
+ }
+
+ if (propertyUrl == null)
+ {
+ log.error("No properties found at {}", replacedLocations);
+ }
+ else
+ {
+ Resource resource = new UrlResource(propertyUrl);
+ super.setLocation(resource);
+ }
+ }
+
+ super.postProcessBeanFactory(beanFactory);
+ }
+
+ private URL getResource(String resource)
+ {
+ URL url = null;
+
+ if (servletContext != null)
+ {
+ try
+ {
+ if (resource != null && !resource.startsWith("/"))
+ {
+ url = servletContext.getResource("/" + resource);
+ }
+ else
+ {
+ url = servletContext.getResource(resource);
+ }
+
+ if (url != null)
+ {
+ // check needed for servletUnit
+ // we need to check for a connection because getResource always returns a URL, also if the resource
+ // doesn't exists
+ url.openConnection().connect();
+ }
+
+ }
+ catch (MalformedURLException e)
+ {
+ log.error(e.getMessage(), e);
+ }
+ catch (IOException e)
+ {
+ // ignore, URL is not a valid resource
+ url = null;
+ }
+ }
+ else
+ {
+ try
+ {
+ url = ResourceUtils.getURL(resource);
+ }
+ catch (FileNotFoundException e)
+ {
+ // ignore, can be normal
+ }
+ }
+ return url;
+ }
+
+ private String getApplicationName()
+ {
+ if (servletContext != null)
+ {
+ String url = servletContext.getRealPath("/");
+ url = StringUtils.replace(url, "\\", "/");
+ if (url.endsWith("/"))
+ {
+ url = StringUtils.substringBeforeLast(url, "/");
+ }
+
+ return StringUtils.substringAfterLast(url, "/");
+ }
+ return null;
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-06 14:34:02
|
Revision: 237
http://svn.sourceforge.net/openutils/?rev=237&view=rev
Author: fgiust
Date: 2007-02-06 06:33:59 -0800 (Tue, 06 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-deployment-1.0.6
Added Paths:
-----------
tags/openutils-deployment-1.0.6/
tags/openutils-deployment-1.0.6/pom.xml
tags/openutils-deployment-1.0.6/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java
Removed Paths:
-------------
tags/openutils-deployment-1.0.6/pom.xml
tags/openutils-deployment-1.0.6/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java
Copied: tags/openutils-deployment-1.0.6 (from rev 208, trunk/openutils-deployment)
Deleted: tags/openutils-deployment-1.0.6/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2007-02-05 21:37:30 UTC (rev 208)
+++ tags/openutils-deployment-1.0.6/pom.xml 2007-02-06 14:33:59 UTC (rev 237)
@@ -1,60 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-deployment</artifactId>
- <name>openutils deployment tools</name>
- <version>1.0.5-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>2.0.1</version>
- <optional>true</optional>
- <exclusions>
- <!--
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- -->
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-deployment-1.0.6/pom.xml (from rev 236, trunk/openutils-deployment/pom.xml)
===================================================================
--- tags/openutils-deployment-1.0.6/pom.xml (rev 0)
+++ tags/openutils-deployment-1.0.6/pom.xml 2007-02-06 14:33:59 UTC (rev 237)
@@ -0,0 +1,60 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-deployment</artifactId>
+ <name>openutils deployment tools</name>
+ <version>1.0.6</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>2.0.1</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.6</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.6</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-1.0.6</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: tags/openutils-deployment-1.0.6/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java
===================================================================
--- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2007-02-05 21:37:30 UTC (rev 208)
+++ tags/openutils-deployment-1.0.6/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2007-02-06 14:33:59 UTC (rev 237)
@@ -1,214 +0,0 @@
-package it.openutils.deployment.spring;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.UnknownHostException;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.UrlResource;
-import org.springframework.util.ResourceUtils;
-import org.springframework.web.context.ServletContextAware;
-
-
-/**
- * @author fgiust
- * @version $Id: $
- */
-public class EnvironmentPropertyConfigurer extends PropertyPlaceholderConfigurer implements ServletContextAware
-{
-
- /**
- * Application name (webapp name) variable.
- */
- private static final String PROPERTY_APPL = "${appl}";
-
- /**
- * Environment (server name) variable.
- */
- private static final String PROPERTY_ENV = "${env}";
-
- /**
- * Logger.
- */
- private static Logger log = LoggerFactory.getLogger(EnvironmentPropertyConfigurer.class);
-
- /**
- * @deprecated use defaultLocation
- */
- @Deprecated
- private String defaultEnvironment;
-
- private ServletContext servletContext;
-
- private String fileLocation;
-
- /**
- * {@inheritDoc}
- */
- public void setServletContext(ServletContext servletContext)
- {
- this.servletContext = servletContext;
- }
-
- /**
- * Setter for <code>fileLocation</code>.
- * @param fileLocation The fileLocation to set.
- */
- public void setFileLocation(String fileLocation)
- {
- this.fileLocation = fileLocation;
- }
-
- /**
- * Setter for <code>defaultEnvironment</code>.
- * @param defaultEnvironment The defaultEnvironment to set.
- * @deprecated use defaultLocation
- */
- @Deprecated
- public void setDefaultEnvironment(String defaultEnvironment)
- {
- this.defaultEnvironment = defaultEnvironment;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
- {
- if (fileLocation != null)
- {
-
- String hostname = null;
- try
- {
- hostname = StringUtils.substringBefore(
- StringUtils.lowerCase(InetAddress.getLocalHost().getHostName()),
- ".");
- }
- catch (UnknownHostException e)
- {
- log.error(e.getMessage()); // should not happen
- }
-
- if (hostname != null)
- {
- System.setProperty("env", hostname);
- }
-
- String applName = getApplicationName();
- if (applName != null)
- {
- System.setProperty("appl", applName);
- }
-
- URL propertyUrl = null;
-
- String replacedLocations = StringUtils.replace(fileLocation, PROPERTY_ENV, hostname);
- replacedLocations = StringUtils.replace(replacedLocations, PROPERTY_APPL, applName);
-
- String[] locations = StringUtils.split(replacedLocations, ",");
-
- for (String loc : locations)
- {
- propertyUrl = getResource(StringUtils.strip(loc));
- if (propertyUrl != null)
- {
- break;
- }
- log.debug("Property file not found at {}", loc);
- }
-
- if (propertyUrl == null && defaultEnvironment != null)
- {
- log.warn("Usage of \"defaultEnvironment\" is deprecated, please specify the fallback location "
- + "as the last comma separated value in \"fileLocation\"");
- propertyUrl = getResource(StringUtils.replace(fileLocation, PROPERTY_ENV, this.defaultEnvironment));
-
- }
-
- if (propertyUrl == null)
- {
- log.error("No properties found at {}", replacedLocations);
- }
- else
- {
- Resource resource = new UrlResource(propertyUrl);
- super.setLocation(resource);
- }
- }
-
- super.postProcessBeanFactory(beanFactory);
- }
-
- private URL getResource(String resource)
- {
- URL url = null;
-
- if (servletContext != null)
- {
- try
- {
- url = servletContext.getResource(resource);
-
- if (url != null)
- {
- // check needed for servletUnit
- // we need to check for a connection because getResource always returns a URL, also if the resource
- // doesn't exists
- url.openConnection().connect();
- }
-
- }
- catch (MalformedURLException e)
- {
- log.error(e.getMessage(), e);
- }
- catch (IOException e)
- {
- // ignore, URL is not a valid resource
- url = null;
- }
- }
- else
- {
- try
- {
- url = ResourceUtils.getURL(resource);
- }
- catch (FileNotFoundException e)
- {
- // ignore, can be normal
- }
- }
- return url;
- }
-
- private String getApplicationName()
- {
- if (servletContext != null)
- {
- String url = servletContext.getRealPath("/");
- url = StringUtils.replace(url, "\\", "/");
- if (url.endsWith("/"))
- {
- url = StringUtils.substringBeforeLast(url, "/");
- }
-
- return StringUtils.substringAfterLast(url, "/");
- }
- return null;
- }
-
-}
Copied: tags/openutils-deployment-1.0.6/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java (from rev 235, trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java)
===================================================================
--- tags/openutils-deployment-1.0.6/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java (rev 0)
+++ tags/openutils-deployment-1.0.6/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2007-02-06 14:33:59 UTC (rev 237)
@@ -0,0 +1,223 @@
+package it.openutils.deployment.spring;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.UnknownHostException;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+import org.springframework.util.ResourceUtils;
+import org.springframework.web.context.ServletContextAware;
+
+
+/**
+ * @author fgiust
+ * @version $Id: $
+ */
+public class EnvironmentPropertyConfigurer extends PropertyPlaceholderConfigurer implements ServletContextAware
+{
+
+ /**
+ * Application name (webapp name) variable.
+ */
+ private static final String PROPERTY_APPL = "${appl}";
+
+ /**
+ * Environment (server name) variable.
+ */
+ private static final String PROPERTY_ENV = "${env}";
+
+ /**
+ * Logger.
+ */
+ private static Logger log = LoggerFactory.getLogger(EnvironmentPropertyConfigurer.class);
+
+ /**
+ * @deprecated use defaultLocation
+ */
+ @Deprecated
+ private String defaultEnvironment;
+
+ private ServletContext servletContext;
+
+ private String fileLocation;
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setServletContext(ServletContext servletContext)
+ {
+ this.servletContext = servletContext;
+ }
+
+ /**
+ * Setter for <code>fileLocation</code>.
+ * @param fileLocation The fileLocation to set.
+ */
+ public void setFileLocation(String fileLocation)
+ {
+ this.fileLocation = fileLocation;
+ }
+
+ /**
+ * Setter for <code>defaultEnvironment</code>.
+ * @param defaultEnvironment The defaultEnvironment to set.
+ * @deprecated use defaultLocation
+ */
+ @Deprecated
+ public void setDefaultEnvironment(String defaultEnvironment)
+ {
+ this.defaultEnvironment = defaultEnvironment;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
+ {
+ if (fileLocation != null)
+ {
+
+ String hostname = null;
+ try
+ {
+ hostname = StringUtils.substringBefore(
+ StringUtils.lowerCase(InetAddress.getLocalHost().getHostName()),
+ ".");
+ }
+ catch (UnknownHostException e)
+ {
+ log.error(e.getMessage()); // should not happen
+ }
+
+ if (hostname != null)
+ {
+ System.setProperty("env", hostname);
+ }
+
+ String applName = getApplicationName();
+ if (applName != null)
+ {
+ System.setProperty("appl", applName);
+ }
+
+ URL propertyUrl = null;
+
+ String replacedLocations = StringUtils.replace(fileLocation, PROPERTY_ENV, hostname);
+ replacedLocations = StringUtils.replace(replacedLocations, PROPERTY_APPL, applName);
+
+ String[] locations = StringUtils.split(replacedLocations, ",");
+
+ for (String loc : locations)
+ {
+ propertyUrl = getResource(StringUtils.strip(loc));
+ if (propertyUrl != null)
+ {
+ break;
+ }
+ log.debug("Property file not found at {}", loc);
+ }
+
+ if (propertyUrl == null && defaultEnvironment != null)
+ {
+ log.warn("Usage of \"defaultEnvironment\" is deprecated, please specify the fallback location "
+ + "as the last comma separated value in \"fileLocation\"");
+ propertyUrl = getResource(StringUtils.replace(fileLocation, PROPERTY_ENV, this.defaultEnvironment));
+
+ }
+
+ if (propertyUrl == null)
+ {
+ log.error("No properties found at {}", replacedLocations);
+ }
+ else
+ {
+ Resource resource = new UrlResource(propertyUrl);
+ super.setLocation(resource);
+ }
+ }
+
+ super.postProcessBeanFactory(beanFactory);
+ }
+
+ private URL getResource(String resource)
+ {
+ URL url = null;
+
+ if (servletContext != null)
+ {
+ try
+ {
+ if (resource != null && !resource.startsWith("/"))
+ {
+ url = servletContext.getResource("/" + resource);
+ }
+ else
+ {
+ url = servletContext.getResource(resource);
+ }
+
+ if (url != null)
+ {
+ // check needed for servletUnit
+ // we need to check for a connection because getResource always returns a URL, also if the resource
+ // doesn't exists
+ url.openConnection().connect();
+ }
+
+ }
+ catch (MalformedURLException e)
+ {
+ log.error(e.getMessage(), e);
+ }
+ catch (IOException e)
+ {
+ // ignore, URL is not a valid resource
+ url = null;
+ }
+ }
+ else
+ {
+ try
+ {
+ url = ResourceUtils.getURL(resource);
+ url.openStream().close(); // test if the resource actually exists
+ }
+ catch (IOException e)
+ {
+ // ignore, can be normal
+ url = null;
+ }
+ }
+ return url;
+ }
+
+ private String getApplicationName()
+ {
+ if (servletContext != null)
+ {
+ String url = servletContext.getRealPath("/");
+ url = StringUtils.replace(url, "\\", "/");
+ if (url.endsWith("/"))
+ {
+ url = StringUtils.substringBeforeLast(url, "/");
+ }
+
+ return StringUtils.substringAfterLast(url, "/");
+ }
+ return StringUtils.EMPTY;
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-13 10:00:23
|
Revision: 246
http://svn.sourceforge.net/openutils/?rev=246&view=rev
Author: fgiust
Date: 2007-02-13 02:00:24 -0800 (Tue, 13 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-tags-spring-0.3
Added Paths:
-----------
tags/openutils-tags-spring-0.3/
tags/openutils-tags-spring-0.3/pom.xml
Removed Paths:
-------------
tags/openutils-tags-spring-0.3/pom.xml
Copied: tags/openutils-tags-spring-0.3 (from rev 244, trunk/openutils-tags-spring)
Deleted: tags/openutils-tags-spring-0.3/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml 2007-02-12 16:15:02 UTC (rev 244)
+++ tags/openutils-tags-spring-0.3/pom.xml 2007-02-13 10:00:24 UTC (rev 246)
@@ -1,79 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-tags-spring</artifactId>
- <name>openutils tags for spring MVC</name>
- <version>1.0-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>2.0.1</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-tags-spring-0.3/pom.xml (from rev 245, trunk/openutils-tags-spring/pom.xml)
===================================================================
--- tags/openutils-tags-spring-0.3/pom.xml (rev 0)
+++ tags/openutils-tags-spring-0.3/pom.xml 2007-02-13 10:00:24 UTC (rev 246)
@@ -0,0 +1,85 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-tags-spring</artifactId>
+ <name>openutils tags for spring MVC</name>
+ <version>0.3</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>2.0.1</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.3</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.3</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-tags-spring-0.3</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-14 21:38:53
|
Revision: 259
http://svn.sourceforge.net/openutils/?rev=259&view=rev
Author: fgiust
Date: 2007-02-14 13:38:49 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-tags-spring-0.3
Added Paths:
-----------
tags/openutils-tags-spring-0.3/
tags/openutils-tags-spring-0.3/pom.xml
tags/openutils-tags-spring-0.3/src/main/java/it/openutils/web/tag/
tags/openutils-tags-spring-0.3/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/openutils-tags-debug.tld
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/openutils-tags-spring.tld
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/checkbox.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/date.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/debug.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/input.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/li.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/messages.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/select.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/txtinput.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/txtoption.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/txtselect.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/txttextarea.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/url.tag
Removed Paths:
-------------
tags/openutils-tags-spring-0.3/pom.xml
tags/openutils-tags-spring-0.3/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/openutils-tags-spring.tld
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/checkbox.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/date.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/daterange.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/debug.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/docbutton.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/docframe.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/docprintbutton.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/docsvg.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/input.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/li.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/messages.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/na.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/select.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/text.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/txtinput.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/txtoption.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/txtselect.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/txttextarea.tag
tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/url.tag
Copied: tags/openutils-tags-spring-0.3 (from rev 244, trunk/openutils-tags-spring)
Deleted: tags/openutils-tags-spring-0.3/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml 2007-02-12 16:15:02 UTC (rev 244)
+++ tags/openutils-tags-spring-0.3/pom.xml 2007-02-14 21:38:49 UTC (rev 259)
@@ -1,79 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-tags-spring</artifactId>
- <name>openutils tags for spring MVC</name>
- <version>1.0-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>2.0.1</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-tags-spring-0.3/pom.xml (from rev 258, trunk/openutils-tags-spring/pom.xml)
===================================================================
--- tags/openutils-tags-spring-0.3/pom.xml (rev 0)
+++ tags/openutils-tags-spring-0.3/pom.xml 2007-02-14 21:38:49 UTC (rev 259)
@@ -0,0 +1,85 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-tags-spring</artifactId>
+ <name>openutils tags for spring MVC</name>
+ <version>0.3</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>2.0.1</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.3</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.3</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-tags-spring-0.3</url>
+ </scm>
+</project>
\ No newline at end of file
Copied: tags/openutils-tags-spring-0.3/src/main/java/it/openutils/web/tag (from rev 253, trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag)
Deleted: tags/openutils-tags-spring-0.3/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java
===================================================================
--- trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java 2007-02-13 21:21:37 UTC (rev 253)
+++ tags/openutils-tags-spring-0.3/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java 2007-02-14 21:38:49 UTC (rev 259)
@@ -1,114 +0,0 @@
-package it.openutils.web.tag.debug;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-
-/**
- * @author fgiust
- * @version $Revision$ ($Author$)
- */
-public class DebugAttributesTag extends BaseDebugTag
-{
-
- /**
- * Stable <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 222;
-
- /**
- * riferimento al Logger
- */
- private static Log log = LogFactory.getLog(DebugAttributesTag.class);
-
- /**
- * Scope. Pu� assumere i valori:
- * <ul>
- * <li>PageContext.PAGE_SCOPE</li>
- * <li>PageContext.REQUEST_SCOPE</li>
- * <li>PageContext.SESSION_SCOPE</li>
- * <li>PageContext.APPLICATION_SCOPE</li>
- * </ul>
- * Corrispondenti alle stringhe settate tramite l'attributo "scope" del tag:
- * <ul>
- * <li>page</li>
- * <li>request</li>
- * <li>session</li>
- * <li>application</li>
- * </ul>
- */
- private int scope = PageContext.PAGE_SCOPE;
-
- /**
- * Setta lo scope in cui recuperare la collezione su cui iterare
- * @param scopeString Scope dell'oggetto collection
- * @throws JspException se il valore passato non � tra: "page", "request", "session", "application"
- */
- public void setScope(String scopeString) throws JspException
- {
-
- if (scopeString.equalsIgnoreCase("page"))
- {
- scope = PageContext.PAGE_SCOPE;
- }
- else if (scopeString.equalsIgnoreCase("request"))
- {
- scope = PageContext.REQUEST_SCOPE;
- }
- else if (scopeString.equalsIgnoreCase("session"))
- {
- scope = PageContext.SESSION_SCOPE;
- }
- else if (scopeString.equalsIgnoreCase("application"))
- {
- scope = PageContext.APPLICATION_SCOPE;
- }
- else
- {
- log.error("Attributo \"scope\" non valido. Valore fornito= ["
- + scopeString
- + "]; valori ammessi: page, request, session, application");
- throw new JspException("Attributo \"scope\" non valido. Valore fornito= ["
- + scopeString
- + "]; valori ammessi: page, request, session, application");
- }
- }
-
- /**
- * crea l'HashMap che evrr� stampata nel metodo doEndTag()
- * @return int
- * @throws JspException eccezione generica
- * @see javax.servlet.jsp.tagext.Tag#doStartTag()
- */
- @Override
- public int doStartTag() throws JspException
- {
-
- HashMap map = new HashMap();
-
- Enumeration enm = pageContext.getAttributeNamesInScope(scope);
-
- while (enm.hasMoreElements())
- {
- String key = enm.nextElement().toString();
-
- if (!(scope == PageContext.PAGE_SCOPE && key.startsWith("javax.servlet")))
- {
- Object value = pageContext.getAttribute(key, scope);
- map.put(key, value);
- }
- }
-
- setOutputClassName(true);
- setDebugMap(map);
-
- return super.doStartTag();
- }
-
-}
\ No newline at end of file
Copied: tags/openutils-tags-spring-0.3/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java (from rev 257, trunk/openutils-tags-spring/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java)
===================================================================
--- tags/openutils-tags-spring-0.3/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java (rev 0)
+++ tags/openutils-tags-spring-0.3/src/main/java/it/openutils/web/tag/debug/DebugAttributesTag.java 2007-02-14 21:38:49 UTC (rev 259)
@@ -0,0 +1,120 @@
+package it.openutils.web.tag.debug;
+
+import java.util.Enumeration;
+import java.util.HashMap;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+/**
+ * @author fgiust
+ * @version $Revision$ ($Author$)
+ */
+public class DebugAttributesTag extends BaseDebugTag
+{
+
+ /**
+ * Stable <code>serialVersionUID</code>
+ */
+ private static final long serialVersionUID = 222;
+
+ /**
+ * riferimento al Logger
+ */
+ private static Log log = LogFactory.getLog(DebugAttributesTag.class);
+
+ /**
+ * Scope. Pu� assumere i valori:
+ * <ul>
+ * <li>PageContext.PAGE_SCOPE</li>
+ * <li>PageContext.REQUEST_SCOPE</li>
+ * <li>PageContext.SESSION_SCOPE</li>
+ * <li>PageContext.APPLICATION_SCOPE</li>
+ * </ul>
+ * Corrispondenti alle stringhe settate tramite l'attributo "scope" del tag:
+ * <ul>
+ * <li>page</li>
+ * <li>request</li>
+ * <li>session</li>
+ * <li>application</li>
+ * </ul>
+ */
+ private int scope = PageContext.PAGE_SCOPE;
+
+ /**
+ * Setta lo scope in cui recuperare la collezione su cui iterare
+ * @param scopeString Scope dell'oggetto collection
+ * @throws JspException se il valore passato non � tra: "page", "request", "session", "application"
+ */
+ public void setScope(String scopeString) throws JspException
+ {
+
+ if (scopeString.equalsIgnoreCase("page"))
+ {
+ scope = PageContext.PAGE_SCOPE;
+ }
+ else if (scopeString.equalsIgnoreCase("request"))
+ {
+ scope = PageContext.REQUEST_SCOPE;
+ }
+ else if (scopeString.equalsIgnoreCase("session"))
+ {
+ scope = PageContext.SESSION_SCOPE;
+ }
+ else if (scopeString.equalsIgnoreCase("application"))
+ {
+ scope = PageContext.APPLICATION_SCOPE;
+ }
+ else
+ {
+ log.error("Attributo \"scope\" non valido. Valore fornito= ["
+ + scopeString
+ + "]; valori ammessi: page, request, session, application");
+ throw new JspException("Attributo \"scope\" non valido. Valore fornito= ["
+ + scopeString
+ + "]; valori ammessi: page, request, session, application");
+ }
+ }
+
+ /**
+ * crea l'HashMap che evrr� stampata nel metodo doEndTag()
+ * @return int
+ * @throws JspException eccezione generica
+ * @see javax.servlet.jsp.tagext.Tag#doStartTag()
+ */
+ @Override
+ public int doStartTag() throws JspException
+ {
+
+ HashMap map = new HashMap();
+ try
+ {
+ Enumeration enm = pageContext.getAttributeNamesInScope(scope);
+
+ while (enm.hasMoreElements())
+ {
+ String key = enm.nextElement().toString();
+
+ if (!(scope == PageContext.PAGE_SCOPE && key.startsWith("javax.servlet")))
+ {
+ Object value = pageContext.getAttribute(key, scope);
+ map.put(key, value);
+ }
+ }
+ }
+ catch (IllegalStateException e)
+ {
+ // ignore, no attributes available
+ }
+
+ setOutputClassName(true);
+ setDebugMap(map);
+
+ return super.doStartTag();
+ }
+
+}
\ No newline at end of file
Copied: tags/openutils-tags-spring-0.3/src/main/resources/META-INF/openutils-tags-debug.tld (from rev 253, trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-debug.tld)
===================================================================
--- tags/openutils-tags-spring-0.3/src/main/resources/META-INF/openutils-tags-debug.tld (rev 0)
+++ tags/openutils-tags-spring-0.3/src/main/resources/META-INF/openutils-tags-debug.tld 2007-02-14 21:38:49 UTC (rev 259)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+ "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<taglib>
+ <tlib-version>1.1</tlib-version>
+ <jsp-version>1.2</jsp-version>
+ <short-name>debug</short-name>
+ <uri>http://openutils.sourceforge.net/openutils-tags-debug</uri>
+ <description>Debug tag library</description>
+ <tag>
+ <name>attributes</name>
+ <tag-class>it.openutils.web.tag.debug.DebugAttributesTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>scope</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>parameters</name>
+ <tag-class>it.openutils.web.tag.debug.DebugParametersTag</tag-class>
+ <body-content>empty</body-content>
+ </tag>
+ <tag>
+ <name>execution</name>
+ <tag-class>it.openutils.web.tag.debug.DebugExecutionTag</tag-class>
+ <body-content>empty</body-content>
+ </tag>
+ <tag>
+ <name>headers</name>
+ <tag-class>it.openutils.web.tag.debug.DebugHeadersTag</tag-class>
+ <body-content>empty</body-content>
+ </tag>
+</taglib>
\ No newline at end of file
Deleted: tags/openutils-tags-spring-0.3/src/main/resources/META-INF/openutils-tags-spring.tld
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-spring.tld 2007-02-12 16:15:02 UTC (rev 244)
+++ tags/openutils-tags-spring-0.3/src/main/resources/META-INF/openutils-tags-spring.tld 2007-02-14 21:38:49 UTC (rev 259)
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<taglib xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd">
- <description>Tag library for tag file directory /META-INF/tags/ou/</description>
- <tlib-version>1.0</tlib-version>
- <short-name>openutils-tags-spring</short-name>
- <uri>http://openutils.sourceforge.net/openutils-tags-spring</uri>
- <!-- generated using mvn net.sourceforge.maven-taglib:maven-taglib-plugin:tldgenerate -->
- <tag-file>
- <name>button</name>
- <path>/META-INF/tags/ou/button.tag</path>
- </tag-file>
- <tag-file>
- <name>buttons</name>
- <path>/META-INF/tags/ou/buttons.tag</path>
- </tag-file>
- <tag-file>
- <name>checkbox</name>
- <path>/META-INF/tags/ou/checkbox.tag</path>
- </tag-file>
- <tag-file>
- <name>compositeproperty</name>
- <path>/META-INF/tags/ou/compositeproperty.tag</path>
- </tag-file>
- <tag-file>
- <name>date</name>
- <path>/META-INF/tags/ou/date.tag</path>
- </tag-file>
- <tag-file>
- <name>daterange</name>
- <path>/META-INF/tags/ou/daterange.tag</path>
- </tag-file>
- <tag-file>
- <name>debug</name>
- <path>/META-INF/tags/ou/debug.tag</path>
- </tag-file>
- <tag-file>
- <name>docbutton</name>
- <path>/META-INF/tags/ou/docbutton.tag</path>
- </tag-file>
- <tag-file>
- <name>docframe</name>
- <path>/META-INF/tags/ou/docframe.tag</path>
- </tag-file>
- <tag-file>
- <name>docprintbutton</name>
- <path>/META-INF/tags/ou/docprintbutton.tag</path>
- </tag-file>
- <tag-file>
- <name>docsvg</name>
- <path>/META-INF/tags/ou/docsvg.tag</path>
- </tag-file>
- <tag-file>
- <name>errorbox</name>
- <path>/META-INF/tags/ou/errorbox.tag</path>
- </tag-file>
- <tag-file>
- <name>input</name>
- <path>/META-INF/tags/ou/input.tag</path>
- </tag-file>
- <tag-file>
- <name>li</name>
- <path>/META-INF/tags/ou/li.tag</path>
- </tag-file>
- <tag-file>
- <name>messages</name>
- <path>/META-INF/tags/ou/messages.tag</path>
- </tag-file>
- <tag-file>
- <name>na</name>
- <path>/META-INF/tags/ou/na.tag</path>
- </tag-file>
- <tag-file>
- <name>select</name>
- <path>/META-INF/tags/ou/select.tag</path>
- </tag-file>
- <tag-file>
- <name>tablelang</name>
- <path>/META-INF/tags/ou/tablelang.tag</path>
- </tag-file>
- <tag-file>
- <name>text</name>
- <path>/META-INF/tags/ou/text.tag</path>
- </tag-file>
- <tag-file>
- <name>txtinput</name>
- <path>/META-INF/tags/ou/txtinput.tag</path>
- </tag-file>
- <tag-file>
- <name>txtoption</name>
- <path>/META-INF/tags/ou/txtoption.tag</path>
- </tag-file>
- <tag-file>
- <name>txtselect</name>
- <path>/META-INF/tags/ou/txtselect.tag</path>
- </tag-file>
- <tag-file>
- <name>txttextarea</name>
- <path>/META-INF/tags/ou/txttextarea.tag</path>
- </tag-file>
- <tag-file>
- <name>ul</name>
- <path>/META-INF/tags/ou/ul.tag</path>
- </tag-file>
- <tag-file>
- <name>url</name>
- <path>/META-INF/tags/ou/url.tag</path>
- </tag-file>
-</taglib>
Copied: tags/openutils-tags-spring-0.3/src/main/resources/META-INF/openutils-tags-spring.tld (from rev 256, trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-spring.tld)
===================================================================
--- tags/openutils-tags-spring-0.3/src/main/resources/META-INF/openutils-tags-spring.tld (rev 0)
+++ tags/openutils-tags-spring-0.3/src/main/resources/META-INF/openutils-tags-spring.tld 2007-02-14 21:38:49 UTC (rev 259)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<taglib xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd">
+ <description>Tag library for tag file directory /META-INF/tags/ou/</description>
+ <tlib-version>1.0</tlib-version>
+ <short-name>openutils-tags-spring</short-name>
+ <uri>http://openutils.sourceforge.net/openutils-tags-spring</uri>
+ <!-- generated using mvn net.sourceforge.maven-taglib:maven-taglib-plugin:tldgenerate -->
+ <tag-file>
+ <name>button</name>
+ <path>/META-INF/tags/ou/button.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>buttons</name>
+ <path>/META-INF/tags/ou/buttons.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>checkbox</name>
+ <path>/META-INF/tags/ou/checkbox.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>compositeproperty</name>
+ <path>/META-INF/tags/ou/compositeproperty.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>date</name>
+ <path>/META-INF/tags/ou/date.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>debug</name>
+ <path>/META-INF/tags/ou/debug.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>errorbox</name>
+ <path>/META-INF/tags/ou/errorbox.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>input</name>
+ <path>/META-INF/tags/ou/input.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>li</name>
+ <path>/META-INF/tags/ou/li.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>messages</name>
+ <path>/META-INF/tags/ou/messages.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>select</name>
+ <path>/META-INF/tags/ou/select.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>tablelang</name>
+ <path>/META-INF/tags/ou/tablelang.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>txtinput</name>
+ <path>/META-INF/tags/ou/txtinput.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>txtoption</name>
+ <path>/META-INF/tags/ou/txtoption.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>txtselect</name>
+ <path>/META-INF/tags/ou/txtselect.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>txttextarea</name>
+ <path>/META-INF/tags/ou/txttextarea.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>ul</name>
+ <path>/META-INF/tags/ou/ul.tag</path>
+ </tag-file>
+ <tag-file>
+ <name>url</name>
+ <path>/META-INF/tags/ou/url.tag</path>
+ </tag-file>
+</taglib>
Deleted: tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/checkbox.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag 2007-02-12 16:15:02 UTC (rev 244)
+++ tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/checkbox.tag 2007-02-14 21:38:49 UTC (rev 259)
@@ -1,68 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
- xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
-
- <jsp:directive.attribute name="path" required="true" />
- <jsp:directive.attribute name="name" required="false" />
- <jsp:directive.attribute name="bare" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="multiline" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="style" required="false" />
-
- <spring:bind path="${path}">
- <c:if test="${empty(name)}">
- <c:set var="name">${su:substringAfter(path, ".")}</c:set>
- </c:if>
-
-
- <c:choose>
- <c:when test="${bare}">
- <c:choose>
- <c:when test="${status.value}">
- <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
- </c:when>
- <c:otherwise>
- <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
- </c:otherwise>
- </c:choose>
- <input type="hidden" name="_${name}" />
- </c:when>
- <c:when test="${multiline}">
- <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set>
-
- <div class="${divclass}" style="${style}">
- <label for="${name}"><fmt:message key="${path}" />:</label>
- <c:choose>
- <c:when test="${status.value}">
- <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
- </c:when>
- <c:otherwise>
- <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
- </c:otherwise>
- </c:choose>
- <input type="hidden" name="_${name}" />
- <div class="clear"><!-- --></div>
- </div>
- </c:when>
- <c:otherwise>
- <c:set var="divclass">formelementch<c:if test="${!empty(status.errorMessage)}"><![CDATA[ ]]>formelementerror</c:if></c:set>
- <span class="${divclass}" style="${style}">
- <c:choose>
- <c:when test="${status.value}">
- <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
- </c:when>
- <c:otherwise>
- <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
- </c:otherwise>
- </c:choose>
- <input type="hidden" name="_${name}" />
- <jsp:text><![CDATA[ ]]></jsp:text>
- <span class="chlabel"><fmt:message key="${path}" /></span>
- </span>
- </c:otherwise>
- </c:choose>
-
-
- </spring:bind>
-
-</jsp:root>
Copied: tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/checkbox.tag (from rev 251, trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag)
===================================================================
--- tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/checkbox.tag (rev 0)
+++ tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/checkbox.tag 2007-02-14 21:38:49 UTC (rev 259)
@@ -0,0 +1,72 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+ xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
+
+ <jsp:directive.attribute name="path" required="true" />
+ <jsp:directive.attribute name="name" required="false" />
+ <jsp:directive.attribute name="bare" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="multiline" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="style" required="false" />
+
+ <jsp:scriptlet>
+ System.err.println("Warning ou:checkbox is deprecated, please use ou:input type=\"checkbox\" instead ");
+ </jsp:scriptlet>
+
+ <spring:bind path="${path}">
+ <c:if test="${empty(name)}">
+ <c:set var="name">${su:substringAfter(path, ".")}</c:set>
+ </c:if>
+
+
+ <c:choose>
+ <c:when test="${bare}">
+ <c:choose>
+ <c:when test="${status.value}">
+ <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
+ </c:when>
+ <c:otherwise>
+ <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
+ </c:otherwise>
+ </c:choose>
+ <input type="hidden" name="_${name}" />
+ </c:when>
+ <c:when test="${multiline}">
+ <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set>
+
+ <div class="${divclass}" style="${style}">
+ <label for="${name}"><fmt:message key="${path}" />:</label>
+ <c:choose>
+ <c:when test="${status.value}">
+ <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
+ </c:when>
+ <c:otherwise>
+ <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
+ </c:otherwise>
+ </c:choose>
+ <input type="hidden" name="_${name}" />
+ <div class="clear"><!-- --></div>
+ </div>
+ </c:when>
+ <c:otherwise>
+ <c:set var="divclass">formelementch<c:if test="${!empty(status.errorMessage)}"><![CDATA[ ]]>formelementerror</c:if></c:set>
+ <span class="${divclass}" style="${style}">
+ <c:choose>
+ <c:when test="${status.value}">
+ <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" checked="checked" />
+ </c:when>
+ <c:otherwise>
+ <input type="checkbox" name="${name}" id="${name}" value="true" class="checkbox" />
+ </c:otherwise>
+ </c:choose>
+ <input type="hidden" name="_${name}" />
+ <jsp:text><![CDATA[ ]]></jsp:text>
+ <span class="chlabel"><fmt:message key="${path}" /></span>
+ </span>
+ </c:otherwise>
+ </c:choose>
+
+
+ </spring:bind>
+
+</jsp:root>
Deleted: tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/date.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag 2007-02-12 16:15:02 UTC (rev 244)
+++ tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/date.tag 2007-02-14 21:38:49 UTC (rev 259)
@@ -1,100 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
-
- <jsp:directive.attribute name="path" required="true" />
- <jsp:directive.attribute name="name" required="false" />
- <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="type" required="false" />
- <jsp:directive.attribute name="nobind" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="style" required="false" />
- <jsp:directive.attribute name="onkeypress" required="false" />
- <jsp:directive.attribute name="onkeydown" required="false" />
- <jsp:directive.attribute name="onkeyup" required="false" />
- <jsp:directive.attribute name="onchange" required="false" />
- <jsp:directive.attribute name="cssclass" required="false" />
- <jsp:directive.attribute name="key" required="false" />
- <jsp:directive.attribute name="onblur" required="false" />
- <jsp:directive.attribute name="label" required="false" type="java.lang.String" />
-
-
- <c:if test="${empty(key)}">
- <c:set var="key">${path}</c:set>
- </c:if>
- <c:if test="${empty(name)}">
- <c:set var="name">${su:substringAfter(path, ".")}</c:set>
- </c:if>
- <c:if test="${empty(maxlength)}">
- <c:set var="maxlength">30</c:set>
- </c:if>
- <c:if test="${empty(style)}">
- <c:set var="style">width: 75px</c:set>
- </c:if>
- <c:if test="${type == 'key' and !empty(status.value)}">
- <c:set var="type">hidden</c:set>
- </c:if>
- <c:if test="${type == 'keyshow' and !empty(status.value)}">
- <c:set var="readonly" value="${true}" />
- </c:if>
- <c:set var="divclass">formelement</c:set>
-
-
- <c:choose>
- <c:when test="${empty(label)}">
- <c:set var="labelmsg"><fmt:message key="${key}" /></c:set>
- </c:when>
- <c:otherwise>
- <c:set var="labelmsg">${label}</c:set>
- </c:otherwise>
- </c:choose>
-
- <c:choose>
- <c:when test="${!nobind}">
- <spring:bind path="${path}">
- <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set>
-
-
- <div class="${divclass}">
- <label for="${name}">${labelmsg}:</label>
-
- <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
-
- <a href="javascript:showCal('divdata${name}','${name}')" title="seleziona" class="calbtn"><span>C</span></a>
-
- <div class="calendar" id="divdata${name}" style="display:none"><!-- --></div>
-
-<!--[if gte IE 5.5]>
-<iframe id='divdata${name}iframe' class='calendarIframe' src='javascript:false;' frameBorder='0' scrolling='no' style="display:none;filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)"><!-- x --></iframe>
-<![endif]-->
- <div class="clear"><!-- --></div>
- </div>
- <script type="text/javascript">
- createCalendar('${status.value}', 'divdata${name}', '${name}')
- </script>
-
-
- </spring:bind>
- </c:when>
- <c:otherwise>
-
-
- <div class="${divclass}">
- <label for="${name}">${labelmsg}:</label>
-
- <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="10" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
-
-
- </div>
-
-
-
- <div class="clear"><!-- --></div>
-
-
- </c:otherwise>
- </c:choose>
-
-
-
-</jsp:root>
Copied: tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/date.tag (from rev 251, trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag)
===================================================================
--- tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/date.tag (rev 0)
+++ tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/date.tag 2007-02-14 21:38:49 UTC (rev 259)
@@ -0,0 +1,104 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring">
+
+ <jsp:directive.attribute name="path" required="true" />
+ <jsp:directive.attribute name="name" required="false" />
+ <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="type" required="false" />
+ <jsp:directive.attribute name="nobind" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="style" required="false" />
+ <jsp:directive.attribute name="onkeypress" required="false" />
+ <jsp:directive.attribute name="onkeydown" required="false" />
+ <jsp:directive.attribute name="onkeyup" required="false" />
+ <jsp:directive.attribute name="onchange" required="false" />
+ <jsp:directive.attribute name="cssclass" required="false" />
+ <jsp:directive.attribute name="key" required="false" />
+ <jsp:directive.attribute name="onblur" required="false" />
+ <jsp:directive.attribute name="label" required="false" type="java.lang.String" />
+
+
+ <jsp:scriptlet>
+ System.err.println("Warning ou:date is deprecated, please use ou:input type=\"date\" instead ");
+ </jsp:scriptlet>
+
+ <c:if test="${empty(key)}">
+ <c:set var="key">${path}</c:set>
+ </c:if>
+ <c:if test="${empty(name)}">
+ <c:set var="name">${su:substringAfter(path, ".")}</c:set>
+ </c:if>
+ <c:if test="${empty(maxlength)}">
+ <c:set var="maxlength">30</c:set>
+ </c:if>
+ <c:if test="${empty(style)}">
+ <c:set var="style">width: 75px</c:set>
+ </c:if>
+ <c:if test="${type == 'key' and !empty(status.value)}">
+ <c:set var="type">hidden</c:set>
+ </c:if>
+ <c:if test="${type == 'keyshow' and !empty(status.value)}">
+ <c:set var="readonly" value="${true}" />
+ </c:if>
+ <c:set var="divclass">formelement</c:set>
+
+
+ <c:choose>
+ <c:when test="${empty(label)}">
+ <c:set var="labelmsg"><fmt:message key="${key}" /></c:set>
+ </c:when>
+ <c:otherwise>
+ <c:set var="labelmsg">${label}</c:set>
+ </c:otherwise>
+ </c:choose>
+
+ <c:choose>
+ <c:when test="${!nobind}">
+ <spring:bind path="${path}">
+ <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set>
+
+
+ <div class="${divclass}">
+ <label for="${name}">${labelmsg}:</label>
+
+ <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text ${cssclass}" maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
+
+ <a href="javascript:showCal('divdata${name}','${name}')" title="seleziona" class="calbtn"><span>C</span></a>
+
+ <div class="calendar" id="divdata${name}" style="display:none"><!-- --></div>
+
+<!--[if gte IE 5.5]>
+<iframe id='divdata${name}iframe' class='calendarIframe' src='javascript:false;' frameBorder='0' scrolling='no' style="display:none;filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)"><!-- x --></iframe>
+<![endif]-->
+ <div class="clear"><!-- --></div>
+ </div>
+ <script type="text/javascript">
+ createCalendar('${status.value}', 'divdata${name}', '${name}')
+ </script>
+
+
+ </spring:bind>
+ </c:when>
+ <c:otherwise>
+
+
+ <div class="${divclass}">
+ <label for="${name}">${labelmsg}:</label>
+
+ <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="10" style="${style}" readonly="${readonly}" disabled="${disabled}" onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}" onblur="${onblur}"/>
+
+
+ </div>
+
+
+
+ <div class="clear"><!-- --></div>
+
+
+ </c:otherwise>
+ </c:choose>
+
+
+
+</jsp:root>
Deleted: tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/daterange.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag 2007-02-12 16:15:02 UTC (rev 244)
+++ tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/daterange.tag 2007-02-14 21:38:49 UTC (rev 259)
@@ -1,30 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
- xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
- <jsp:directive.attribute name="from" required="true" type="java.util.Date" />
- <jsp:directive.attribute name="to" required="true" type="java.util.Date" />
- <!-- elimina date anteriori al 1970 -->
- <c:if test="${from.time le 0}">
- <c:remove var="from" />
- </c:if>
- <c:if test="${to.time le 0}">
- <c:remove var="to" />
- </c:if>
- <c:if test="${(from != null) or (to != null)}">
- <jsp:text> (</jsp:text>
- <c:if test="${from != null}">
- <fmt:message key="daterange.from" />
- <jsp:text> </jsp:text>
- <fmt:formatDate value="${from}" type="date" pattern="dd/MM/yyyy" />
- <c:if test="${to != null}">
- <jsp:text> </jsp:text>
- </c:if>
- </c:if>
-
- <c:if test="${to != null}">
- <fmt:message key="daterange.to" />
- <jsp:text> </jsp:text>
- <fmt:formatDate value="${to}" type="date" pattern="dd/MM/yyyy" />
- </c:if>
- <jsp:text>) </jsp:text>
- </c:if>
-</jsp:root>
Deleted: tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/debug.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag 2007-02-12 16:15:02 UTC (rev 244)
+++ tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/debug.tag 2007-02-14 21:38:49 UTC (rev 259)
@@ -1,47 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:debug="urn:jsptld:debug" xmlns:c="http://java.sun.com/jsp/jstl/core">
-
- <script type="text/javascript">
- <![CDATA[
- function showDebug(pId) {
- lDebugDiv = document.getElementById(pId);
- if (lDebugDiv.style.display == "block") {
- lDebugDiv.style.display="none";
- }
- else
- {
- lDebugDiv.style.display="block";
- }
- }
- ]]>
- </script>
- <div class="debugtabs"><a href="javascript:showDebug('debug')">&raquo; debug</a></div>
- <div id="debug" class="debug" style="display:none">
- <table>
- <tr>
- <th onclick="showDebug('parameters')">Parameters</th>
- <td id="parameters" style="display:none"><debug:parameters /></td>
- </tr>
- <tr>
- <th onclick="showDebug('request')">Request</th>
- <td id="request" style="display:none"><debug:attributes scope="request" /></td>
- </tr>
- <tr>
- <th onclick="showDebug('session')">Session</th>
- <td id="session" style="display:none"><debug:attributes scope="session" /></td>
- </tr>
- <tr>
- <th onclick="showDebug('page')">Page</th>
- <td id="page" style="display:none"><debug:attributes scope="page" /></td>
- </tr>
- <tr>
- <th onclick="showDebug('application')">Application</th>
- <td id="application" style="display:none"><debug:attributes scope="application" /></td>
- </tr>
- <tr>
- <th onclick="showDebug('headers')">Request headers</th>
- <td id="headers" style="display:none"><debug:headers /></td>
- </tr>
- </table>
- </div>
-</jsp:root>
Copied: tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/debug.tag (from rev 253, trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/debug.tag)
===================================================================
--- tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/debug.tag (rev 0)
+++ tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/debug.tag 2007-02-14 21:38:49 UTC (rev 259)
@@ -0,0 +1,60 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:debug="http://openutils.sourceforge.net/openutils-tags-debug" xmlns:c="http://java.sun.com/jsp/jstl/core">
+ <script type="text/javascript">
+ <![CDATA[
+ function showDebug(pId) {
+ lDebugDiv = document.getElementById(pId);
+ if (lDebugDiv.style.display == "block") {
+ lDebugDiv.style.display="none";
+ }
+ else
+ {
+ lDebugDiv.style.display="block";
+ }
+ }
+ ]]>
+ </script>
+ <div class="debugtabs">
+ <a href="javascript:showDebug('debug')">&raquo; debug</a>
+ </div>
+ <div id="debug" class="debug" style="display:none">
+ <table>
+ <tr>
+ <th onclick="showDebug('parameters')">Parameters</th>
+ <td id="parameters" style="display:none">
+ <debug:parameters />
+ </td>
+ </tr>
+ <tr>
+ <th onclick="showDebug('request')">Request</th>
+ <td id="request" style="display:none">
+ <debug:attributes scope="request" />
+ </td>
+ </tr>
+ <tr>
+ <th onclick="showDebug('session')">Session</th>
+ <td id="session" style="display:none">
+ <debug:attributes scope="session" />
+ </td>
+ </tr>
+ <tr>
+ <th onclick="showDebug('page')">Page</th>
+ <td id="page" style="display:none">
+ <debug:attributes scope="page" />
+ </td>
+ </tr>
+ <tr>
+ <th onclick="showDebug('application')">Application</th>
+ <td id="application" style="display:none">
+ <debug:attributes scope="application" />
+ </td>
+ </tr>
+ <tr>
+ <th onclick="showDebug('headers')">Request headers</th>
+ <td id="headers" style="display:none">
+ <debug:headers />
+ </td>
+ </tr>
+ </table>
+ </div>
+</jsp:root>
Deleted: tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/docbutton.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag 2007-02-12 16:15:02 UTC (rev 244)
+++ tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/docbutton.tag 2007-02-14 21:38:49 UTC (rev 259)
@@ -1,24 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
-
-
- <jsp:directive.attribute name="type" required="true" />
- <jsp:directive.attribute name="href" required="true" />
- <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
-
-
- <c:set var="message"><fmt:message key="btn.${type}" /></c:set>
-
- <c:choose>
- <c:when test="${disabled}">
- <img src="${pageContext.request.contextPath}/docroot/img/btn-${type}_false.gif" alt="${message}" title="${message}"/>
- </c:when>
- <c:otherwise>
- <a href="${href}&amp;page=full" title="${message}" target="_blank">
- <img src="${pageContext.request.contextPath}/docroot/img/btn-${type}.gif" alt="${message}" />
- </a>
- </c:otherwise>
- </c:choose>
-
-</jsp:root>
Deleted: tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/docframe.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag 2007-02-12 16:15:02 UTC (rev 244)
+++ tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/docframe.tag 2007-02-14 21:38:49 UTC (rev 259)
@@ -1,19 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags"
- xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
- xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
- xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
- <jsp:directive.attribute name="width" required="false" />
- <jsp:directive.attribute name="height" required="false" />
- <jsp:directive.attribute name="doc" required="true" />
- <jsp:directive.attribute name="id" required="false" />
- <c:choose>
- <c:when test="${!empty(doc)}">
- <iframe src="${jspContext.request.contextPath}/docs/pdf/${doc}" width="${width}" height="${height}" id="${id}">
- <!-- a -->
- </iframe>
- </c:when>
- <c:otherwise>
- <![CDATA[ <!-- doc is empty --> ]]>
- </c:otherwise>
- </c:choose>
-</jsp:root>
Deleted: tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/docprintbutton.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag 2007-02-12 16:15:02 UTC (rev 244)
+++ tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/docprintbutton.tag 2007-02-14 21:38:49 UTC (rev 259)
@@ -1,13 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
-
-
- <jsp:directive.attribute name="href" required="true" />
-
- <c:set var="message"><fmt:message key="btn.stampa" /></c:set>
-
- <a href="${href}&amp;page=full&amp;print=print" title="${message}" target="_blank">
- <img src="${pageContext.request.contextPath}/docroot/img/btn-stampa.gif" alt="${message}" />
- </a>
-</jsp:root>
Deleted: tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/docsvg.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag 2007-02-12 16:15:02 UTC (rev 244)
+++ tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/docsvg.tag 2007-02-14 21:38:49 UTC (rev 259)
@@ -1,13 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
- xmlns:spring="http://www.springframework.org/tags" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
-
- <jsp:directive.attribute name="modello" required="true" />
-
- <object class="svg" data="${jspContext.request.contextPath}/docs/svg/ES_${prodotto.seriemodello.id}.svg" type="image/svg+xml">
- <!-- <embed src="${jspContext.request.contextPath}/docs/svg/ES_${prodotto.seriemodello.id}.svg" type="image/svg+xml" pluginspage="http://www.adobe.com/svg/viewer/install/" /> -->
- </object>
-
-
-
-</jsp:root>
Deleted: tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/input.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag 2007-02-12 16:15:02 UTC (rev 244)
+++ tags/openutils-tags-spring-0.3/src/main/resources/META-INF/tags/ou/input.tag 2007-02-14 21:38:49 UTC (rev 259)
@@ -1,131 +0,0 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags"
- xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
- xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
- xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring"
- xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
- <jsp:directive.attribute name="path" required="true" />
- <jsp:directive.attribute name="name" required="false" />
- <jsp:directive.attribute name="maxlength" required="false" type="java.lang.Integer" />
- <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="bare" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="type" required="false" />
- <jsp:directive.attribute name="nobind" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="style" required="false" />
- <jsp:directive.attribute name="onkeypress" required="false" />
- <jsp:directive.attribute name="onkeydown" required="false" />
- <jsp:directive.attribute name="onkeyup" required="false" />
- <jsp:directive.attribute name="onchange" required="false" />
- <jsp:directive.attribute name="cssclass" required="false" />
- <jsp:directive.attribute name="key" required="false" />
- <jsp:directive.attribute name="onblur" required="false" />
- <jsp:directive.attribute name="label" required="false" type="java.lang.String" />
- <c:if test="${empty(key)}">
- <c:set var="key">${path}</c:set>
- </c:if>
- <c:if test="${empty(name)}">
- <c:set var="name">${su:substringAfter(path, ".")}</c:set>
- </c:if>
- <c:if test="${empty(maxlength)}">
- <c:set var="maxlength">30</c:set>
- </c:if>
- <c:if test="${type == 'key' || type == 'keyshow'}">
- <c:choose>
- <c:when test="${type == 'key' and !empty(status.value)}">
- <c:set var="type" value="hidden" />
- </c:when>
- <c:when test="${type == 'keyshow' and !empty(status.value)}">
- <c:set var="type" value="text" />
- <c:set var="readonly" value="${true}" />
- </c:when>
- <c:otherwise>
- <c:set var="type" value="text" />
- </c:otherwise>
- </c:choose>
- </c:if>
- <c:if test="${type == 'date'}">
- <c:set var="type" value="text" />
- <c:set var="datepicker" value="${true}" />
- </c:if>
- <c:if test="${maxlength ge 256}">
- <c:set var="type" value="textarea" />
- </c:if>
- <c:set var="divclass">
- <jsp:text>formelement formelement${type}</jsp:text>
- </c:set>
- <c:set var="cssclass">
- <jsp:text>${type} ${cssclass}</jsp:text>
- <c:if test="${readonly}">${elx:space()}readonly</c:if>
- </c:set>
- <c:choose>
- <c:when test="${empty(label)}">
- <c:set var="labelmsg">
- <fmt:message key="${key}" />
- </c:set>
- </c:when>
- <c:otherwise>
- <c:set var="labelmsg">${label}</c:set>
- </c:otherwise>
- </c:choose>
- <!-- stampa campi -->
- <c:choose>
- <c:when test="${!nobind}">
- <spring:bind path="${path}">
- <c:set var="divclass">
- <jsp:text>${divclass}</jsp:text>
- <c:if test="${!empty(status.errorMessage)}">${elx:space()}formelementerror</c:if>
- </c:set>
- <c:choose>
- <c:when test="${bare}">
- <ou:txtinput type="${type}" name="${name}" value="${status.value}" cssclass="${cssclass}"
- maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}"
- onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}"
- onblur="${onblur}" checked="${status.value}" />
- </c:when>
- <c:otherwise>
- <div class="${divclass}">
- <label for="${name}">${labelmsg}:</label>
- <ou:txtinput type="${type}" name="${name}" value="${status.value}" cssclass="${cssclass}"
- maxlength="${maxlength}" style="${style}" readonly="${readonly}" disabled="${disabled}"
- onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}"
- onblur="${onblur}" />
- <c:if test="${datepicker}">
- <a href="javascript:showCal('divdata${name}','${name}')" title="seleziona" class="calbtn">
- <span>C</span>
- </a>
- <div class="calendar" id="divdata${name}" style="display:none"><!-- --></div>
- <!--[if gte IE 5.5]>
- <iframe id='divdata${name}iframe' class='calendarIframe' src='javascript:false;' frameBorder='0'
- scrolling='no'
- style="display:none;filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)"><!-- x --></iframe>
- <![endif]-->
- <script type="text/javascript">createCalendar('${status.value}', 'divdata${name}', '${name}')</script>
- </c:if>
- <div class="clear"><!-- --></div>
- </div>
- </c:otherwise>
- </c:choose>
- </spring:bind>
- </c:when>
- <c:otherwise><!-- no spring binding -->
- <c:choose>
- <c:when test="${bare}">
- <ou:txtinput type="...
[truncated message content] |
|
From: <fg...@us...> - 2007-02-24 15:39:28
|
Revision: 285
http://svn.sourceforge.net/openutils/?rev=285&view=rev
Author: fgiust
Date: 2007-02-24 07:39:29 -0800 (Sat, 24 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-bshd5-1.0.5
Added Paths:
-----------
tags/openutils-bshd5-1.0.5/
tags/openutils-bshd5-1.0.5/pom.xml
Removed Paths:
-------------
tags/openutils-bshd5-1.0.5/pom.xml
Copied: tags/openutils-bshd5-1.0.5 (from rev 283, trunk/openutils-bshd5)
Deleted: tags/openutils-bshd5-1.0.5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2007-02-22 14:15:58 UTC (rev 283)
+++ tags/openutils-bshd5-1.0.5/pom.xml 2007-02-24 15:39:29 UTC (rev 285)
@@ -1,51 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-bshd5</artifactId>
- <name>openutils base Spring-Hibernate DAO for java 5.0</name>
- <version>1.0.5-SNAPSHOT</version>
- <description>openutils base Spring-Hibernate DAO for java 5.0</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-hibernate3</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.1.ga</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-bshd5-1.0.5/pom.xml (from rev 284, trunk/openutils-bshd5/pom.xml)
===================================================================
--- tags/openutils-bshd5-1.0.5/pom.xml (rev 0)
+++ tags/openutils-bshd5-1.0.5/pom.xml 2007-02-24 15:39:29 UTC (rev 285)
@@ -0,0 +1,57 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-bshd5</artifactId>
+ <name>openutils base Spring-Hibernate DAO for java 5.0</name>
+ <version>1.0.5</version>
+ <description>openutils base Spring-Hibernate DAO for java 5.0</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-hibernate3</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.1.ga</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.0.5</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.0.5</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-1.0.5</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-24 15:45:59
|
Revision: 288
http://svn.sourceforge.net/openutils/?rev=288&view=rev
Author: fgiust
Date: 2007-02-24 07:45:59 -0800 (Sat, 24 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-tags-spring-0.3
Added Paths:
-----------
tags/openutils-tags-spring-0.3/
tags/openutils-tags-spring-0.3/pom.xml
Removed Paths:
-------------
tags/openutils-tags-spring-0.3/pom.xml
Copied: tags/openutils-tags-spring-0.3 (from rev 283, trunk/openutils-tags-spring)
Deleted: tags/openutils-tags-spring-0.3/pom.xml
===================================================================
--- trunk/openutils-tags-spring/pom.xml 2007-02-22 14:15:58 UTC (rev 283)
+++ tags/openutils-tags-spring-0.3/pom.xml 2007-02-24 15:45:59 UTC (rev 288)
@@ -1,79 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-tags-spring</artifactId>
- <name>openutils tags for spring MVC</name>
- <version>1.0-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>2.0.1</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-tags-spring-0.3/pom.xml (from rev 287, trunk/openutils-tags-spring/pom.xml)
===================================================================
--- tags/openutils-tags-spring-0.3/pom.xml (rev 0)
+++ tags/openutils-tags-spring-0.3/pom.xml 2007-02-24 15:45:59 UTC (rev 288)
@@ -0,0 +1,85 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-tags-spring</artifactId>
+ <name>openutils tags for spring MVC</name>
+ <version>0.3</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>2.0.1</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.3</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-tags-spring-0.3</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-tags-spring-0.3</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-24 15:49:27
|
Revision: 291
http://svn.sourceforge.net/openutils/?rev=291&view=rev
Author: fgiust
Date: 2007-02-24 07:49:28 -0800 (Sat, 24 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-deployment-1.0.7
Added Paths:
-----------
tags/openutils-deployment-1.0.7/
tags/openutils-deployment-1.0.7/pom.xml
Removed Paths:
-------------
tags/openutils-deployment-1.0.7/pom.xml
Copied: tags/openutils-deployment-1.0.7 (from rev 283, trunk/openutils-deployment)
Deleted: tags/openutils-deployment-1.0.7/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2007-02-22 14:15:58 UTC (rev 283)
+++ tags/openutils-deployment-1.0.7/pom.xml 2007-02-24 15:49:28 UTC (rev 291)
@@ -1,54 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-deployment</artifactId>
- <name>openutils deployment tools</name>
- <version>1.0.7-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>2.0.1</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-deployment-1.0.7/pom.xml (from rev 290, trunk/openutils-deployment/pom.xml)
===================================================================
--- tags/openutils-deployment-1.0.7/pom.xml (rev 0)
+++ tags/openutils-deployment-1.0.7/pom.xml 2007-02-24 15:49:28 UTC (rev 291)
@@ -0,0 +1,60 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-deployment</artifactId>
+ <name>openutils deployment tools</name>
+ <version>1.0.7</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>2.0.1</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.7</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-1.0.7</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-1.0.7</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-24 15:56:27
|
Revision: 294
http://svn.sourceforge.net/openutils/?rev=294&view=rev
Author: fgiust
Date: 2007-02-24 07:56:27 -0800 (Sat, 24 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-dbmigration-0.2
Added Paths:
-----------
tags/openutils-dbmigration-0.2/
tags/openutils-dbmigration-0.2/pom.xml
Removed Paths:
-------------
tags/openutils-dbmigration-0.2/pom.xml
Copied: tags/openutils-dbmigration-0.2 (from rev 283, trunk/openutils-dbmigration)
Deleted: tags/openutils-dbmigration-0.2/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2007-02-22 14:15:58 UTC (rev 283)
+++ tags/openutils-dbmigration-0.2/pom.xml 2007-02-24 15:56:27 UTC (rev 294)
@@ -1,87 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-dbmigration</artifactId>
- <name>openutils db migration framework</name>
- <version>1.0-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>poi</groupId>
- <artifactId>poi</artifactId>
- <version>2.5.1-final-20040804</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-dbmigration-0.2/pom.xml (from rev 293, trunk/openutils-dbmigration/pom.xml)
===================================================================
--- tags/openutils-dbmigration-0.2/pom.xml (rev 0)
+++ tags/openutils-dbmigration-0.2/pom.xml 2007-02-24 15:56:27 UTC (rev 294)
@@ -0,0 +1,93 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-dbmigration</artifactId>
+ <name>openutils db migration framework</name>
+ <version>0.2</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>2.5.1-final-20040804</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-dbmigration-0.2</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-24 16:12:14
|
Revision: 297
http://svn.sourceforge.net/openutils/?rev=297&view=rev
Author: fgiust
Date: 2007-02-24 08:12:15 -0800 (Sat, 24 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-spring-1.0.2
Added Paths:
-----------
tags/openutils-spring-1.0.2/
tags/openutils-spring-1.0.2/pom.xml
Removed Paths:
-------------
tags/openutils-spring-1.0.2/pom.xml
Copied: tags/openutils-spring-1.0.2 (from rev 283, trunk/openutils-spring)
Deleted: tags/openutils-spring-1.0.2/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2007-02-22 14:15:58 UTC (rev 283)
+++ tags/openutils-spring-1.0.2/pom.xml 2007-02-24 16:12:15 UTC (rev 297)
@@ -1,86 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-spring</artifactId>
- <name>openutils spring tools</name>
- <version>1.0.2-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>2.0.1</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl:jar</artifactId>
- </exclusion>
- <exclusion>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-spring-1.0.2/pom.xml (from rev 296, trunk/openutils-spring/pom.xml)
===================================================================
--- tags/openutils-spring-1.0.2/pom.xml (rev 0)
+++ tags/openutils-spring-1.0.2/pom.xml 2007-02-24 16:12:15 UTC (rev 297)
@@ -0,0 +1,92 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-spring</artifactId>
+ <name>openutils spring tools</name>
+ <version>1.0.2</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>2.0.1</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl:jar</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.2.1.ga</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-1.0.2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-spring-1.0.2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-spring-1.0.2</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-25 20:26:32
|
Revision: 300
http://svn.sourceforge.net/openutils/?rev=300&view=rev
Author: fgiust
Date: 2007-02-25 12:26:28 -0800 (Sun, 25 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-configuration-dataobjects-0.1
Added Paths:
-----------
tags/openutils-configuration-dataobjects-0.1/
tags/openutils-configuration-dataobjects-0.1/pom.xml
Removed Paths:
-------------
tags/openutils-configuration-dataobjects-0.1/pom.xml
Copied: tags/openutils-configuration-dataobjects-0.1 (from rev 283, trunk/openutils-configuration-dataobjects)
Deleted: tags/openutils-configuration-dataobjects-0.1/pom.xml
===================================================================
--- trunk/openutils-configuration-dataobjects/pom.xml 2007-02-22 14:15:58 UTC (rev 283)
+++ tags/openutils-configuration-dataobjects-0.1/pom.xml 2007-02-25 20:26:28 UTC (rev 300)
@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-configuration-dataobjects</artifactId>
- <packaging>jar</packaging>
- <name>openutils-configuration-dataobjects</name>
- <version>1.0-SNAPSHOT</version>
- <description>Configuration dataobjects</description>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
- <exclusions>
- <exclusion>
- <!-- not needed here, just load annotations -->
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-configuration-dataobjects-0.1/pom.xml (from rev 299, trunk/openutils-configuration-dataobjects/pom.xml)
===================================================================
--- tags/openutils-configuration-dataobjects-0.1/pom.xml (rev 0)
+++ tags/openutils-configuration-dataobjects-0.1/pom.xml 2007-02-25 20:26:28 UTC (rev 300)
@@ -0,0 +1,40 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-configuration-dataobjects</artifactId>
+ <packaging>jar</packaging>
+ <name>openutils-configuration-dataobjects</name>
+ <version>0.1</version>
+ <description>Configuration dataobjects</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.2.1.ga</version>
+ <exclusions>
+ <exclusion>
+ <!-- not needed here, just load annotations -->
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-configuration-dataobjects-0.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-configuration-dataobjects-0.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-configuration-dataobjects-0.1</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-25 20:39:07
|
Revision: 304
http://svn.sourceforge.net/openutils/?rev=304&view=rev
Author: fgiust
Date: 2007-02-25 12:39:07 -0800 (Sun, 25 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-configuration-services-0.1
Added Paths:
-----------
tags/openutils-configuration-services-0.1/
tags/openutils-configuration-services-0.1/pom.xml
Removed Paths:
-------------
tags/openutils-configuration-services-0.1/pom.xml
Copied: tags/openutils-configuration-services-0.1 (from rev 283, trunk/openutils-configuration-services)
Deleted: tags/openutils-configuration-services-0.1/pom.xml
===================================================================
--- trunk/openutils-configuration-services/pom.xml 2007-02-22 14:15:58 UTC (rev 283)
+++ tags/openutils-configuration-services-0.1/pom.xml 2007-02-25 20:39:07 UTC (rev 304)
@@ -1,95 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-configuration-services</artifactId>
- <packaging>jar</packaging>
- <name>openutils-configuration</name>
- <version>1.0-SNAPSHOT</version>
- <description>Configuration services</description>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-spring</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-configuration-dataobjects</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-bshd5</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-testing-testng</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
- </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>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>2.0.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.2.2.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-configuration-services-0.1/pom.xml (from rev 303, trunk/openutils-configuration-services/pom.xml)
===================================================================
--- tags/openutils-configuration-services-0.1/pom.xml (rev 0)
+++ tags/openutils-configuration-services-0.1/pom.xml 2007-02-25 20:39:07 UTC (rev 304)
@@ -0,0 +1,100 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-configuration-services</artifactId>
+ <packaging>jar</packaging>
+ <name>openutils-configuration</name>
+ <version>0.1</version>
+ <description>Configuration services</description>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-spring</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-configuration-dataobjects</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-bshd5</artifactId>
+ <version>1.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-testing-testng</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.2.1.ga</version>
+ </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>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>2.0.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.2.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-configuration-services-0.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-configuration-services-0.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-configuration-services-0.1</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-02-26 22:16:14
|
Revision: 311
http://svn.sourceforge.net/openutils/?rev=311&view=rev
Author: fgiust
Date: 2007-02-26 14:16:09 -0800 (Mon, 26 Feb 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-dbmigration-0.3
Added Paths:
-----------
tags/openutils-dbmigration-0.3/
tags/openutils-dbmigration-0.3/pom.xml
tags/openutils-dbmigration-0.3/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
tags/openutils-dbmigration-0.3/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
Removed Paths:
-------------
tags/openutils-dbmigration-0.3/pom.xml
tags/openutils-dbmigration-0.3/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
tags/openutils-dbmigration-0.3/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
Copied: tags/openutils-dbmigration-0.3 (from rev 283, trunk/openutils-dbmigration)
Deleted: tags/openutils-dbmigration-0.3/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2007-02-22 14:15:58 UTC (rev 283)
+++ tags/openutils-dbmigration-0.3/pom.xml 2007-02-26 22:16:09 UTC (rev 311)
@@ -1,87 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-dbmigration</artifactId>
- <name>openutils db migration framework</name>
- <version>1.0-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>poi</groupId>
- <artifactId>poi</artifactId>
- <version>2.5.1-final-20040804</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-dbmigration-0.3/pom.xml (from rev 310, trunk/openutils-dbmigration/pom.xml)
===================================================================
--- tags/openutils-dbmigration-0.3/pom.xml (rev 0)
+++ tags/openutils-dbmigration-0.3/pom.xml 2007-02-26 22:16:09 UTC (rev 311)
@@ -0,0 +1,93 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-dbmigration</artifactId>
+ <name>openutils db migration framework</name>
+ <version>0.3</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>2.5.1-final-20040804</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.3</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.3</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-dbmigration-0.3</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: tags/openutils-dbmigration-0.3/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java 2007-02-22 14:15:58 UTC (rev 283)
+++ tags/openutils-dbmigration-0.3/src/main/java/it/openutils/migration/DbSetupManagerImpl.java 2007-02-26 22:16:09 UTC (rev 311)
@@ -1,202 +0,0 @@
-/*
- * Copyright (c) Openmind. All rights reserved. http://www.openmindonline.it
- */
-package it.openutils.migration;
-
-import it.openutils.migration.task.setup.DbTask;
-import it.openutils.migration.task.update.DbUpdate;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.sql.DataSource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.dao.DataAccessException;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
-import org.springframework.transaction.support.TransactionTemplate;
-
-
-/**
- * DB setup manager: handles db setup and upgrade.
- * @author fgiust
- * @version $Id$
- */
-public class DbSetupManagerImpl implements DbSetupManager
-{
-
- /**
- * Logger.
- */
- private static Logger log = LoggerFactory.getLogger(DbSetupManagerImpl.class);
-
- private List<DbTask> setupTasks;
-
- private List<DbUpdate> updateTasks;
-
- private DataSource dataSource;
-
- private DbVersionManager versionManager;
-
- private TransactionTemplate transactionTemplate;
-
- private boolean enabled = true;
-
- /**
- * Sets the enabled.
- * @param enabled the enabled to set
- */
- public void setEnabled(boolean enabled)
- {
- this.enabled = enabled;
- }
-
- /**
- * Sets the versionManager.
- * @param versionManager the versionManager to set
- */
- public void setVersionManager(DbVersionManager versionManager)
- {
- this.versionManager = versionManager;
- }
-
- /**
- * Sets the transactionTemplate.
- * @param transactionTemplate the transactionTemplate to set
- */
- public void setTransactionTemplate(TransactionTemplate transactionTemplate)
- {
- this.transactionTemplate = transactionTemplate;
- }
-
- /**
- * Setter for <code>dataSource</code>.
- * @param dataSource The dataSource to set.
- */
- public void setDataSource(DataSource dataSource)
- {
- this.dataSource = dataSource;
- }
-
- /**
- * Sets the tasks.
- * @param setupTasks the tasks to set
- */
- public void setSetupTasks(List<DbTask> setupTasks)
- {
- this.setupTasks = setupTasks;
- }
-
- /**
- * Sets the updateTasks.
- * @param updateTasks the updateTasks to set
- */
- public void setUpdateTasks(List<DbUpdate> updateTasks)
- {
- this.updateTasks = updateTasks;
- }
-
- /**
- * @see it.openutils.dbupdate.DbSetupManager#updateDDL()
- */
- public void updateDDL()
- {
-
- if (!enabled)
- {
- log.info("DB migration is disabled, not running tasks.");
- }
-
- transactionTemplate.execute(new TransactionCallbackWithoutResult()
- {
-
- @Override
- protected void doInTransactionWithoutResult(TransactionStatus status)
- {
- if (setupTasks != null)
- {
- executeSetupTasks();
- }
- if (updateTasks != null)
- {
- executeUpdateTasks();
- }
- }
- });
-
- }
-
- /**
- *
- */
- private void executeSetupTasks()
- {
- log.info("Preparing db, checking {} setup tasks.", setupTasks.size());
- for (DbTask task : setupTasks)
- {
- log.info(task.getDescription());
- task.execute(dataSource);
- }
-
- }
-
- /**
- *
- */
- private void executeUpdateTasks()
- {
-
- int initialVersion = versionManager.getCurrentVersion();
- int currentVersion = initialVersion;
-
- Set<DbUpdate> sortedMigrations = new TreeSet<DbUpdate>(new Comparator<DbUpdate>()
- {
-
- public int compare(DbUpdate o1, DbUpdate o2)
- {
- return o1.getVersion() - o2.getVersion();
- }
-
- });
- sortedMigrations.addAll(updateTasks);
-
- log.info("Found {} migrations, looking for updates to run...", updateTasks.size());
- for (DbUpdate update : sortedMigrations)
- {
- if (update.getVersion() > currentVersion)
- {
- currentVersion = update.getVersion();
-
- log.info("Preparing migration to version {}. {}", update.getVersion(), update.getDescription());
- try
- {
- update.execute(dataSource);
- }
- catch (DataAccessException e)
- {
- log.error("\n***********\n\n\nDatabase upgrade from version "
- + initialVersion
- + " to version "
- + currentVersion
- + " FAILED!\n\n\n***********\n", e);
- }
- versionManager.setNewVersion(currentVersion);
- }
- }
- if (currentVersion != initialVersion)
- {
- log.info("Database upgraded from version {} to version {}", initialVersion, currentVersion);
- }
- else
- {
- log.info("No Database upgrade is needed. Current version is {} ", initialVersion);
- }
- // org.springframework.jdbc.BadSqlGrammarException:
- // java.sql.SQLException: ORA-00959: tablespace 'XDM_DATA' inesistente
-
- }
-}
Copied: tags/openutils-dbmigration-0.3/src/main/java/it/openutils/migration/DbSetupManagerImpl.java (from rev 309, trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java)
===================================================================
--- tags/openutils-dbmigration-0.3/src/main/java/it/openutils/migration/DbSetupManagerImpl.java (rev 0)
+++ tags/openutils-dbmigration-0.3/src/main/java/it/openutils/migration/DbSetupManagerImpl.java 2007-02-26 22:16:09 UTC (rev 311)
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) Openmind. All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration;
+
+import it.openutils.migration.task.setup.DbTask;
+import it.openutils.migration.task.update.DbUpdate;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.sql.DataSource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataAccessException;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+
+
+/**
+ * DB setup manager: handles db setup and upgrade.
+ * @author fgiust
+ * @version $Id$
+ */
+public class DbSetupManagerImpl implements DbSetupManager
+{
+
+ /**
+ * Logger.
+ */
+ private static Logger log = LoggerFactory.getLogger(DbSetupManagerImpl.class);
+
+ private List<DbTask> setupTasks;
+
+ private List<DbUpdate> updateTasks;
+
+ private DataSource dataSource;
+
+ private DbVersionManager versionManager;
+
+ private TransactionTemplate transactionTemplate;
+
+ private boolean enabled = true;
+
+ /**
+ * Sets the enabled.
+ * @param enabled the enabled to set
+ */
+ public void setEnabled(boolean enabled)
+ {
+ this.enabled = enabled;
+ }
+
+ /**
+ * Sets the versionManager.
+ * @param versionManager the versionManager to set
+ */
+ public void setVersionManager(DbVersionManager versionManager)
+ {
+ this.versionManager = versionManager;
+ }
+
+ /**
+ * Sets the transactionTemplate.
+ * @param transactionTemplate the transactionTemplate to set
+ */
+ public void setTransactionTemplate(TransactionTemplate transactionTemplate)
+ {
+ this.transactionTemplate = transactionTemplate;
+ }
+
+ /**
+ * Setter for <code>dataSource</code>.
+ * @param dataSource The dataSource to set.
+ */
+ public void setDataSource(DataSource dataSource)
+ {
+ this.dataSource = dataSource;
+ }
+
+ /**
+ * Sets the tasks.
+ * @param setupTasks the tasks to set
+ */
+ public void setSetupTasks(List<DbTask> setupTasks)
+ {
+ this.setupTasks = setupTasks;
+ }
+
+ /**
+ * Sets the updateTasks.
+ * @param updateTasks the updateTasks to set
+ */
+ public void setUpdateTasks(List<DbUpdate> updateTasks)
+ {
+ this.updateTasks = updateTasks;
+ }
+
+ /**
+ * @see it.openutils.dbupdate.DbSetupManager#updateDDL()
+ */
+ public void updateDDL()
+ {
+
+ if (!enabled)
+ {
+ log.info("DB migration is disabled, not running tasks.");
+ return;
+ }
+
+ transactionTemplate.execute(new TransactionCallbackWithoutResult()
+ {
+
+ @Override
+ protected void doInTransactionWithoutResult(TransactionStatus status)
+ {
+ if (setupTasks != null)
+ {
+ executeSetupTasks();
+ }
+ if (updateTasks != null)
+ {
+ executeUpdateTasks();
+ }
+ }
+ });
+
+ }
+
+ /**
+ *
+ */
+ private void executeSetupTasks()
+ {
+ log.info("Preparing db, checking {} setup tasks.", setupTasks.size());
+ for (DbTask task : setupTasks)
+ {
+ log.info(task.getDescription());
+ task.execute(dataSource);
+ }
+
+ }
+
+ /**
+ *
+ */
+ private void executeUpdateTasks()
+ {
+
+ int initialVersion = versionManager.getCurrentVersion();
+ int currentVersion = initialVersion;
+
+ Set<DbUpdate> sortedMigrations = new TreeSet<DbUpdate>(new Comparator<DbUpdate>()
+ {
+
+ public int compare(DbUpdate o1, DbUpdate o2)
+ {
+ return o1.getVersion() - o2.getVersion();
+ }
+
+ });
+ sortedMigrations.addAll(updateTasks);
+
+ log.info("Found {} migrations, looking for updates to run...", updateTasks.size());
+ for (DbUpdate update : sortedMigrations)
+ {
+ if (update.getVersion() > currentVersion)
+ {
+ currentVersion = update.getVersion();
+
+ log.info("Preparing migration to version {}. {}", update.getVersion(), update.getDescription());
+ try
+ {
+ update.execute(dataSource);
+ }
+ catch (DataAccessException e)
+ {
+ log.error("\n***********\n\n\nDatabase upgrade from version "
+ + initialVersion
+ + " to version "
+ + currentVersion
+ + " FAILED!\n\n\n***********\n", e);
+ }
+ versionManager.setNewVersion(currentVersion);
+ }
+ }
+ if (currentVersion != initialVersion)
+ {
+ log.info("Database upgraded from version {} to version {}", initialVersion, currentVersion);
+ }
+ else
+ {
+ log.info("No Database upgrade is needed. Current version is {} ", initialVersion);
+ }
+ // org.springframework.jdbc.BadSqlGrammarException:
+ // java.sql.SQLException: ORA-00959: tablespace 'XDM_DATA' inesistente
+
+ }
+}
Deleted: tags/openutils-dbmigration-0.3/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2007-02-22 14:15:58 UTC (rev 283)
+++ tags/openutils-dbmigration-0.3/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2007-02-26 22:16:09 UTC (rev 311)
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) Openmind. All rights reserved. http://www.openmindonline.it
- */
-package it.openutils.migration.task.setup;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.io.Resource;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.jdbc.BadSqlGrammarException;
-import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-
-/**
- * @author fgiust
- * @version $Id$
- */
-public class ExcelConfigurationTask extends BaseDbTask implements DbTask
-{
-
- /**
- * Logger.
- */
- private Logger log = LoggerFactory.getLogger(ScriptBasedUnconditionalTask.class);
-
- private Resource script;
-
- private Map<String, ExcelConfigurationTask.QueryConfig> config;
-
- /**
- * Sets the script.
- * @param script the script to set
- */
- public void setScript(Resource script)
- {
- this.script = script;
- }
-
- /**
- * Sets the config.
- * @param config the config to set
- */
- public void setConfig(Map<String, ExcelConfigurationTask.QueryConfig> config)
- {
- this.config = config;
- }
-
- /**
- * {@inheritDoc}
- */
- public void execute(DataSource dataSource)
- {
- if (script == null || !script.exists())
- {
- log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
- return;
- }
-
- InputStream is = null;
- try
- {
- is = script.getInputStream();
- POIFSFileSystem fs = new POIFSFileSystem(is);
- HSSFWorkbook hssfworkbook = new HSSFWorkbook(fs);
- int sheetNums = hssfworkbook.getNumberOfSheets();
- for (int j = 0; j < sheetNums; j++)
- {
- HSSFSheet sheet = hssfworkbook.getSheetAt(j);
- String tableName = hssfworkbook.getSheetName(j);
-
- QueryConfig conf = config.get(tableName);
- if (conf == null)
- {
- log.error("Unable to handle table {}", tableName);
- continue;
- }
- processSheet(sheet, tableName, conf, dataSource);
-
- }
-
- }
- catch (IOException e)
- {
- log.error(e.getMessage(), e);
- }
- finally
- {
- IOUtils.closeQuietly(is);
- }
-
- }
-
- /**
- * @param sheet
- * @param tableName
- */
- private void processSheet(HSSFSheet sheet, final String tableName, QueryConfig con, DataSource dataSource)
- {
- final List<String> columns = new ArrayList<String>();
-
- HSSFRow row = sheet.getRow(0);
- for (short k = 0; k < row.getLastCellNum(); k++)
- {
- String columnName = row.getCell(k).getStringCellValue();
- if (StringUtils.isNotBlank(columnName))
- {
- columns.add(StringUtils.trim(columnName));
- }
- else
- {
- break;
- }
- }
-
- log.debug("Table: {}, Columns: {}", tableName, columns);
-
- final List<Integer> types = new ArrayList<Integer>();
-
- boolean result = (Boolean) new JdbcTemplate(dataSource).execute(new ConnectionCallback()
- {
-
- public Object doInConnection(Connection con) throws SQLException, DataAccessException
- {
- for (String column : columns)
- {
- ResultSet res = con.getMetaData().getColumns(null, null, tableName, column);
- if (res.next())
- {
- types.add(res.getInt("DATA_TYPE"));
- }
- else
- {
- log.warn("Unable to determine type for column '{}' in table '{}'", column, tableName);
- return false;
- }
- res.close();
- }
- return true;
- }
- });
-
- if (!result)
- {
- log.warn("Skipping sheet {} ", tableName);
- }
-
- String checkStatement = StringUtils.remove(StringUtils.trim(con.getCheckQuery()), "\n");
- String insertStatement = StringUtils.remove(StringUtils.trim(con.getInsertQuery()), "\n");
-
- processRecords(
- sheet,
- columns,
- ArrayUtils.toPrimitive(types.toArray(new Integer[types.size()]), Types.NULL),
- checkStatement,
- insertStatement,
- dataSource,
- tableName);
- }
-
- /**
- * @param sheet
- * @param columns
- * @param checkStatement
- * @param insertStatement
- */
- private void processRecords(HSSFSheet sheet, List<String> columns, int[] types, String checkStatement,
- String insertStatement, DataSource dataSource, String tableName)
- {
- JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
- int checkNum = StringUtils.countMatches(checkStatement, "?");
- int insertNum = StringUtils.countMatches(insertStatement, "?");
-
- HSSFRow row;
- for (short rowNum = 1; rowNum <= sheet.getLastRowNum(); rowNum++)
- {
- row = sheet.getRow(rowNum);
- if (row == null)
- {
- return;
- }
-
- List<String> values = new ArrayList<String>();
-
- for (short k = 0; k < columns.size() && k <= row.getLastCellNum(); k++)
- {
- HSSFCell cell = row.getCell(k);
- String value = null;
-
- if (cell == null)
- {
- value = StringUtils.EMPTY;
- }
- else if (cell.getCellType() == HSSFCell.CELL_TYPE_STRING)
- {
- value = cell.getStringCellValue();
- }
- else if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC)
- {
- double valueDouble = cell.getNumericCellValue();
- // when need to really check if it is a double or an int
- double fraction = valueDouble % 1;
- if (fraction == 0)
- {
- value = Integer.toString((int) valueDouble);
- }
- else
- {
- value = Double.toString(valueDouble);
- }
- }
-
- if (StringUtils.isEmpty(value))
- {
- value = StringUtils.EMPTY;
- }
-
- if ("<NULL>".equalsIgnoreCase(value))
- {
- value = null;
- }
-
- values.add(value);
- }
-
- Object[] checkParams = ArrayUtils.subarray(values.toArray(), 0, checkNum);
- for (int i = 0; i < checkParams.length; i++)
- {
- if (StringUtils.isEmpty((String) checkParams[i]))
- {
- return;
- }
- }
-
- int existing;
- try
- {
- existing = jdbcTemplate.queryForInt(checkStatement, checkParams);
- }
- catch (BadSqlGrammarException bsge)
- {
- log.error("Error executing check query, current sheet will be skipped. {} Query in error: {}", bsge
- .getMessage(), checkStatement);
- return;
- }
-
- if (existing == 0)
- {
- Object[] insertParams = ArrayUtils.subarray(values.toArray(), 0, insertNum);
- int[] insertTypes = ArrayUtils.subarray(types, 0, insertNum);
- if (log.isDebugEnabled())
- {
- log.debug("Missing record with key {}; inserting {}", ArrayUtils.toString(checkParams), ArrayUtils
- .toString(insertParams));
- }
-
- if (insertParams.length != insertTypes.length)
- {
- log.warn("Invalid number of param/type for table {}. Params: {}, types: {}", new Object[]{
- tableName,
- insertParams.length,
- insertTypes.length });
- }
-
- try
- {
- jdbcTemplate.update(insertStatement, insertParams, insertTypes);
- }
- catch (DataIntegrityViolationException bsge)
- {
- log
- .error(
- "Error executing insert, record at {}:{} will be skipped. Query in error: '{}', values: {}. Error message: {}",
- new Object[]{
- tableName,
- rowNum + 1,
- insertStatement,
- ArrayUtils.toString(insertParams),
- bsge.getMessage() });
- continue;
- }
- }
-
- }
- }
-
- /**
- * @author fgiust
- * @version $Id$
- */
- public static class QueryConfig
- {
-
- private String checkQuery;
-
- private String insertQuery;
-
- /**
- * Returns the checkQuery.
- * @return the checkQuery
- */
- public String getCheckQuery()
- {
- return checkQuery;
- }
-
- /**
- * Sets the checkQuery.
- * @param checkQuery the checkQuery to set
- */
- public void setCheckQuery(String checkQuery)
- {
- this.checkQuery = checkQuery;
- }
-
- /**
- * Returns the insertQuery.
- * @return the insertQuery
- */
- public String getInsertQuery()
- {
- return insertQuery;
- }
-
- /**
- * Sets the insertQuery.
- * @param insertQuery the insertQuery to set
- */
- public void setInsertQuery(String insertQuery)
- {
- this.insertQuery = insertQuery;
- }
- }
-}
Copied: tags/openutils-dbmigration-0.3/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java (from rev 308, trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java)
===================================================================
--- tags/openutils-dbmigration-0.3/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java (rev 0)
+++ tags/openutils-dbmigration-0.3/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2007-02-26 22:16:09 UTC (rev 311)
@@ -0,0 +1,359 @@
+/*
+ * Copyright (c) Openmind. All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration.task.setup;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.Resource;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.jdbc.BadSqlGrammarException;
+import org.springframework.jdbc.core.ConnectionCallback;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class ExcelConfigurationTask extends BaseDbTask implements DbTask
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(ScriptBasedUnconditionalTask.class);
+
+ private Resource script;
+
+ private Map<String, ExcelConfigurationTask.QueryConfig> config;
+
+ /**
+ * Sets the script.
+ * @param script the script to set
+ */
+ public void setScript(Resource script)
+ {
+ this.script = script;
+ }
+
+ /**
+ * Sets the config.
+ * @param config the config to set
+ */
+ public void setConfig(Map<String, ExcelConfigurationTask.QueryConfig> config)
+ {
+ this.config = config;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void execute(DataSource dataSource)
+ {
+ if (script == null || !script.exists())
+ {
+ log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
+ return;
+ }
+
+ InputStream is = null;
+ try
+ {
+ is = script.getInputStream();
+ POIFSFileSystem fs = new POIFSFileSystem(is);
+ HSSFWorkbook hssfworkbook = new HSSFWorkbook(fs);
+ int sheetNums = hssfworkbook.getNumberOfSheets();
+ for (int j = 0; j < sheetNums; j++)
+ {
+ HSSFSheet sheet = hssfworkbook.getSheetAt(j);
+ String tableName = hssfworkbook.getSheetName(j);
+
+ QueryConfig conf = config.get(tableName);
+ if (conf == null)
+ {
+ log.error("Unable to handle table {}", tableName);
+ continue;
+ }
+ processSheet(sheet, tableName, conf, dataSource);
+
+ }
+
+ }
+ catch (IOException e)
+ {
+ log.error(e.getMessage(), e);
+ }
+ finally
+ {
+ IOUtils.closeQuietly(is);
+ }
+
+ }
+
+ /**
+ * @param sheet
+ * @param tableName
+ */
+ private void processSheet(HSSFSheet sheet, final String tableName, QueryConfig con, DataSource dataSource)
+ {
+ final List<String> columns = new ArrayList<String>();
+
+ HSSFRow row = sheet.getRow(0);
+ for (short k = 0; k < row.getLastCellNum(); k++)
+ {
+ HSSFCell cell = row.getCell(k);
+ if (cell != null)
+ {
+ String columnName = cell.getStringCellValue();
+ if (StringUtils.isNotBlank(columnName))
+ {
+ columns.add(StringUtils.trim(columnName));
+ }
+ else
+ {
+ break;
+ }
+ }
+ }
+
+ log.debug("Table: {}, Columns: {}", tableName, columns);
+
+ final List<Integer> types = new ArrayList<Integer>();
+
+ boolean result = (Boolean) new JdbcTemplate(dataSource).execute(new ConnectionCallback()
+ {
+
+ public Object doInConnection(Connection con) throws SQLException, DataAccessException
+ {
+ for (String column : columns)
+ {
+ ResultSet res = con.getMetaData().getColumns(null, null, tableName, column);
+ if (res.next())
+ {
+ types.add(res.getInt("DATA_TYPE"));
+ }
+ else
+ {
+ log.warn("Unable to determine type for column '{}' in table '{}'", column, tableName);
+ return false;
+ }
+ res.close();
+ }
+ return true;
+ }
+ });
+
+ if (!result)
+ {
+ log.warn("Skipping sheet {} ", tableName);
+ }
+
+ String checkStatement = StringUtils.remove(StringUtils.trim(con.getCheckQuery()), "\n");
+ String insertStatement = StringUtils.remove(StringUtils.trim(con.getInsertQuery()), "\n");
+
+ processRecords(
+ sheet,
+ columns,
+ ArrayUtils.toPrimitive(types.toArray(new Integer[types.size()]), Types.NULL),
+ checkStatement,
+ insertStatement,
+ dataSource,
+ tableName);
+ }
+
+ /**
+ * @param sheet
+ * @param columns
+ * @param checkStatement
+ * @param insertStatement
+ */
+ private void processRecords(HSSFSheet sheet, List<String> columns, int[] types, String checkStatement,
+ String insertStatement, DataSource dataSource, String tableName)
+ {
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+ int checkNum = StringUtils.countMatches(checkStatement, "?");
+ int insertNum = StringUtils.countMatches(insertStatement, "?");
+
+ HSSFRow row;
+ for (short rowNum = 1; rowNum <= sheet.getLastRowNum(); rowNum++)
+ {
+ row = sheet.getRow(rowNum);
+ if (row == null)
+ {
+ return;
+ }
+
+ List<String> values = new ArrayList<String>();
+
+ for (short k = 0; k < columns.size() && k <= row.getLastCellNum(); k++)
+ {
+ HSSFCell cell = row.getCell(k);
+ String value = null;
+
+ if (cell == null)
+ {
+ value = StringUtils.EMPTY;
+ }
+ else if (cell.getCellType() == HSSFCell.CELL_TYPE_STRING)
+ {
+ value = cell.getStringCellValue();
+ }
+ else if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC)
+ {
+ double valueDouble = cell.getNumericCellValue();
+ // when need to really check if it is a double or an int
+ double fraction = valueDouble % 1;
+ if (fraction == 0)
+ {
+ value = Integer.toString((int) valueDouble);
+ }
+ else
+ {
+ value = Double.toString(valueDouble);
+ }
+ }
+
+ if (StringUtils.isEmpty(value))
+ {
+ value = StringUtils.EMPTY;
+ }
+
+ if ("<NULL>".equalsIgnoreCase(value))
+ {
+ value = null;
+ }
+
+ values.add(value);
+ }
+
+ Object[] checkParams = ArrayUtils.subarray(values.toArray(), 0, checkNum);
+ for (int i = 0; i < checkParams.length; i++)
+ {
+ if (StringUtils.isEmpty((String) checkParams[i]))
+ {
+ return;
+ }
+ }
+
+ int existing;
+ try
+ {
+ existing = jdbcTemplate.queryForInt(checkStatement, checkParams);
+ }
+ catch (BadSqlGrammarException bsge)
+ {
+ log.error("Error executing check query, current sheet will be skipped. {} Query in error: {}", bsge
+ .getMessage(), checkStatement);
+ return;
+ }
+
+ if (existing == 0)
+ {
+ Object[] insertParams = ArrayUtils.subarray(values.toArray(), 0, insertNum);
+ int[] insertTypes = ArrayUtils.subarray(types, 0, insertNum);
+ if (log.isDebugEnabled())
+ {
+ log.debug("Missing record with key {}; inserting {}", ArrayUtils.toString(checkParams), ArrayUtils
+ .toString(insertParams));
+ }
+
+ if (insertParams.length != insertTypes.length)
+ {
+ log.warn("Invalid number of param/type for table {}. Params: {}, types: {}", new Object[]{
+ tableName,
+ insertParams.length,
+ insertTypes.length });
+ }
+
+ try
+ {
+ jdbcTemplate.update(insertStatement, insertParams, insertTypes);
+ }
+ catch (DataIntegrityViolationException bsge)
+ {
+ log
+ .error(
+ "Error executing insert, record at {}:{} will be skipped. Query in error: '{}', values: {}. Error message: {}",
+ new Object[]{
+ tableName,
+ rowNum + 1,
+ insertStatement,
+ ArrayUtils.toString(insertParams),
+ bsge.getMessage() });
+ continue;
+ }
+ }
+
+ }
+ }
+
+ /**
+ * @author fgiust
+ * @version $Id$
+ */
+ public static class QueryConfig
+ {
+
+ private String checkQuery;
+
+ private String insertQuery;
+
+ /**
+ * Returns the checkQuery.
+ * @return the checkQuery
+ */
+ public String getCheckQuery()
+ {
+ return checkQuery;
+ }
+
+ /**
+ * Sets the checkQuery.
+ * @param checkQuery the checkQuery to set
+ */
+ public void setCheckQuery(String checkQuery)
+ {
+ this.checkQuery = checkQuery;
+ }
+
+ /**
+ * Returns the insertQuery.
+ * @return the insertQuery
+ */
+ public String getInsertQuery()
+ {
+ return insertQuery;
+ }
+
+ /**
+ * Sets the insertQuery.
+ * @param insertQuery the insertQuery to set
+ */
+ public void setInsertQuery(String insertQuery)
+ {
+ this.insertQuery = insertQuery;
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-03-11 17:46:55
|
Revision: 317
http://svn.sourceforge.net/openutils/?rev=317&view=rev
Author: fgiust
Date: 2007-03-11 10:46:46 -0700 (Sun, 11 Mar 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-dbmigration-0.4
Added Paths:
-----------
tags/openutils-dbmigration-0.4/
tags/openutils-dbmigration-0.4/pom.xml
tags/openutils-dbmigration-0.4/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
Removed Paths:
-------------
tags/openutils-dbmigration-0.4/pom.xml
tags/openutils-dbmigration-0.4/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
Copied: tags/openutils-dbmigration-0.4 (from rev 314, trunk/openutils-dbmigration)
Deleted: tags/openutils-dbmigration-0.4/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2007-03-05 10:59:55 UTC (rev 314)
+++ tags/openutils-dbmigration-0.4/pom.xml 2007-03-11 17:46:46 UTC (rev 317)
@@ -1,87 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-dbmigration</artifactId>
- <name>openutils db migration framework</name>
- <version>0.4-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>poi</groupId>
- <artifactId>poi</artifactId>
- <version>2.5.1-final-20040804</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-dbmigration-0.4/pom.xml (from rev 316, trunk/openutils-dbmigration/pom.xml)
===================================================================
--- tags/openutils-dbmigration-0.4/pom.xml (rev 0)
+++ tags/openutils-dbmigration-0.4/pom.xml 2007-03-11 17:46:46 UTC (rev 317)
@@ -0,0 +1,93 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-dbmigration</artifactId>
+ <name>openutils db migration framework</name>
+ <version>0.4</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>2.5.1-final-20040804</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.4</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.4</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-dbmigration-0.4</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: tags/openutils-dbmigration-0.4/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2007-03-05 10:59:55 UTC (rev 314)
+++ tags/openutils-dbmigration-0.4/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2007-03-11 17:46:46 UTC (rev 317)
@@ -1,359 +0,0 @@
-/*
- * Copyright (c) Openmind. All rights reserved. http://www.openmindonline.it
- */
-package it.openutils.migration.task.setup;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.io.Resource;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.jdbc.BadSqlGrammarException;
-import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-
-/**
- * @author fgiust
- * @version $Id$
- */
-public class ExcelConfigurationTask extends BaseDbTask implements DbTask
-{
-
- /**
- * Logger.
- */
- private Logger log = LoggerFactory.getLogger(ScriptBasedUnconditionalTask.class);
-
- private Resource script;
-
- private Map<String, ExcelConfigurationTask.QueryConfig> config;
-
- /**
- * Sets the script.
- * @param script the script to set
- */
- public void setScript(Resource script)
- {
- this.script = script;
- }
-
- /**
- * Sets the config.
- * @param config the config to set
- */
- public void setConfig(Map<String, ExcelConfigurationTask.QueryConfig> config)
- {
- this.config = config;
- }
-
- /**
- * {@inheritDoc}
- */
- public void execute(DataSource dataSource)
- {
- if (script == null || !script.exists())
- {
- log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
- return;
- }
-
- InputStream is = null;
- try
- {
- is = script.getInputStream();
- POIFSFileSystem fs = new POIFSFileSystem(is);
- HSSFWorkbook hssfworkbook = new HSSFWorkbook(fs);
- int sheetNums = hssfworkbook.getNumberOfSheets();
- for (int j = 0; j < sheetNums; j++)
- {
- HSSFSheet sheet = hssfworkbook.getSheetAt(j);
- String tableName = hssfworkbook.getSheetName(j);
-
- QueryConfig conf = config.get(tableName);
- if (conf == null)
- {
- log.error("Unable to handle table {}", tableName);
- continue;
- }
- processSheet(sheet, tableName, conf, dataSource);
-
- }
-
- }
- catch (IOException e)
- {
- log.error(e.getMessage(), e);
- }
- finally
- {
- IOUtils.closeQuietly(is);
- }
-
- }
-
- /**
- * @param sheet
- * @param tableName
- */
- private void processSheet(HSSFSheet sheet, final String tableName, QueryConfig con, DataSource dataSource)
- {
- final List<String> columns = new ArrayList<String>();
-
- HSSFRow row = sheet.getRow(0);
- for (short k = 0; k < row.getLastCellNum(); k++)
- {
- HSSFCell cell = row.getCell(k);
- if (cell != null)
- {
- String columnName = cell.getStringCellValue();
- if (StringUtils.isNotBlank(columnName))
- {
- columns.add(StringUtils.trim(columnName));
- }
- else
- {
- break;
- }
- }
- }
-
- log.debug("Table: {}, Columns: {}", tableName, columns);
-
- final List<Integer> types = new ArrayList<Integer>();
-
- boolean result = (Boolean) new JdbcTemplate(dataSource).execute(new ConnectionCallback()
- {
-
- public Object doInConnection(Connection con) throws SQLException, DataAccessException
- {
- for (String column : columns)
- {
- ResultSet res = con.getMetaData().getColumns(null, null, tableName, column);
- if (res.next())
- {
- types.add(res.getInt("DATA_TYPE"));
- }
- else
- {
- log.warn("Unable to determine type for column '{}' in table '{}'", column, tableName);
- return false;
- }
- res.close();
- }
- return true;
- }
- });
-
- if (!result)
- {
- log.warn("Skipping sheet {} ", tableName);
- }
-
- String checkStatement = StringUtils.remove(StringUtils.trim(con.getCheckQuery()), "\n");
- String insertStatement = StringUtils.remove(StringUtils.trim(con.getInsertQuery()), "\n");
-
- processRecords(
- sheet,
- columns,
- ArrayUtils.toPrimitive(types.toArray(new Integer[types.size()]), Types.NULL),
- checkStatement,
- insertStatement,
- dataSource,
- tableName);
- }
-
- /**
- * @param sheet
- * @param columns
- * @param checkStatement
- * @param insertStatement
- */
- private void processRecords(HSSFSheet sheet, List<String> columns, int[] types, String checkStatement,
- String insertStatement, DataSource dataSource, String tableName)
- {
- JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
- int checkNum = StringUtils.countMatches(checkStatement, "?");
- int insertNum = StringUtils.countMatches(insertStatement, "?");
-
- HSSFRow row;
- for (short rowNum = 1; rowNum <= sheet.getLastRowNum(); rowNum++)
- {
- row = sheet.getRow(rowNum);
- if (row == null)
- {
- return;
- }
-
- List<String> values = new ArrayList<String>();
-
- for (short k = 0; k < columns.size() && k <= row.getLastCellNum(); k++)
- {
- HSSFCell cell = row.getCell(k);
- String value = null;
-
- if (cell == null)
- {
- value = StringUtils.EMPTY;
- }
- else if (cell.getCellType() == HSSFCell.CELL_TYPE_STRING)
- {
- value = cell.getStringCellValue();
- }
- else if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC)
- {
- double valueDouble = cell.getNumericCellValue();
- // when need to really check if it is a double or an int
- double fraction = valueDouble % 1;
- if (fraction == 0)
- {
- value = Integer.toString((int) valueDouble);
- }
- else
- {
- value = Double.toString(valueDouble);
- }
- }
-
- if (StringUtils.isEmpty(value))
- {
- value = StringUtils.EMPTY;
- }
-
- if ("<NULL>".equalsIgnoreCase(value))
- {
- value = null;
- }
-
- values.add(value);
- }
-
- Object[] checkParams = ArrayUtils.subarray(values.toArray(), 0, checkNum);
- for (int i = 0; i < checkParams.length; i++)
- {
- if (StringUtils.isEmpty((String) checkParams[i]))
- {
- return;
- }
- }
-
- int existing;
- try
- {
- existing = jdbcTemplate.queryForInt(checkStatement, checkParams);
- }
- catch (BadSqlGrammarException bsge)
- {
- log.error("Error executing check query, current sheet will be skipped. {} Query in error: {}", bsge
- .getMessage(), checkStatement);
- return;
- }
-
- if (existing == 0)
- {
- Object[] insertParams = ArrayUtils.subarray(values.toArray(), 0, insertNum);
- int[] insertTypes = ArrayUtils.subarray(types, 0, insertNum);
- if (log.isDebugEnabled())
- {
- log.debug("Missing record with key {}; inserting {}", ArrayUtils.toString(checkParams), ArrayUtils
- .toString(insertParams));
- }
-
- if (insertParams.length != insertTypes.length)
- {
- log.warn("Invalid number of param/type for table {}. Params: {}, types: {}", new Object[]{
- tableName,
- insertParams.length,
- insertTypes.length });
- }
-
- try
- {
- jdbcTemplate.update(insertStatement, insertParams, insertTypes);
- }
- catch (DataIntegrityViolationException bsge)
- {
- log
- .error(
- "Error executing insert, record at {}:{} will be skipped. Query in error: '{}', values: {}. Error message: {}",
- new Object[]{
- tableName,
- rowNum + 1,
- insertStatement,
- ArrayUtils.toString(insertParams),
- bsge.getMessage() });
- continue;
- }
- }
-
- }
- }
-
- /**
- * @author fgiust
- * @version $Id$
- */
- public static class QueryConfig
- {
-
- private String checkQuery;
-
- private String insertQuery;
-
- /**
- * Returns the checkQuery.
- * @return the checkQuery
- */
- public String getCheckQuery()
- {
- return checkQuery;
- }
-
- /**
- * Sets the checkQuery.
- * @param checkQuery the checkQuery to set
- */
- public void setCheckQuery(String checkQuery)
- {
- this.checkQuery = checkQuery;
- }
-
- /**
- * Returns the insertQuery.
- * @return the insertQuery
- */
- public String getInsertQuery()
- {
- return insertQuery;
- }
-
- /**
- * Sets the insertQuery.
- * @param insertQuery the insertQuery to set
- */
- public void setInsertQuery(String insertQuery)
- {
- this.insertQuery = insertQuery;
- }
- }
-}
Copied: tags/openutils-dbmigration-0.4/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java (from rev 315, trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java)
===================================================================
--- tags/openutils-dbmigration-0.4/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java (rev 0)
+++ tags/openutils-dbmigration-0.4/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2007-03-11 17:46:46 UTC (rev 317)
@@ -0,0 +1,494 @@
+/*
+ * Copyright (c) Openmind. All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration.task.setup;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.Resource;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.jdbc.BadSqlGrammarException;
+import org.springframework.jdbc.core.ColumnMapRowMapper;
+import org.springframework.jdbc.core.ConnectionCallback;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class ExcelConfigurationTask extends BaseDbTask implements DbTask
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(ScriptBasedUnconditionalTask.class);
+
+ private Resource script;
+
+ private Map<String, ExcelConfigurationTask.QueryConfig> config;
+
+ /**
+ * Sets the script.
+ * @param script the script to set
+ */
+ public void setScript(Resource script)
+ {
+ this.script = script;
+ }
+
+ /**
+ * Sets the config.
+ * @param config the config to set
+ */
+ public void setConfig(Map<String, ExcelConfigurationTask.QueryConfig> config)
+ {
+ this.config = config;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void execute(DataSource dataSource)
+ {
+ if (script == null || !script.exists())
+ {
+ log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
+ return;
+ }
+
+ InputStream is = null;
+ try
+ {
+ is = script.getInputStream();
+ POIFSFileSystem fs = new POIFSFileSystem(is);
+ HSSFWorkbook hssfworkbook = new HSSFWorkbook(fs);
+ int sheetNums = hssfworkbook.getNumberOfSheets();
+ for (int j = 0; j < sheetNums; j++)
+ {
+ HSSFSheet sheet = hssfworkbook.getSheetAt(j);
+ String tableName = hssfworkbook.getSheetName(j);
+
+ QueryConfig conf = config.get(tableName);
+ if (conf == null)
+ {
+ log.error("Unable to handle table {}", tableName);
+ continue;
+ }
+ processSheet(sheet, tableName, conf, dataSource);
+
+ }
+
+ }
+ catch (IOException e)
+ {
+ log.error(e.getMessage(), e);
+ }
+ finally
+ {
+ IOUtils.closeQuietly(is);
+ }
+
+ }
+
+ /**
+ * @param sheet
+ * @param tableName
+ */
+ private void processSheet(HSSFSheet sheet, final String tableName, QueryConfig con, DataSource dataSource)
+ {
+ final List<String> columns = new ArrayList<String>();
+
+ HSSFRow row = sheet.getRow(0);
+ for (short k = 0; k < row.getLastCellNum(); k++)
+ {
+ HSSFCell cell = row.getCell(k);
+ if (cell != null)
+ {
+ String columnName = cell.getStringCellValue();
+ if (StringUtils.isNotBlank(columnName))
+ {
+ columns.add(StringUtils.trim(columnName));
+ }
+ else
+ {
+ break;
+ }
+ }
+ }
+
+ log.debug("Table: {}, Columns: {}", tableName, columns);
+
+ final List<Integer> types = new ArrayList<Integer>();
+
+ boolean result = (Boolean) new JdbcTemplate(dataSource).execute(new ConnectionCallback()
+ {
+
+ public Object doInConnection(Connection con) throws SQLException, DataAccessException
+ {
+ for (String column : columns)
+ {
+ ResultSet res = con.getMetaData().getColumns(null, null, tableName, column);
+ if (res.next())
+ {
+ types.add(res.getInt("DATA_TYPE"));
+ }
+ else
+ {
+ log.warn("Unable to determine type for column '{}' in table '{}'", column, tableName);
+ return false;
+ }
+ res.close();
+ }
+ return true;
+ }
+ });
+
+ if (!result)
+ {
+ log.warn("Skipping sheet {} ", tableName);
+ }
+
+ String checkStatement = StringUtils.remove(StringUtils.trim(con.getCheckQuery()), "\n");
+ String insertStatement = StringUtils.remove(StringUtils.trim(con.getInsertQuery()), "\n");
+ String selectStatement = StringUtils.remove(StringUtils.trim(con.getSelectQuery()), "\n");
+ String updateStatement = StringUtils.remove(StringUtils.trim(con.getUpdateQuery()), "\n");
+
+ processRecords(
+ sheet,
+ columns,
+ ArrayUtils.toPrimitive(types.toArray(new Integer[types.size()]), Types.NULL),
+ checkStatement,
+ insertStatement,
+ selectStatement,
+ updateStatement,
+ dataSource,
+ tableName);
+ }
+
+ /**
+ * @param sheet
+ * @param columns
+ * @param checkStatement
+ * @param insertStatement
+ * @param updateStatement
+ * @param selectStatement
+ */
+ private void processRecords(HSSFSheet sheet, List<String> columns, int[] types, String checkStatement,
+ String insertStatement, String selectStatement, String updateStatement, DataSource dataSource, String tableName)
+ {
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+ int checkNum = StringUtils.countMatches(checkStatement, "?");
+ int insertNum = StringUtils.countMatches(insertStatement, "?");
+ int selectNum = StringUtils.countMatches(selectStatement, "?");
+ int updateNum = StringUtils.countMatches(updateStatement, "?");
+
+ HSSFRow row;
+ for (short rowNum = 1; rowNum <= sheet.getLastRowNum(); rowNum++)
+ {
+ row = sheet.getRow(rowNum);
+ if (row == null)
+ {
+ return;
+ }
+
+ List<String> values = new ArrayList<String>();
+
+ for (short k = 0; k < columns.size() && k <= row.getLastCellNum(); k++)
+ {
+ HSSFCell cell = row.getCell(k);
+ String value = null;
+
+ if (cell == null)
+ {
+ value = StringUtils.EMPTY;
+ }
+ else if (cell.getCellType() == HSSFCell.CELL_TYPE_STRING)
+ {
+ value = cell.getStringCellValue();
+ }
+ else if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC)
+ {
+ double valueDouble = cell.getNumericCellValue();
+ // when need to really check if it is a double or an int
+ double fraction = valueDouble % 1;
+ if (fraction == 0)
+ {
+ value = Integer.toString((int) valueDouble);
+ }
+ else
+ {
+ value = Double.toString(valueDouble);
+ }
+ }
+
+ if (StringUtils.isEmpty(value))
+ {
+ value = StringUtils.EMPTY;
+ }
+
+ if ("<NULL>".equalsIgnoreCase(value))
+ {
+ value = null;
+ }
+
+ values.add(value);
+ }
+
+ Object[] checkParams = ArrayUtils.subarray(values.toArray(), 0, checkNum);
+ for (int i = 0; i < checkParams.length; i++)
+ {
+ if (StringUtils.isEmpty((String) checkParams[i]))
+ {
+ return;
+ }
+ }
+
+ int existing;
+ try
+ {
+ existing = jdbcTemplate.queryForInt(checkStatement, checkParams);
+ }
+ catch (BadSqlGrammarException bsge)
+ {
+ log.error("Error executing check query, current sheet will be skipped. {} Query in error: {}", bsge
+ .getMessage(), checkStatement);
+ return;
+ }
+
+ if (existing == 0)
+ {
+ Object[] insertParams = ArrayUtils.subarray(values.toArray(), 0, insertNum);
+ int[] insertTypes = ArrayUtils.subarray(types, 0, insertNum);
+ if (log.isDebugEnabled())
+ {
+ log.debug("Missing record with key {}; inserting {}", ArrayUtils.toString(checkParams), ArrayUtils
+ .toString(insertParams));
+ }
+
+ if (insertParams.length != insertTypes.length)
+ {
+ log.warn("Invalid number of param/type for table {}. Params: {}, types: {}", new Object[]{
+ tableName,
+ insertParams.length,
+ insertTypes.length });
+ }
+
+ try
+ {
+ jdbcTemplate.update(updateStatement, insertParams, insertTypes);
+ }
+ catch (DataIntegrityViolationException bsge)
+ {
+ log
+ .error(
+ "Error executing update, record at {}:{} will be skipped. Query in error: '{}', values: {}. Error message: {}",
+ new Object[]{
+ tableName,
+ rowNum + 1,
+ insertStatement,
+ ArrayUtils.toString(insertParams),
+ bsge.getMessage() });
+ continue;
+ }
+ }
+ else if (StringUtils.isNotBlank(updateStatement) && StringUtils.isNotBlank(selectStatement))
+ {
+ try
+ {
+ RowMapper rowMapper = new ColumnMapRowMapper();
+ Object[] selectParams = ArrayUtils.subarray(values.toArray(), 0, selectNum);
+ List selectResult = jdbcTemplate.query(selectStatement, selectParams, rowMapper);
+ Map<String, Object> fetchedColumns = (Map<String, Object>) selectResult.get(0);
+ int i = 0;
+ boolean updateNeeded = false;
+ for (String columnName : columns)
+ {
+ Object columnObject = fetchedColumns.get(columnName);
+ if (columnObject == null)
+ {
+ continue;
+ }
+ String columnValue = ObjectUtils.toString(fetchedColumns.get(columnName));
+ if (!StringUtils.equals(columnValue, values.get(i)))
+ {
+ updateNeeded = true;
+ break;
+ }
+ i++;
+ }
+ if (updateNeeded)
+ {
+ Object[] updateParams = ArrayUtils.subarray(values.toArray(), 0, updateNum);
+ int[] insertTypes = ArrayUtils.subarray(types, 0, insertNum);
+ if (log.isDebugEnabled())
+ {
+ log.debug(
+ "Missing record with key {}; updating {}",
+ ArrayUtils.toString(checkParams),
+ ArrayUtils.toString(updateParams));
+ }
+
+ if (updateParams.length != insertTypes.length)
+ {
+ log.warn("Invalid number of param/type for table {}. Params: {}, types: {}", new Object[]{
+ tableName,
+ updateParams.length,
+ insertTypes.length });
+ }
+
+ try
+ {
+ Object[] compoundUpdateParams = new Object[checkParams.length + updateParams.length];
+ System.arraycopy(updateParams, 0, compoundUpdateParams, 0, updateParams.length);
+ System.arraycopy(
+ checkParams,
+ 0,
+ compoundUpdateParams,
+ compoundUpdateParams.length - 1,
+ checkParams.length);
+ jdbcTemplate.update(updateStatement, compoundUpdateParams);
+ }
+ catch (DataIntegrityViolationException bsge)
+ {
+ log
+ .error(
+ "Error executing insert, record at {}:{} will be skipped. Query in error: '{}', values: {}. Error message: {}",
+ new Object[]{
+ tableName,
+ rowNum + 1,
+ insertStatement,
+ ArrayUtils.toString(updateParams),
+ bsge.getMessage() });
+ continue;
+ }
+ }
+ }
+ catch (BadSqlGrammarException bsge)
+ {
+ log
+ .error(
+ "Error executing query to load row values, current possible update of row will be skipped. {} Query in error: {}",
+ bsge.getMessage(),
+ checkStatement);
+ return;
+ }
+ // 1 check if it is the same
+ // 2 update only if they differ
+ }
+
+ }
+ }
+
+ /**
+ * @author fgiust
+ * @version $Id$
+ */
+ public static class QueryConfig
+ {
+
+ private String checkQuery;
+
+ private String insertQuery;
+
+ private String selectQuery;
+
+ private String updateQuery;
+
+ /**
+ * Returns the selectQuery.
+ * @return the selectQuery
+ */
+ public String getSelectQuery()
+ {
+ return selectQuery;
+ }
+
+ /**
+ * Sets the selectQuery.
+ * @param selectQuery the selectQuery to set
+ */
+ public void setSelectQuery(String selectQuery)
+ {
+ this.selectQuery = selectQuery;
+ }
+
+ /**
+ * Returns the checkQuery.
+ * @return the checkQuery
+ */
+ public String getCheckQuery()
+ {
+ return checkQuery;
+ }
+
+ /**
+ * Sets the checkQuery.
+ * @param checkQuery the checkQuery to set
+ */
+ public void setCheckQuery(String checkQuery)
+ {
+ this.checkQuery = checkQuery;
+ }
+
+ /**
+ * Returns the insertQuery.
+ * @return the insertQuery
+ */
+ public String getInsertQuery()
+ {
+ return insertQuery;
+ }
+
+ /**
+ * Sets the insertQuery.
+ * @param insertQuery the insertQuery to set
+ */
+ public void setInsertQuery(String insertQuery)
+ {
+ this.insertQuery = insertQuery;
+ }
+
+ /**
+ * Returns the updateQuery.
+ * @return the updateQuery
+ */
+ public String getUpdateQuery()
+ {
+ return updateQuery;
+ }
+
+ /**
+ * Sets the updateQuery.
+ * @param updateQuery the updateQuery to set
+ */
+ public void setUpdateQuery(String updateQuery)
+ {
+ this.updateQuery = updateQuery;
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-03-11 21:47:07
|
Revision: 321
http://svn.sourceforge.net/openutils/?rev=321&view=rev
Author: fgiust
Date: 2007-03-11 14:47:06 -0700 (Sun, 11 Mar 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-dbmigration-0.5
Added Paths:
-----------
tags/openutils-dbmigration-0.5/
tags/openutils-dbmigration-0.5/pom.xml
tags/openutils-dbmigration-0.5/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
Removed Paths:
-------------
tags/openutils-dbmigration-0.5/pom.xml
tags/openutils-dbmigration-0.5/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
Copied: tags/openutils-dbmigration-0.5 (from rev 314, trunk/openutils-dbmigration)
Deleted: tags/openutils-dbmigration-0.5/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2007-03-05 10:59:55 UTC (rev 314)
+++ tags/openutils-dbmigration-0.5/pom.xml 2007-03-11 21:47:06 UTC (rev 321)
@@ -1,87 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-dbmigration</artifactId>
- <name>openutils db migration framework</name>
- <version>0.4-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>poi</groupId>
- <artifactId>poi</artifactId>
- <version>2.5.1-final-20040804</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-dbmigration-0.5/pom.xml (from rev 320, trunk/openutils-dbmigration/pom.xml)
===================================================================
--- tags/openutils-dbmigration-0.5/pom.xml (rev 0)
+++ tags/openutils-dbmigration-0.5/pom.xml 2007-03-11 21:47:06 UTC (rev 321)
@@ -0,0 +1,93 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-dbmigration</artifactId>
+ <name>openutils db migration framework</name>
+ <version>0.5</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>2.5.1-final-20040804</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.5</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.5</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-dbmigration-0.5</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: tags/openutils-dbmigration-0.5/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2007-03-05 10:59:55 UTC (rev 314)
+++ tags/openutils-dbmigration-0.5/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2007-03-11 21:47:06 UTC (rev 321)
@@ -1,359 +0,0 @@
-/*
- * Copyright (c) Openmind. All rights reserved. http://www.openmindonline.it
- */
-package it.openutils.migration.task.setup;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.io.Resource;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.jdbc.BadSqlGrammarException;
-import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-
-/**
- * @author fgiust
- * @version $Id$
- */
-public class ExcelConfigurationTask extends BaseDbTask implements DbTask
-{
-
- /**
- * Logger.
- */
- private Logger log = LoggerFactory.getLogger(ScriptBasedUnconditionalTask.class);
-
- private Resource script;
-
- private Map<String, ExcelConfigurationTask.QueryConfig> config;
-
- /**
- * Sets the script.
- * @param script the script to set
- */
- public void setScript(Resource script)
- {
- this.script = script;
- }
-
- /**
- * Sets the config.
- * @param config the config to set
- */
- public void setConfig(Map<String, ExcelConfigurationTask.QueryConfig> config)
- {
- this.config = config;
- }
-
- /**
- * {@inheritDoc}
- */
- public void execute(DataSource dataSource)
- {
- if (script == null || !script.exists())
- {
- log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
- return;
- }
-
- InputStream is = null;
- try
- {
- is = script.getInputStream();
- POIFSFileSystem fs = new POIFSFileSystem(is);
- HSSFWorkbook hssfworkbook = new HSSFWorkbook(fs);
- int sheetNums = hssfworkbook.getNumberOfSheets();
- for (int j = 0; j < sheetNums; j++)
- {
- HSSFSheet sheet = hssfworkbook.getSheetAt(j);
- String tableName = hssfworkbook.getSheetName(j);
-
- QueryConfig conf = config.get(tableName);
- if (conf == null)
- {
- log.error("Unable to handle table {}", tableName);
- continue;
- }
- processSheet(sheet, tableName, conf, dataSource);
-
- }
-
- }
- catch (IOException e)
- {
- log.error(e.getMessage(), e);
- }
- finally
- {
- IOUtils.closeQuietly(is);
- }
-
- }
-
- /**
- * @param sheet
- * @param tableName
- */
- private void processSheet(HSSFSheet sheet, final String tableName, QueryConfig con, DataSource dataSource)
- {
- final List<String> columns = new ArrayList<String>();
-
- HSSFRow row = sheet.getRow(0);
- for (short k = 0; k < row.getLastCellNum(); k++)
- {
- HSSFCell cell = row.getCell(k);
- if (cell != null)
- {
- String columnName = cell.getStringCellValue();
- if (StringUtils.isNotBlank(columnName))
- {
- columns.add(StringUtils.trim(columnName));
- }
- else
- {
- break;
- }
- }
- }
-
- log.debug("Table: {}, Columns: {}", tableName, columns);
-
- final List<Integer> types = new ArrayList<Integer>();
-
- boolean result = (Boolean) new JdbcTemplate(dataSource).execute(new ConnectionCallback()
- {
-
- public Object doInConnection(Connection con) throws SQLException, DataAccessException
- {
- for (String column : columns)
- {
- ResultSet res = con.getMetaData().getColumns(null, null, tableName, column);
- if (res.next())
- {
- types.add(res.getInt("DATA_TYPE"));
- }
- else
- {
- log.warn("Unable to determine type for column '{}' in table '{}'", column, tableName);
- return false;
- }
- res.close();
- }
- return true;
- }
- });
-
- if (!result)
- {
- log.warn("Skipping sheet {} ", tableName);
- }
-
- String checkStatement = StringUtils.remove(StringUtils.trim(con.getCheckQuery()), "\n");
- String insertStatement = StringUtils.remove(StringUtils.trim(con.getInsertQuery()), "\n");
-
- processRecords(
- sheet,
- columns,
- ArrayUtils.toPrimitive(types.toArray(new Integer[types.size()]), Types.NULL),
- checkStatement,
- insertStatement,
- dataSource,
- tableName);
- }
-
- /**
- * @param sheet
- * @param columns
- * @param checkStatement
- * @param insertStatement
- */
- private void processRecords(HSSFSheet sheet, List<String> columns, int[] types, String checkStatement,
- String insertStatement, DataSource dataSource, String tableName)
- {
- JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
- int checkNum = StringUtils.countMatches(checkStatement, "?");
- int insertNum = StringUtils.countMatches(insertStatement, "?");
-
- HSSFRow row;
- for (short rowNum = 1; rowNum <= sheet.getLastRowNum(); rowNum++)
- {
- row = sheet.getRow(rowNum);
- if (row == null)
- {
- return;
- }
-
- List<String> values = new ArrayList<String>();
-
- for (short k = 0; k < columns.size() && k <= row.getLastCellNum(); k++)
- {
- HSSFCell cell = row.getCell(k);
- String value = null;
-
- if (cell == null)
- {
- value = StringUtils.EMPTY;
- }
- else if (cell.getCellType() == HSSFCell.CELL_TYPE_STRING)
- {
- value = cell.getStringCellValue();
- }
- else if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC)
- {
- double valueDouble = cell.getNumericCellValue();
- // when need to really check if it is a double or an int
- double fraction = valueDouble % 1;
- if (fraction == 0)
- {
- value = Integer.toString((int) valueDouble);
- }
- else
- {
- value = Double.toString(valueDouble);
- }
- }
-
- if (StringUtils.isEmpty(value))
- {
- value = StringUtils.EMPTY;
- }
-
- if ("<NULL>".equalsIgnoreCase(value))
- {
- value = null;
- }
-
- values.add(value);
- }
-
- Object[] checkParams = ArrayUtils.subarray(values.toArray(), 0, checkNum);
- for (int i = 0; i < checkParams.length; i++)
- {
- if (StringUtils.isEmpty((String) checkParams[i]))
- {
- return;
- }
- }
-
- int existing;
- try
- {
- existing = jdbcTemplate.queryForInt(checkStatement, checkParams);
- }
- catch (BadSqlGrammarException bsge)
- {
- log.error("Error executing check query, current sheet will be skipped. {} Query in error: {}", bsge
- .getMessage(), checkStatement);
- return;
- }
-
- if (existing == 0)
- {
- Object[] insertParams = ArrayUtils.subarray(values.toArray(), 0, insertNum);
- int[] insertTypes = ArrayUtils.subarray(types, 0, insertNum);
- if (log.isDebugEnabled())
- {
- log.debug("Missing record with key {}; inserting {}", ArrayUtils.toString(checkParams), ArrayUtils
- .toString(insertParams));
- }
-
- if (insertParams.length != insertTypes.length)
- {
- log.warn("Invalid number of param/type for table {}. Params: {}, types: {}", new Object[]{
- tableName,
- insertParams.length,
- insertTypes.length });
- }
-
- try
- {
- jdbcTemplate.update(insertStatement, insertParams, insertTypes);
- }
- catch (DataIntegrityViolationException bsge)
- {
- log
- .error(
- "Error executing insert, record at {}:{} will be skipped. Query in error: '{}', values: {}. Error message: {}",
- new Object[]{
- tableName,
- rowNum + 1,
- insertStatement,
- ArrayUtils.toString(insertParams),
- bsge.getMessage() });
- continue;
- }
- }
-
- }
- }
-
- /**
- * @author fgiust
- * @version $Id$
- */
- public static class QueryConfig
- {
-
- private String checkQuery;
-
- private String insertQuery;
-
- /**
- * Returns the checkQuery.
- * @return the checkQuery
- */
- public String getCheckQuery()
- {
- return checkQuery;
- }
-
- /**
- * Sets the checkQuery.
- * @param checkQuery the checkQuery to set
- */
- public void setCheckQuery(String checkQuery)
- {
- this.checkQuery = checkQuery;
- }
-
- /**
- * Returns the insertQuery.
- * @return the insertQuery
- */
- public String getInsertQuery()
- {
- return insertQuery;
- }
-
- /**
- * Sets the insertQuery.
- * @param insertQuery the insertQuery to set
- */
- public void setInsertQuery(String insertQuery)
- {
- this.insertQuery = insertQuery;
- }
- }
-}
Copied: tags/openutils-dbmigration-0.5/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java (from rev 319, trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java)
===================================================================
--- tags/openutils-dbmigration-0.5/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java (rev 0)
+++ tags/openutils-dbmigration-0.5/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2007-03-11 21:47:06 UTC (rev 321)
@@ -0,0 +1,494 @@
+/*
+ * Copyright (c) Openmind. All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration.task.setup;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.Resource;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.jdbc.BadSqlGrammarException;
+import org.springframework.jdbc.core.ColumnMapRowMapper;
+import org.springframework.jdbc.core.ConnectionCallback;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class ExcelConfigurationTask extends BaseDbTask implements DbTask
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(ScriptBasedUnconditionalTask.class);
+
+ private Resource script;
+
+ private Map<String, ExcelConfigurationTask.QueryConfig> config;
+
+ /**
+ * Sets the script.
+ * @param script the script to set
+ */
+ public void setScript(Resource script)
+ {
+ this.script = script;
+ }
+
+ /**
+ * Sets the config.
+ * @param config the config to set
+ */
+ public void setConfig(Map<String, ExcelConfigurationTask.QueryConfig> config)
+ {
+ this.config = config;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void execute(DataSource dataSource)
+ {
+ if (script == null || !script.exists())
+ {
+ log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
+ return;
+ }
+
+ InputStream is = null;
+ try
+ {
+ is = script.getInputStream();
+ POIFSFileSystem fs = new POIFSFileSystem(is);
+ HSSFWorkbook hssfworkbook = new HSSFWorkbook(fs);
+ int sheetNums = hssfworkbook.getNumberOfSheets();
+ for (int j = 0; j < sheetNums; j++)
+ {
+ HSSFSheet sheet = hssfworkbook.getSheetAt(j);
+ String tableName = hssfworkbook.getSheetName(j);
+
+ QueryConfig conf = config.get(tableName);
+ if (conf == null)
+ {
+ log.error("Unable to handle table {}", tableName);
+ continue;
+ }
+ processSheet(sheet, tableName, conf, dataSource);
+
+ }
+
+ }
+ catch (IOException e)
+ {
+ log.error(e.getMessage(), e);
+ }
+ finally
+ {
+ IOUtils.closeQuietly(is);
+ }
+
+ }
+
+ /**
+ * @param sheet
+ * @param tableName
+ */
+ private void processSheet(HSSFSheet sheet, final String tableName, QueryConfig con, DataSource dataSource)
+ {
+ final List<String> columns = new ArrayList<String>();
+
+ HSSFRow row = sheet.getRow(0);
+ for (short k = 0; k < row.getLastCellNum(); k++)
+ {
+ HSSFCell cell = row.getCell(k);
+ if (cell != null)
+ {
+ String columnName = cell.getStringCellValue();
+ if (StringUtils.isNotBlank(columnName))
+ {
+ columns.add(StringUtils.trim(columnName));
+ }
+ else
+ {
+ break;
+ }
+ }
+ }
+
+ log.debug("Table: {}, Columns: {}", tableName, columns);
+
+ final List<Integer> types = new ArrayList<Integer>();
+
+ boolean result = (Boolean) new JdbcTemplate(dataSource).execute(new ConnectionCallback()
+ {
+
+ public Object doInConnection(Connection con) throws SQLException, DataAccessException
+ {
+ for (String column : columns)
+ {
+ ResultSet res = con.getMetaData().getColumns(null, null, tableName, column);
+ if (res.next())
+ {
+ types.add(res.getInt("DATA_TYPE"));
+ }
+ else
+ {
+ log.warn("Unable to determine type for column '{}' in table '{}'", column, tableName);
+ return false;
+ }
+ res.close();
+ }
+ return true;
+ }
+ });
+
+ if (!result)
+ {
+ log.warn("Skipping sheet {} ", tableName);
+ }
+
+ String checkStatement = StringUtils.remove(StringUtils.trim(con.getCheckQuery()), "\n");
+ String insertStatement = StringUtils.remove(StringUtils.trim(con.getInsertQuery()), "\n");
+ String selectStatement = StringUtils.remove(StringUtils.trim(con.getSelectQuery()), "\n");
+ String updateStatement = StringUtils.remove(StringUtils.trim(con.getUpdateQuery()), "\n");
+
+ processRecords(
+ sheet,
+ columns,
+ ArrayUtils.toPrimitive(types.toArray(new Integer[types.size()]), Types.NULL),
+ checkStatement,
+ insertStatement,
+ selectStatement,
+ updateStatement,
+ dataSource,
+ tableName);
+ }
+
+ /**
+ * @param sheet
+ * @param columns
+ * @param checkStatement
+ * @param insertStatement
+ * @param updateStatement
+ * @param selectStatement
+ */
+ private void processRecords(HSSFSheet sheet, List<String> columns, int[] types, String checkStatement,
+ String insertStatement, String selectStatement, String updateStatement, DataSource dataSource, String tableName)
+ {
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+ int checkNum = StringUtils.countMatches(checkStatement, "?");
+ int insertNum = StringUtils.countMatches(insertStatement, "?");
+ int selectNum = StringUtils.countMatches(selectStatement, "?");
+ int updateNum = StringUtils.countMatches(updateStatement, "?");
+
+ HSSFRow row;
+ for (short rowNum = 1; rowNum <= sheet.getLastRowNum(); rowNum++)
+ {
+ row = sheet.getRow(rowNum);
+ if (row == null)
+ {
+ return;
+ }
+
+ List<String> values = new ArrayList<String>();
+
+ for (short k = 0; k < columns.size() && k <= row.getLastCellNum(); k++)
+ {
+ HSSFCell cell = row.getCell(k);
+ String value = null;
+
+ if (cell == null)
+ {
+ value = StringUtils.EMPTY;
+ }
+ else if (cell.getCellType() == HSSFCell.CELL_TYPE_STRING)
+ {
+ value = cell.getStringCellValue();
+ }
+ else if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC)
+ {
+ double valueDouble = cell.getNumericCellValue();
+ // when need to really check if it is a double or an int
+ double fraction = valueDouble % 1;
+ if (fraction == 0)
+ {
+ value = Integer.toString((int) valueDouble);
+ }
+ else
+ {
+ value = Double.toString(valueDouble);
+ }
+ }
+
+ if (StringUtils.isEmpty(value))
+ {
+ value = StringUtils.EMPTY;
+ }
+
+ if ("<NULL>".equalsIgnoreCase(value))
+ {
+ value = null;
+ }
+
+ values.add(value);
+ }
+
+ Object[] checkParams = ArrayUtils.subarray(values.toArray(), 0, checkNum);
+ for (int i = 0; i < checkParams.length; i++)
+ {
+ if (StringUtils.isEmpty((String) checkParams[i]))
+ {
+ return;
+ }
+ }
+
+ int existing;
+ try
+ {
+ existing = jdbcTemplate.queryForInt(checkStatement, checkParams);
+ }
+ catch (BadSqlGrammarException bsge)
+ {
+ log.error("Error executing check query, current sheet will be skipped. {} Query in error: {}", bsge
+ .getMessage(), checkStatement);
+ return;
+ }
+
+ if (existing == 0)
+ {
+ Object[] insertParams = ArrayUtils.subarray(values.toArray(), 0, insertNum);
+ int[] insertTypes = ArrayUtils.subarray(types, 0, insertNum);
+ if (log.isDebugEnabled())
+ {
+ log.debug("Missing record with key {}; inserting {}", ArrayUtils.toString(checkParams), ArrayUtils
+ .toString(insertParams));
+ }
+
+ if (insertParams.length != insertTypes.length)
+ {
+ log.warn("Invalid number of param/type for table {}. Params: {}, types: {}", new Object[]{
+ tableName,
+ insertParams.length,
+ insertTypes.length });
+ }
+
+ try
+ {
+ jdbcTemplate.update(insertStatement, insertParams, insertTypes);
+ }
+ catch (DataIntegrityViolationException bsge)
+ {
+ log
+ .error(
+ "Error executing update, record at {}:{} will be skipped. Query in error: '{}', values: {}. Error message: {}",
+ new Object[]{
+ tableName,
+ rowNum + 1,
+ insertStatement,
+ ArrayUtils.toString(insertParams),
+ bsge.getMessage() });
+ continue;
+ }
+ }
+ else if (StringUtils.isNotBlank(updateStatement) && StringUtils.isNotBlank(selectStatement))
+ {
+ try
+ {
+ RowMapper rowMapper = new ColumnMapRowMapper();
+ Object[] selectParams = ArrayUtils.subarray(values.toArray(), 0, selectNum);
+ List selectResult = jdbcTemplate.query(selectStatement, selectParams, rowMapper);
+ Map<String, Object> fetchedColumns = (Map<String, Object>) selectResult.get(0);
+ int i = 0;
+ boolean updateNeeded = false;
+ for (String columnName : columns)
+ {
+ Object columnObject = fetchedColumns.get(columnName);
+ if (columnObject == null)
+ {
+ continue;
+ }
+ String columnValue = ObjectUtils.toString(fetchedColumns.get(columnName));
+ if (!StringUtils.equals(columnValue, values.get(i)))
+ {
+ updateNeeded = true;
+ break;
+ }
+ i++;
+ }
+ if (updateNeeded)
+ {
+ Object[] updateParams = ArrayUtils.subarray(values.toArray(), 0, updateNum);
+ int[] insertTypes = ArrayUtils.subarray(types, 0, insertNum);
+ if (log.isDebugEnabled())
+ {
+ log.debug(
+ "Missing record with key {}; updating {}",
+ ArrayUtils.toString(checkParams),
+ ArrayUtils.toString(updateParams));
+ }
+
+ if (updateParams.length != insertTypes.length)
+ {
+ log.warn("Invalid number of param/type for table {}. Params: {}, types: {}", new Object[]{
+ tableName,
+ updateParams.length,
+ insertTypes.length });
+ }
+
+ try
+ {
+ Object[] compoundUpdateParams = new Object[checkParams.length + updateParams.length];
+ System.arraycopy(updateParams, 0, compoundUpdateParams, 0, updateParams.length);
+ System.arraycopy(
+ checkParams,
+ 0,
+ compoundUpdateParams,
+ compoundUpdateParams.length - 1,
+ checkParams.length);
+ jdbcTemplate.update(updateStatement, compoundUpdateParams);
+ }
+ catch (DataIntegrityViolationException bsge)
+ {
+ log
+ .error(
+ "Error executing insert, record at {}:{} will be skipped. Query in error: '{}', values: {}. Error message: {}",
+ new Object[]{
+ tableName,
+ rowNum + 1,
+ insertStatement,
+ ArrayUtils.toString(updateParams),
+ bsge.getMessage() });
+ continue;
+ }
+ }
+ }
+ catch (BadSqlGrammarException bsge)
+ {
+ log
+ .error(
+ "Error executing query to load row values, current possible update of row will be skipped. {} Query in error: {}",
+ bsge.getMessage(),
+ checkStatement);
+ return;
+ }
+ // 1 check if it is the same
+ // 2 update only if they differ
+ }
+
+ }
+ }
+
+ /**
+ * @author fgiust
+ * @version $Id$
+ */
+ public static class QueryConfig
+ {
+
+ private String checkQuery;
+
+ private String insertQuery;
+
+ private String selectQuery;
+
+ private String updateQuery;
+
+ /**
+ * Returns the selectQuery.
+ * @return the selectQuery
+ */
+ public String getSelectQuery()
+ {
+ return selectQuery;
+ }
+
+ /**
+ * Sets the selectQuery.
+ * @param selectQuery the selectQuery to set
+ */
+ public void setSelectQuery(String selectQuery)
+ {
+ this.selectQuery = selectQuery;
+ }
+
+ /**
+ * Returns the checkQuery.
+ * @return the checkQuery
+ */
+ public String getCheckQuery()
+ {
+ return checkQuery;
+ }
+
+ /**
+ * Sets the checkQuery.
+ * @param checkQuery the checkQuery to set
+ */
+ public void setCheckQuery(String checkQuery)
+ {
+ this.checkQuery = checkQuery;
+ }
+
+ /**
+ * Returns the insertQuery.
+ * @return the insertQuery
+ */
+ public String getInsertQuery()
+ {
+ return insertQuery;
+ }
+
+ /**
+ * Sets the insertQuery.
+ * @param insertQuery the insertQuery to set
+ */
+ public void setInsertQuery(String insertQuery)
+ {
+ this.insertQuery = insertQuery;
+ }
+
+ /**
+ * Returns the updateQuery.
+ * @return the updateQuery
+ */
+ public String getUpdateQuery()
+ {
+ return updateQuery;
+ }
+
+ /**
+ * Sets the updateQuery.
+ * @param updateQuery the updateQuery to set
+ */
+ public void setUpdateQuery(String updateQuery)
+ {
+ this.updateQuery = updateQuery;
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-05-23 18:04:05
|
Revision: 330
http://svn.sourceforge.net/openutils/?rev=330&view=rev
Author: fgiust
Date: 2007-05-23 11:04:05 -0700 (Wed, 23 May 2007)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-testing-testng-1.1.1
Added Paths:
-----------
tags/openutils-testing-testng-1.1.1/
tags/openutils-testing-testng-1.1.1/pom.xml
tags/openutils-testing-testng-1.1.1/src/main/java/it/openutils/testing/testng/DbUnitTestCase.java
Removed Paths:
-------------
tags/openutils-testing-testng-1.1.1/pom.xml
tags/openutils-testing-testng-1.1.1/src/main/java/it/openutils/testing/testng/DbUnitTestCase.java
Copied: tags/openutils-testing-testng-1.1.1 (from rev 327, trunk/openutils-testing-testng)
Deleted: tags/openutils-testing-testng-1.1.1/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2007-05-04 16:49:46 UTC (rev 327)
+++ tags/openutils-testing-testng-1.1.1/pom.xml 2007-05-23 18:04:05 UTC (rev 330)
@@ -1,59 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-testing-testng</artifactId>
- <name>openutils test utils (testng)</name>
- <version>1.1.1-SNAPSHOT</version>
- <description>openutils test utils</description>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-hibernate3</artifactId>
- <version>2.0.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>org.dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.2</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.1</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-testing-testng-1.1.1/pom.xml (from rev 329, trunk/openutils-testing-testng/pom.xml)
===================================================================
--- tags/openutils-testing-testng-1.1.1/pom.xml (rev 0)
+++ tags/openutils-testing-testng-1.1.1/pom.xml 2007-05-23 18:04:05 UTC (rev 330)
@@ -0,0 +1,65 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-testing-testng</artifactId>
+ <name>openutils test utils (testng)</name>
+ <version>1.1.1</version>
+ <description>openutils test utils</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-hibernate3</artifactId>
+ <version>2.0.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <version>5.1</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-1.1.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-1.1.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-testng-1.1.1</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: tags/openutils-testing-testng-1.1.1/src/main/java/it/openutils/testing/testng/DbUnitTestCase.java
===================================================================
--- trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/DbUnitTestCase.java 2007-05-04 16:49:46 UTC (rev 327)
+++ tags/openutils-testing-testng-1.1.1/src/main/java/it/openutils/testing/testng/DbUnitTestCase.java 2007-05-23 18:04:05 UTC (rev 330)
@@ -1,285 +0,0 @@
-/*
- * Copyright 2005 Fabrizio Giustina.
- *
- * 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 java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.sql.SQLException;
-import java.text.MessageFormat;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.ClassUtils;
-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.excel.XlsDataSet;
-import org.dbunit.dataset.filter.AbstractTableFilter;
-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.hibernate.SessionFactory;
-import org.springframework.orm.hibernate3.SessionFactoryUtils;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-
-/**
- * @author fgiust
- * @version $Id$
- */
-@Test
-public class DbUnitTestCase extends SpringTestCase
-{
-
- /**
- * name for the dataSource bean in Spring context.
- */
- private static final String DATASOURCE_BEAN_NAME = "dataSource";
-
- /**
- * Pattern for dbunit file loaded before a test. MessageFormat format with two placeholders: class name and
- * extension.
- */
- private static final String DATAFILE_PATTERN = "/{0}-load.{1}";
-
- protected static IDataSet truncateDataSet;
-
- /**
- * Hibernate session factory.
- */
- private SessionFactory sessionFactory;
-
- /**
- * Optional schema (needed for ORACLE).
- * @return <code>null</code>
- */
- protected String getSchema()
- {
- return null;
- }
-
- /**
- * Should use deferred close emulating the spring OpenSessionInView filter? Default is <code>true</code>
- * @return <code>true</code> if deferred close should be used
- */
- protected boolean mimicSessionFilter()
- {
- return true;
- }
-
- /**
- * Setup the Database before running the test method.
- * @throws Exception Any exception.
- */
- @SuppressWarnings("unchecked")
- @BeforeMethod
- protected void setUpDbUnit() throws Exception
- {
- // mimic the Spring OpenSessionInViewFilter
- if (mimicSessionFilter())
- {
- Map<String, SessionFactory> sfbeans = ctx.getBeansOfType(SessionFactory.class);
- if (sfbeans.isEmpty())
- {
- Assert.fail("No bean of type org.hibernate.SessionFactory found in spring context");
- }
- this.sessionFactory = sfbeans.get(sfbeans.keySet().iterator().next());
-
- SessionFactoryUtils.initDeferredClose(this.sessionFactory);
- }
-
- // check for xml
- IDataSet dataSet = loadDataSet(getDataFileName("xml"));
-
- if (dataSet == null)
- {
- // check for excel
- dataSet = loadDataSet(getDataFileName("xls"));
- }
-
- if (dataSet != null)
- {
- importDataSet(dataSet);
- }
- else
- {
- log.debug("No test data found with name [{}]", getDataFileName("xml/xls"));
- }
- }
-
- /**
- * Exports a database to an Excel file
- * @param fileName The file name we save the Excel dump to.
- * @throws IOException An IO Exception.
- * @throws DataSetException A dataset exception.
- * @throws SQLException A SQL Exception.
- */
- protected void exportDbToXls(String fileName) throws IOException, DataSetException, SQLException
- {
- IDatabaseConnection connection = getDbUnitConnection();
-
- IDataSet fullDataSet = connection.createDataSet();
-
- File outFile = new File(fileName);
- OutputStream fos = new FileOutputStream(outFile);
- XlsDataSet.write(fullDataSet, fos);
- fos.close();
- }
-
- /**
- * Cleans the database after we run the tests.
- * @throws Exception Any exception.
- */
- @AfterMethod
- protected void tearDownDbUnit() throws Exception
- {
- if (mimicSessionFilter())
- {
- // close open hibernate sessions, mimic the OpenSessionInViewFilter
- SessionFactoryUtils.processDeferredClose(this.sessionFactory);
- }
-
- // regenerate db initial state
- String datesetFileName = "/initial-load.xml";
- InputStream testData = getClass().getResourceAsStream(datesetFileName);
-
- if (testData != null)
- {
- log.debug("Restoring db state");
-
- IDataSet dataSet = new XmlDataSet(testData);
-
- IDatabaseConnection connection = getDbUnitConnection();
-
- try
- {
- DatabaseOperation.CLEAN_INSERT.execute(connection, dataSet);
- }
- finally
- {
- connection.close();
- }
- }
- }
-
- private void importDataSet(IDataSet dataSet) throws SQLException, DataSetException, DatabaseUnitException
- {
- IDatabaseConnection connection = getDbUnitConnection();
-
- if (truncateDataSet == null)
- {
- log.debug("Generating sorted dataset for initial cleanup");
- IDataSet unsortedTruncateDataSet = connection.createDataSet();
-
- ITableFilter filter = new DatabaseSequenceFilter(connection);
- truncateDataSet = new FilteredDataSet(filter, unsortedTruncateDataSet);
-
- truncateDataSet = new FilteredDataSet(new AbstractTableFilter()
- {
-
- @Override
- public boolean isValidName(String tableName) throws DataSetException
- {
- return !StringUtils.contains(tableName, "$");
- }
- }, truncateDataSet);
-
- log.debug("Sorted dataset generated");
- }
-
- IDataSet orderedDataset = new FilteredDataSet(new AbstractTableFilter()
- {
-
- @Override
- public boolean isValidName(String tableName) throws DataSetException
- {
- return !StringUtils.contains(tableName, "$");
- }
- }, dataSet);
-
- log.debug("Tables: {}", ArrayUtils.toString(orderedDataset.getTableNames()));
- log.debug("Tables truncateDataSet: {}", ArrayUtils.toString(truncateDataSet.getTableNames()));
-
- // if a sorted dataset is available, use table sequence for sorting
- if (truncateDataSet != null)
- {
- ITableFilter filter = new SequenceTableFilter(truncateDataSet.getTableNames());
- orderedDataset = new FilteredDataSet(filter, dataSet);
- }
-
- try
- {
-
- if (truncateDataSet != null)
- {
- DatabaseOperation.DELETE_ALL.execute(connection, truncateDataSet);
- }
- if (dataSet != null)
- {
- DatabaseOperation.INSERT.execute(connection, orderedDataset);
- }
- }
- finally
- {
- connection.close();
- }
- }
-
- /**
- * @return
- * @throws SQLException
- */
- private IDatabaseConnection getDbUnitConnection() throws SQLException
- {
- DataSource dataSource = (DataSource) ctx.getBean(DATASOURCE_BEAN_NAME);
- IDatabaseConnection connection = new DatabaseConnection(dataSource.getConnection(), getSchema());
- return connection;
- }
-
- private String getDataFileName(String extension)
- {
- return MessageFormat.format(DATAFILE_PATTERN, ClassUtils.getShortClassName(getClass()), extension);
- }
-
- private IDataSet loadDataSet(String datesetFile) throws IOException, DataSetException
- {
- InputStream is = getClass().getResourceAsStream(datesetFile);
- IDataSet dataSet = null;
-
- if (is != null)
- {
- log.debug("loading dataset {}", datesetFile);
- dataSet = datesetFile.endsWith(".xls") ? new XlsDataSet(is) : new XmlDataSet(is);
- is.close();
- }
-
- return dataSet;
- }
-}
Copied: tags/openutils-testing-testng-1.1.1/src/main/java/it/openutils/testing/testng/DbUnitTestCase.java (from rev 328, trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/DbUnitTestCase.java)
===================================================================
--- tags/openutils-testing-testng-1.1.1/src/main/java/it/openutils/testing/testng/DbUnitTestCase.java (rev 0)
+++ tags/openutils-testing-testng-1.1.1/src/main/java/it/openutils/testing/testng/DbUnitTestCase.java 2007-05-23 18:04:05 UTC (rev 330)
@@ -0,0 +1,298 @@
+/*
+ * Copyright 2005 Fabrizio Giustina.
+ *
+ * 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 java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.sql.SQLException;
+import java.text.MessageFormat;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.ClassUtils;
+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.excel.XlsDataSet;
+import org.dbunit.dataset.filter.AbstractTableFilter;
+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.hibernate.SessionFactory;
+import org.springframework.orm.hibernate3.SessionFactoryUtils;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+@Test
+public class DbUnitTestCase extends SpringTestCase
+{
+
+ /**
+ * name for the dataSource bean in Spring context.
+ */
+ private static final String DATASOURCE_BEAN_NAME = "dataSource";
+
+ /**
+ * Pattern for dbunit file loaded before a test. MessageFormat format with two placeholders: class name and
+ * extension.
+ */
+ private static final String DATAFILE_PATTERN = "/{0}-load.{1}";
+
+ protected static IDataSet truncateDataSet;
+
+ /**
+ * Hibernate session factory.
+ */
+ private SessionFactory sessionFactory;
+
+ /**
+ * Optional schema (needed for ORACLE).
+ * @return <code>null</code>
+ */
+ protected String getSchema()
+ {
+ return null;
+ }
+
+ /**
+ * Should use deferred close emulating the spring OpenSessionInView filter? Default is <code>true</code>
+ * @return <code>true</code> if deferred close should be used
+ */
+ protected boolean mimicSessionFilter()
+ {
+ return true;
+ }
+
+ /**
+ * Returns the table filter that will be used to exclude certain tables from sort/deletion. This may be overridden
+ * by subclasses, and is needed when tables have circular references (not handled by dbunit DatabaseSequenceFilter)
+ * @return an <code>ITableFilter</code>
+ */
+ protected ITableFilter getTableFilter()
+ {
+ return new AbstractTableFilter()
+ {
+
+ @Override
+ public boolean isValidName(String tableName) throws DataSetException
+ {
+ // default excludes:
+ // $ = oracle recycle bin tables
+ // JBPM = jbpm tables, with circular references
+ return !StringUtils.contains(tableName, "$") && !StringUtils.contains(tableName, "JBPM");
+ }
+ };
+ }
+
+ /**
+ * Setup the Database before running the test method.
+ * @throws Exception Any exception.
+ */
+ @SuppressWarnings("unchecked")
+ @BeforeMethod
+ protected void setUpDbUnit() throws Exception
+ {
+ // mimic the Spring OpenSessionInViewFilter
+ if (mimicSessionFilter())
+ {
+ Map<String, SessionFactory> sfbeans = ctx.getBeansOfType(SessionFactory.class);
+ if (sfbeans.isEmpty())
+ {
+ Assert.fail("No bean of type org.hibernate.SessionFactory found in spring context");
+ }
+ this.sessionFactory = sfbeans.get(sfbeans.keySet().iterator().next());
+
+ SessionFactoryUtils.initDeferredClose(this.sessionFactory);
+ }
+
+ // check for xml
+ IDataSet dataSet = loadDataSet(getDataFileName("xml"));
+
+ if (dataSet == null)
+ {
+ // check for excel
+ dataSet = loadDataSet(getDataFileName("xls"));
+ }
+
+ if (dataSet != null)
+ {
+ importDataSet(dataSet);
+ }
+ else
+ {
+ log.debug("No test data found with name [{}]", getDataFileName("xml/xls"));
+ }
+ }
+
+ /**
+ * Exports a database to an Excel file
+ * @param fileName The file name we save the Excel dump to.
+ * @throws IOException An IO Exception.
+ * @throws DataSetException A dataset exception.
+ * @throws SQLException A SQL Exception.
+ */
+ protected void exportDbToXls(String fileName) throws IOException, DataSetException, SQLException
+ {
+ IDatabaseConnection connection = getDbUnitConnection();
+
+ IDataSet fullDataSet = connection.createDataSet();
+
+ File outFile = new File(fileName);
+ OutputStream fos = new FileOutputStream(outFile);
+ XlsDataSet.write(fullDataSet, fos);
+ fos.close();
+ }
+
+ /**
+ * Cleans the database after we run the tests.
+ * @throws Exception Any exception.
+ */
+ @AfterMethod
+ protected void tearDownDbUnit() throws Exception
+ {
+ if (mimicSessionFilter())
+ {
+ // close open hibernate sessions, mimic the OpenSessionInViewFilter
+ SessionFactoryUtils.processDeferredClose(this.sessionFactory);
+ }
+
+ // regenerate db initial state
+ String datesetFileName = "/initial-load.xml";
+ InputStream testData = getClass().getResourceAsStream(datesetFileName);
+
+ if (testData != null)
+ {
+ log.debug("Restoring db state");
+
+ IDataSet dataSet = new XmlDataSet(testData);
+
+ IDatabaseConnection connection = getDbUnitConnection();
+
+ try
+ {
+ DatabaseOperation.CLEAN_INSERT.execute(connection, dataSet);
+ }
+ finally
+ {
+ connection.close();
+ }
+ }
+ }
+
+ private void importDataSet(IDataSet dataSet) throws SQLException, DataSetException, DatabaseUnitException
+ {
+ IDatabaseConnection connection = getDbUnitConnection();
+
+ if (truncateDataSet == null)
+ {
+ log.debug("Generating sorted dataset for initial cleanup");
+ IDataSet unsortedTruncateDataSet = connection.createDataSet();
+
+ ITableFilter filter = new DatabaseSequenceFilter(connection, new FilteredDataSet(
+ getTableFilter(),
+ unsortedTruncateDataSet).getTableNames());
+ truncateDataSet = new FilteredDataSet(filter, unsortedTruncateDataSet);
+ truncateDataSet = new FilteredDataSet(getTableFilter(), truncateDataSet);
+ log.debug("Sorted dataset generated");
+ }
+
+ IDataSet orderedDataset = new FilteredDataSet(new AbstractTableFilter()
+ {
+
+ @Override
+ public boolean isValidName(String tableName) throws DataSetException
+ {
+ return !StringUtils.contains(tableName, "$");
+ }
+ }, dataSet);
+
+ log.debug("Tables: {}", ArrayUtils.toString(orderedDataset.getTableNames()));
+ log.debug("Tables truncateDataSet: {}", ArrayUtils.toString(truncateDataSet.getTableNames()));
+
+ // if a sorted dataset is available, use table sequence for sorting
+ if (truncateDataSet != null)
+ {
+ ITableFilter filter = new SequenceTableFilter(truncateDataSet.getTableNames());
+ orderedDataset = new FilteredDataSet(filter, dataSet);
+ }
+
+ try
+ {
+
+ if (truncateDataSet != null)
+ {
+ DatabaseOperation.DELETE_ALL.execute(connection, truncateDataSet);
+ }
+ if (dataSet != null)
+ {
+ DatabaseOperation.INSERT.execute(connection, orderedDataset);
+ }
+ }
+ finally
+ {
+ connection.close();
+ }
+ }
+
+ /**
+ * @return
+ * @throws SQLException
+ */
+ private IDatabaseConnection getDbUnitConnection() throws SQLException
+ {
+ DataSource dataSource = (DataSource) ctx.getBean(DATASOURCE_BEAN_NAME);
+ IDatabaseConnection connection = new DatabaseConnection(dataSource.getConnection(), getSchema());
+ return connection;
+ }
+
+ private String getDataFileName(String extension)
+ {
+ return MessageFormat.format(DATAFILE_PATTERN, ClassUtils.getShortClassName(getClass()), extension);
+ }
+
+ private IDataSet loadDataSet(String datesetFile) throws IOException, DataSetException
+ {
+ InputStream is = getClass().getResourceAsStream(datesetFile);
+ IDataSet dataSet = null;
+
+ if (is != null)
+ {
+ log.debug("loading dataset {}", datesetFile);
+ dataSet = datesetFile.endsWith(".xls") ? new XlsDataSet(is) : new XmlDataSet(is);
+ is.close();
+ }
+
+ return dataSet;
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-05-23 18:05:56
|
Revision: 333
http://svn.sourceforge.net/openutils/?rev=333&view=rev
Author: fgiust
Date: 2007-05-23 11:05:56 -0700 (Wed, 23 May 2007)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-testing-junit-1.1.1
Added Paths:
-----------
tags/openutils-testing-junit-1.1.1/
tags/openutils-testing-junit-1.1.1/pom.xml
tags/openutils-testing-junit-1.1.1/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java
Removed Paths:
-------------
tags/openutils-testing-junit-1.1.1/pom.xml
tags/openutils-testing-junit-1.1.1/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java
Copied: tags/openutils-testing-junit-1.1.1 (from rev 327, trunk/openutils-testing-junit)
Deleted: tags/openutils-testing-junit-1.1.1/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2007-05-04 16:49:46 UTC (rev 327)
+++ tags/openutils-testing-junit-1.1.1/pom.xml 2007-05-23 18:05:56 UTC (rev 333)
@@ -1,58 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-testing-junit</artifactId>
- <name>openutils test utils (junit)</name>
- <version>1.1.1-SNAPSHOT</version>
- <description>openutils test utils</description>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-hibernate3</artifactId>
- <version>2.0.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>org.dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.2</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-testing-junit-1.1.1/pom.xml (from rev 332, trunk/openutils-testing-junit/pom.xml)
===================================================================
--- tags/openutils-testing-junit-1.1.1/pom.xml (rev 0)
+++ tags/openutils-testing-junit-1.1.1/pom.xml 2007-05-23 18:05:56 UTC (rev 333)
@@ -0,0 +1,64 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-testing-junit</artifactId>
+ <name>openutils test utils (junit)</name>
+ <version>1.1.1</version>
+ <description>openutils test utils</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-hibernate3</artifactId>
+ <version>2.0.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-1.1.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-1.1.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-junit-1.1.1</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: tags/openutils-testing-junit-1.1.1/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java
===================================================================
--- trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java 2007-05-04 16:49:46 UTC (rev 327)
+++ tags/openutils-testing-junit-1.1.1/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java 2007-05-23 18:05:56 UTC (rev 333)
@@ -1,223 +0,0 @@
-/*
- * Copyright 2005 Fabrizio Giustina.
- *
- * 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 java.io.InputStream;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import org.apache.commons.lang.ClassUtils;
-import org.dbunit.database.DatabaseConnection;
-import org.dbunit.database.DatabaseSequenceFilter;
-import org.dbunit.database.IDatabaseConnection;
-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.ext.mssql.InsertIdentityOperation;
-import org.dbunit.operation.DatabaseOperation;
-import org.hibernate.SessionFactory;
-import org.springframework.orm.hibernate3.SessionFactoryUtils;
-
-
-/**
- * Base class for running DAO tests.
- * @author fgiust
- * @version $Revision $ ($Author $)
- */
-public abstract class DbUnitTestCase extends SpringTestCase
-{
-
- /**
- * Hibernate session factory.
- */
- private SessionFactory sessionFactory;
-
- private static final String BASETEST_DELETE = "/_BaseDAOTest-delete.xml";
-
- protected static IDataSet truncateDataSet;
-
- /**
- * Should use deferred close emulating the spring OpenSessionInView filter? Default is <code>true</code>
- * @return <code>true</code> if deferred close should be used
- */
- protected boolean mimicSessionFilter()
- {
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
-
- // insert values
- IDataSet dataSet = null;
-
- String datesetFileName = "/" + ClassUtils.getShortClassName(getClass()) + "-load.xml";
- InputStream testData = getClass().getResourceAsStream(datesetFileName);
-
- if (testData != null)
- {
- if (log.isDebugEnabled())
- {
- log.debug("loading dataset {}", datesetFileName);
- }
-
- dataSet = new XmlDataSet(testData);
- }
- else
- {
- // check for excel
- datesetFileName = "/" + ClassUtils.getShortClassName(getClass()) + "-load.xls";
- testData = getClass().getResourceAsStream(datesetFileName);
-
- if (testData != null)
- {
- if (log.isDebugEnabled())
- {
- log.debug("loading dataset {}", datesetFileName);
- }
-
- dataSet = new XlsDataSet(testData);
- }
- }
-
- if (dataSet == null)
- {
- log.debug("No test data found with name [{}]", datesetFileName);
- }
- else
- {
-
- DataSource dataSource = (DataSource) ctx.getBean("dataSource");
- IDatabaseConnection connection = new DatabaseConnection(dataSource.getConnection());
-
- // truncate common tables
- if (truncateDataSet == null)
- {
- log.debug("Generating sorted dataset for initial cleanup");
- IDataSet unsortedTruncateDataSet = connection.createDataSet();
- ITableFilter filter = new DatabaseSequenceFilter(connection);
- truncateDataSet = new FilteredDataSet(filter, unsortedTruncateDataSet);
- log.debug("Sorted dataset generated");
- }
-
- IDataSet orderedDataset = dataSet;
-
- // if a sorted dataset is available, use table sequence for sorting
- if (truncateDataSet == null)
- {
- ITableFilter filter = new SequenceTableFilter(truncateDataSet.getTableNames());
- orderedDataset = new FilteredDataSet(filter, dataSet);
- }
-
- try
- {
- if (truncateDataSet != null)
- {
- DatabaseOperation.DELETE_ALL.execute(connection, truncateDataSet);
- }
- if (dataSet != null)
- {
- InsertIdentityOperation.INSERT.execute(connection, orderedDataset);
- }
- }
- finally
- {
- connection.close();
- }
- }
-
- // mimic the Spring OpenSessionInViewFilter
- if (mimicSessionFilter())
- {
- Map<String, SessionFactory> sfbeans = ctx.getBeansOfType(SessionFactory.class);
- if (sfbeans.isEmpty())
- {
- fail("No bean of type org.hibernate.SessionFactory found in spring context");
- }
- this.sessionFactory = sfbeans.get(sfbeans.keySet().iterator().next());
-
- SessionFactoryUtils.initDeferredClose(this.sessionFactory);
- }
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void tearDown() throws Exception
- {
- if (mimicSessionFilter())
- {
- // close open hibernate sessions, mimic the OpenSessionInViewFilter
- SessionFactoryUtils.processDeferredClose(this.sessionFactory);
- }
-
- // regenerate db initial state
- String datesetFileName = "/initial-load.xml";
- InputStream testData = getClass().getResourceAsStream(datesetFileName);
-
- if (testData != null)
- {
- log.debug("Restoring db state");
-
- IDataSet dataSet = new XmlDataSet(testData);
-
- DataSource dataSource = (DataSource) ctx.getBean("dataSource");
- IDatabaseConnection connection = new DatabaseConnection(dataSource.getConnection());
-
- try
- {
- DatabaseOperation.CLEAN_INSERT.execute(connection, dataSet);
- }
- finally
- {
- connection.close();
- }
- }
-
- super.tearDown();
- }
-
- /**
- * Returns the full test name.
- * @see junit.framework.TestCase#getName()
- */
- @Override
- public String getName()
- {
- return ClassUtils.getShortClassName(this.getClass()) + "::" + super.getName();
- }
-
- /**
- * return the current Hibernate SessionFactory
- * @return SessionFactory object
- */
- protected SessionFactory getSessionFactory()
- {
- return sessionFactory;
- }
-}
\ No newline at end of file
Copied: tags/openutils-testing-junit-1.1.1/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java (from rev 328, trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java)
===================================================================
--- tags/openutils-testing-junit-1.1.1/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java (rev 0)
+++ tags/openutils-testing-junit-1.1.1/src/main/java/it/openutils/testing/junit/DbUnitTestCase.java 2007-05-23 18:05:56 UTC (rev 333)
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2005 Fabrizio Giustina.
+ *
+ * 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 java.io.InputStream;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.lang.ClassUtils;
+import org.apache.commons.lang.StringUtils;
+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.excel.XlsDataSet;
+import org.dbunit.dataset.filter.AbstractTableFilter;
+import org.dbunit.dataset.filter.ITableFilter;
+import org.dbunit.dataset.filter.SequenceTableFilter;
+import org.dbunit.dataset.xml.XmlDataSet;
+import org.dbunit.ext.mssql.InsertIdentityOperation;
+import org.dbunit.operation.DatabaseOperation;
+import org.hibernate.SessionFactory;
+import org.springframework.orm.hibernate3.SessionFactoryUtils;
+
+
+/**
+ * Base class for running DAO tests.
+ * @author fgiust
+ * @version $Revision $ ($Author $)
+ */
+public abstract class DbUnitTestCase extends SpringTestCase
+{
+
+ /**
+ * Hibernate session factory.
+ */
+ private SessionFactory sessionFactory;
+
+ private static final String BASETEST_DELETE = "/_BaseDAOTest-delete.xml";
+
+ protected static IDataSet truncateDataSet;
+
+ /**
+ * Should use deferred close emulating the spring OpenSessionInView filter? Default is <code>true</code>
+ * @return <code>true</code> if deferred close should be used
+ */
+ protected boolean mimicSessionFilter()
+ {
+ return true;
+ }
+
+ /**
+ * Returns the table filter that will be used to exclude certain tables from sort/deletion. This may be overridden
+ * by subclasses, and is needed when tables have circular references (not handled by dbunit DatabaseSequenceFilter)
+ * @return an <code>ITableFilter</code>
+ */
+ protected ITableFilter getTableFilter()
+ {
+ return new AbstractTableFilter()
+ {
+
+ @Override
+ public boolean isValidName(String tableName) throws DataSetException
+ {
+ // default excludes:
+ // $ = oracle recycle bin tables
+ // JBPM = jbpm tables, with circular references
+ return !StringUtils.contains(tableName, "$") && !StringUtils.contains(tableName, "JBPM");
+ }
+ };
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ // insert values
+ IDataSet dataSet = null;
+
+ String datesetFileName = "/" + ClassUtils.getShortClassName(getClass()) + "-load.xml";
+ InputStream testData = getClass().getResourceAsStream(datesetFileName);
+
+ if (testData != null)
+ {
+ if (log.isDebugEnabled())
+ {
+ log.debug("loading dataset {}", datesetFileName);
+ }
+
+ dataSet = new XmlDataSet(testData);
+ }
+ else
+ {
+ // check for excel
+ datesetFileName = "/" + ClassUtils.getShortClassName(getClass()) + "-load.xls";
+ testData = getClass().getResourceAsStream(datesetFileName);
+
+ if (testData != null)
+ {
+ if (log.isDebugEnabled())
+ {
+ log.debug("loading dataset {}", datesetFileName);
+ }
+
+ dataSet = new XlsDataSet(testData);
+ }
+ }
+
+ if (dataSet == null)
+ {
+ log.debug("No test data found with name [{}]", datesetFileName);
+ }
+ else
+ {
+
+ DataSource dataSource = (DataSource) ctx.getBean("dataSource");
+ IDatabaseConnection connection = new DatabaseConnection(dataSource.getConnection());
+
+ // truncate common tables
+ if (truncateDataSet == null)
+ {
+ log.debug("Generating sorted dataset for initial cleanup");
+ IDataSet unsortedTruncateDataSet = connection.createDataSet();
+
+ ITableFilter filter = new DatabaseSequenceFilter(connection, new FilteredDataSet(
+ getTableFilter(),
+ unsortedTruncateDataSet).getTableNames());
+ truncateDataSet = new FilteredDataSet(filter, unsortedTruncateDataSet);
+ truncateDataSet = new FilteredDataSet(getTableFilter(), truncateDataSet);
+ log.debug("Sorted dataset generated");
+ }
+
+ IDataSet orderedDataset = dataSet;
+
+ // if a sorted dataset is available, use table sequence for sorting
+ if (truncateDataSet == null)
+ {
+ ITableFilter filter = new SequenceTableFilter(truncateDataSet.getTableNames());
+ orderedDataset = new FilteredDataSet(filter, dataSet);
+ }
+
+ try
+ {
+ if (truncateDataSet != null)
+ {
+ DatabaseOperation.DELETE_ALL.execute(connection, truncateDataSet);
+ }
+ if (dataSet != null)
+ {
+ InsertIdentityOperation.INSERT.execute(connection, orderedDataset);
+ }
+ }
+ finally
+ {
+ connection.close();
+ }
+ }
+
+ // mimic the Spring OpenSessionInViewFilter
+ if (mimicSessionFilter())
+ {
+ Map<String, SessionFactory> sfbeans = ctx.getBeansOfType(SessionFactory.class);
+ if (sfbeans.isEmpty())
+ {
+ fail("No bean of type org.hibernate.SessionFactory found in spring context");
+ }
+ this.sessionFactory = sfbeans.get(sfbeans.keySet().iterator().next());
+
+ SessionFactoryUtils.initDeferredClose(this.sessionFactory);
+ }
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void tearDown() throws Exception
+ {
+ if (mimicSessionFilter())
+ {
+ // close open hibernate sessions, mimic the OpenSessionInViewFilter
+ SessionFactoryUtils.processDeferredClose(this.sessionFactory);
+ }
+
+ // regenerate db initial state
+ String datesetFileName = "/initial-load.xml";
+ InputStream testData = getClass().getResourceAsStream(datesetFileName);
+
+ if (testData != null)
+ {
+ log.debug("Restoring db state");
+
+ IDataSet dataSet = new XmlDataSet(testData);
+
+ DataSource dataSource = (DataSource) ctx.getBean("dataSource");
+ IDatabaseConnection connection = new DatabaseConnection(dataSource.getConnection());
+
+ try
+ {
+ DatabaseOperation.CLEAN_INSERT.execute(connection, dataSet);
+ }
+ finally
+ {
+ connection.close();
+ }
+ }
+
+ super.tearDown();
+ }
+
+ /**
+ * Returns the full test name.
+ * @see junit.framework.TestCase#getName()
+ */
+ @Override
+ public String getName()
+ {
+ return ClassUtils.getShortClassName(this.getClass()) + "::" + super.getName();
+ }
+
+ /**
+ * return the current Hibernate SessionFactory
+ * @return SessionFactory object
+ */
+ protected SessionFactory getSessionFactory()
+ {
+ return sessionFactory;
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-06-06 16:42:12
|
Revision: 336
http://svn.sourceforge.net/openutils/?rev=336&view=rev
Author: fgiust
Date: 2007-06-06 09:42:13 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-dbmigration-0.6
Added Paths:
-----------
tags/openutils-dbmigration-0.6/
tags/openutils-dbmigration-0.6/pom.xml
Removed Paths:
-------------
tags/openutils-dbmigration-0.6/pom.xml
Copied: tags/openutils-dbmigration-0.6 (from rev 334, trunk/openutils-dbmigration)
Deleted: tags/openutils-dbmigration-0.6/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2007-05-23 18:06:03 UTC (rev 334)
+++ tags/openutils-dbmigration-0.6/pom.xml 2007-06-06 16:42:13 UTC (rev 336)
@@ -1,87 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-dbmigration</artifactId>
- <name>openutils db migration framework</name>
- <version>0.6-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>poi</groupId>
- <artifactId>poi</artifactId>
- <version>2.5.1-final-20040804</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-dbmigration-0.6/pom.xml (from rev 335, trunk/openutils-dbmigration/pom.xml)
===================================================================
--- tags/openutils-dbmigration-0.6/pom.xml (rev 0)
+++ tags/openutils-dbmigration-0.6/pom.xml 2007-06-06 16:42:13 UTC (rev 336)
@@ -0,0 +1,93 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-dbmigration</artifactId>
+ <name>openutils db migration framework</name>
+ <version>0.6</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>2.5.1-final-20040804</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.6</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.6</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-dbmigration-0.6</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-07-03 22:04:06
|
Revision: 352
http://svn.sourceforge.net/openutils/?rev=352&view=rev
Author: fgiust
Date: 2007-07-03 15:04:07 -0700 (Tue, 03 Jul 2007)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-dbmigration-0.7
Added Paths:
-----------
tags/openutils-dbmigration-0.7/
tags/openutils-dbmigration-0.7/pom.xml
tags/openutils-dbmigration-0.7/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java
Removed Paths:
-------------
tags/openutils-dbmigration-0.7/pom.xml
tags/openutils-dbmigration-0.7/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java
Copied: tags/openutils-dbmigration-0.7 (from rev 342, trunk/openutils-dbmigration)
Deleted: tags/openutils-dbmigration-0.7/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2007-06-30 15:21:31 UTC (rev 342)
+++ tags/openutils-dbmigration-0.7/pom.xml 2007-07-03 22:04:07 UTC (rev 352)
@@ -1,87 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-dbmigration</artifactId>
- <name>openutils db migration framework</name>
- <version>0.7-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>poi</groupId>
- <artifactId>poi</artifactId>
- <version>2.5.1-final-20040804</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-dbmigration-0.7/pom.xml (from rev 351, trunk/openutils-dbmigration/pom.xml)
===================================================================
--- tags/openutils-dbmigration-0.7/pom.xml (rev 0)
+++ tags/openutils-dbmigration-0.7/pom.xml 2007-07-03 22:04:07 UTC (rev 352)
@@ -0,0 +1,93 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-dbmigration</artifactId>
+ <name>openutils db migration framework</name>
+ <version>0.7</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>2.5.1-final-20040804</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.7</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-0.7</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-dbmigration-0.7</url>
+ </scm>
+</project>
\ No newline at end of file
Deleted: tags/openutils-dbmigration-0.7/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java 2007-06-30 15:21:31 UTC (rev 342)
+++ tags/openutils-dbmigration-0.7/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java 2007-07-03 22:04:07 UTC (rev 352)
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) Openmind. All rights reserved. http://www.openmindonline.it
- */
-package it.openutils.migration.task.setup;
-
-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;
-
-
-/**
- * @author fgiust
- * @version $Id$
- */
-public class GenericScriptBasedConditionalTask implements DbTask
-{
-
- /**
- * Logger.
- */
- private static Logger log = LoggerFactory.getLogger(GenericScriptBasedConditionalTask.class);
-
- /**
- * Script list to execute
- */
- protected List<Resource> scripts;
-
- private String check;
-
- /**
- * Sets the scripts.
- * @param scripts the scripts to set
- */
- public void setScripts(List<Resource> scripts)
- {
- this.scripts = scripts;
- }
-
- /**
- * Sets the check.
- * @param check the check to set
- */
- public void setCheck(String check)
- {
- this.check = check;
- }
-
- /**
- * @param script The script resource
- * @return The script name
- */
- protected String objectNameFromFileName(Resource script)
- {
- return StringUtils.substringBeforeLast(script.getFilename(), ".");
- }
-
- /**
- * {@inheritDoc}
- */
- public String getDescription()
- {
- // @todo add better description and avoid NPEs
- return "Checking " + objectNameFromFileName(scripts.get(0));
- }
-
- /**
- * {@inheritDoc}
- */
- public void execute(DataSource dataSource)
- {
-
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
-
- for (Resource script : scripts)
- {
- int result = jdbcTemplate.queryForInt(check, this.objectNameFromFileName(script));
- if (result == 0)
- {
- if (script == null || !script.exists())
- {
- log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
- return;
- }
-
- 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, ";");
-
- for (String ddl : ddls)
- {
- if (StringUtils.isNotBlank(ddl))
- {
- log.debug("Executing:\n{}", ddl);
- jdbcTemplate.update(ddl);
- }
- }
- }
- }
-
- }
-}
Copied: tags/openutils-dbmigration-0.7/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java (from rev 350, trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java)
===================================================================
--- tags/openutils-dbmigration-0.7/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java (rev 0)
+++ tags/openutils-dbmigration-0.7/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java 2007-07-03 22:04:07 UTC (rev 352)
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) Openmind. All rights reserved. http://www.openmindonline.it
+ */
+package it.openutils.migration.task.setup;
+
+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;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class GenericScriptBasedConditionalTask implements DbTask
+{
+
+ /**
+ * Logger.
+ */
+ private static Logger log = LoggerFactory.getLogger(GenericScriptBasedConditionalTask.class);
+
+ /**
+ * Script list to execute
+ */
+ protected List<Resource> scripts;
+
+ private String check;
+
+ /**
+ * Sets the scripts.
+ * @param scripts the scripts to set
+ */
+ public void setScripts(List<Resource> scripts)
+ {
+ this.scripts = scripts;
+ }
+
+ /**
+ * Sets the check.
+ * @param check the check to set
+ */
+ public void setCheck(String check)
+ {
+ this.check = check;
+ }
+
+ /**
+ * @param script The script resource
+ * @return The script name
+ */
+ protected String objectNameFromFileName(Resource script)
+ {
+ return StringUtils.substringBeforeLast(script.getFilename(), ".");
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getDescription()
+ {
+ if (scripts == null)
+ {
+ return "Nothing to do, no scripts configured";
+ }
+
+ StringBuffer result = new StringBuffer();
+ if (!scripts.isEmpty())
+ {
+ result.append("Checking :\n");
+ for (Resource script : scripts)
+ {
+ result.append(" - " + objectNameFromFileName(script) + "\n");
+ }
+
+ }
+ return result.toString();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void execute(DataSource dataSource)
+ {
+
+ SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+
+ for (Resource script : scripts)
+ {
+ int result = jdbcTemplate.queryForInt(check, this.objectNameFromFileName(script));
+ if (result == 0)
+ {
+ if (script == null || !script.exists())
+ {
+ log.error("Unable to execute db task \"{}\", script \"{}\" not found.", getDescription(), script);
+ return;
+ }
+
+ 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, ";");
+
+ for (String ddl : ddls)
+ {
+ if (StringUtils.isNotBlank(ddl))
+ {
+ log.debug("Executing:\n{}", ddl);
+ jdbcTemplate.update(ddl);
+ }
+ }
+ }
+ }
+
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2007-07-10 15:15:25
|
Revision: 355
http://svn.sourceforge.net/openutils/?rev=355&view=rev
Author: fgiust
Date: 2007-07-10 08:15:27 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-testing-testng-1.1.2
Added Paths:
-----------
tags/openutils-testing-testng-1.1.2/
tags/openutils-testing-testng-1.1.2/pom.xml
Removed Paths:
-------------
tags/openutils-testing-testng-1.1.2/pom.xml
Copied: tags/openutils-testing-testng-1.1.2 (from rev 353, trunk/openutils-testing-testng)
Deleted: tags/openutils-testing-testng-1.1.2/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2007-07-03 22:04:13 UTC (rev 353)
+++ tags/openutils-testing-testng-1.1.2/pom.xml 2007-07-10 15:15:27 UTC (rev 355)
@@ -1,59 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-testing-testng</artifactId>
- <name>openutils test utils (testng)</name>
- <version>1.1.2-SNAPSHOT</version>
- <description>openutils test utils</description>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-hibernate3</artifactId>
- <version>2.0.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>org.dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.2</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.1</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-testing-testng-1.1.2/pom.xml (from rev 354, trunk/openutils-testing-testng/pom.xml)
===================================================================
--- tags/openutils-testing-testng-1.1.2/pom.xml (rev 0)
+++ tags/openutils-testing-testng-1.1.2/pom.xml 2007-07-10 15:15:27 UTC (rev 355)
@@ -0,0 +1,65 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-testing-testng</artifactId>
+ <name>openutils test utils (testng)</name>
+ <version>1.1.2</version>
+ <description>openutils test utils</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-hibernate3</artifactId>
+ <version>2.0.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <version>5.1</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-1.1.2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-1.1.2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-testng-1.1.2</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2007-07-24 10:17:15
|
Revision: 369
http://svn.sourceforge.net/openutils/?rev=369&view=rev
Author: molaschi
Date: 2007-07-24 03:17:18 -0700 (Tue, 24 Jul 2007)
Log Message:
-----------
[maven-scm] copy for tag openutils-testing-junit-dwr-1.0
Added Paths:
-----------
tags/openutils-testing-junit-dwr-1.0/
tags/openutils-testing-junit-dwr-1.0/pom.xml
tags/openutils-testing-junit-dwr-1.0/src/
Removed Paths:
-------------
tags/openutils-testing-junit-dwr-1.0/pom.xml
tags/openutils-testing-junit-dwr-1.0/src/
Copied: tags/openutils-testing-junit-dwr-1.0 (from rev 367, trunk/openutils-testing-junit-dwr)
Deleted: tags/openutils-testing-junit-dwr-1.0/pom.xml
===================================================================
--- trunk/openutils-testing-junit-dwr/pom.xml 2007-07-24 10:15:55 UTC (rev 367)
+++ tags/openutils-testing-junit-dwr-1.0/pom.xml 2007-07-24 10:17:18 UTC (rev 369)
@@ -1,107 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>3</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-testing-junit-dwr</artifactId>
- <name>openutils test utils (junit) for dwr</name>
- <version>1.0-SNAPSHOT</version>
- <description>openutils test utils for dwr</description>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>httpunit</groupId>
- <artifactId>httpunit</artifactId>
- <version>1.6.2</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- </exclusion>
- <exclusion>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- <version>5.5.12</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>naming-resources</artifactId>
- <version>5.5.15</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>5.5.12</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>5.5.12</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>naming-factory</artifactId>
- <version>5.5.15</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- <version>1.6R6-candidate2</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-testing-junit-dwr-1.0/pom.xml (from rev 368, trunk/openutils-testing-junit-dwr/pom.xml)
===================================================================
--- tags/openutils-testing-junit-dwr-1.0/pom.xml (rev 0)
+++ tags/openutils-testing-junit-dwr-1.0/pom.xml 2007-07-24 10:17:18 UTC (rev 369)
@@ -0,0 +1,113 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>3</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-testing-junit-dwr</artifactId>
+ <name>openutils test utils (junit) for dwr</name>
+ <version>1.0</version>
+ <description>openutils test utils for dwr</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-resources</artifactId>
+ <version>5.5.15</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-factory</artifactId>
+ <version>5.5.15</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.6R6-candidate2</version>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-dwr-1.0</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-dwr-1.0</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-junit-dwr-1.0</url>
+ </scm>
+</project>
\ No newline at end of file
Copied: tags/openutils-testing-junit-dwr-1.0/src (from rev 366, trunk/openutils-testing-junit-dwr/src)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X