Menu
▾
▴
openutils-svn — developer list with svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
| 2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
| 2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
| 2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
| 2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
| 2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
| 2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <fg...@us...> - 2016-04-04 13:56:48
|
Revision: 4640
http://openutils.svn.sourceforge.net/openutils/?rev=4640&view=rev
Author: fgiust
Date: 2016-04-04 13:56:46 +0000 (Mon, 04 Apr 2016)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-dbmigration/pom.xml
Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2016-04-04 13:56:37 UTC (rev 4639)
+++ trunk/openutils-dbmigration/pom.xml 2016-04-04 13:56:46 UTC (rev 4640)
@@ -14,7 +14,7 @@
With DBMigration you can bundle upgrade scripts in you application. Its purpose
is to manage db updates consistently both for development than for production releases.
]]></description>
- <version>2.2.0</version>
+ <version>2.2.1-SNAPSHOT</version>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -28,9 +28,9 @@
</issueManagement>
<inceptionYear>2007</inceptionYear>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-dbmigration-2.2.0</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-dbmigration-2.2.0</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-dbmigration-2.2.0</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-dbmigration</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-dbmigration</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-dbmigration</url>
</scm>
<dependencies>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2016-04-04 13:56:38
|
Revision: 4639
http://openutils.svn.sourceforge.net/openutils/?rev=4639&view=rev
Author: fgiust
Date: 2016-04-04 13:56:37 +0000 (Mon, 04 Apr 2016)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-dbmigration-2.2.0
Added Paths:
-----------
tags/openutils-dbmigration-2.2.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2016-04-04 13:56:32
|
Revision: 4638
http://openutils.svn.sourceforge.net/openutils/?rev=4638&view=rev
Author: fgiust
Date: 2016-04-04 13:56:29 +0000 (Mon, 04 Apr 2016)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-dbmigration-2.2.0
Modified Paths:
--------------
trunk/openutils-dbmigration/pom.xml
Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2016-04-04 13:54:34 UTC (rev 4637)
+++ trunk/openutils-dbmigration/pom.xml 2016-04-04 13:56:29 UTC (rev 4638)
@@ -14,7 +14,7 @@
With DBMigration you can bundle upgrade scripts in you application. Its purpose
is to manage db updates consistently both for development than for production releases.
]]></description>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.2.0</version>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -28,9 +28,9 @@
</issueManagement>
<inceptionYear>2007</inceptionYear>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-dbmigration</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-dbmigration</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-dbmigration</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-dbmigration-2.2.0</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-dbmigration-2.2.0</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-dbmigration-2.2.0</url>
</scm>
<dependencies>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2016-04-04 13:54:36
|
Revision: 4637
http://openutils.svn.sourceforge.net/openutils/?rev=4637&view=rev
Author: fgiust
Date: 2016-04-04 13:54:34 +0000 (Mon, 04 Apr 2016)
Log Message:
-----------
update deps
Modified Paths:
--------------
trunk/openutils-dbmigration/pom.xml
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcColumnBasedConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIndexExistsConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIsNotNullableConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfForeignKeyExistsConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfPrimaryKeyExistsConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfTableExistsConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OraclePackageCreationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleSequenceCreationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleTriggerTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleViewCreateOrUpdateTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/postgres/PostGreSQLSequenceChecker.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerObjCreationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerScriptBasedUnconditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerSynonymCreationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreateOrUpdateTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DatabaseConditionalTaskList.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ScriptBasedUnconditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/ScriptBasedDbUpdate.java
Added Paths:
-----------
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerAnonymousUniqueConstraintDelete.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerDefaultValueConstraintDelete.java
Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/pom.xml 2016-04-04 13:54:34 UTC (rev 4637)
@@ -34,14 +34,14 @@
</scm>
<dependencies>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.4</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -79,17 +79,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
+ <version>1.7.20</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.5</version>
+ <version>1.7.20</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
- <version>3.2-FINAL</version>
+ <version>3.14</version>
<optional>true</optional>
<exclusions>
<exclusion>
@@ -105,8 +105,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.1</version>
+ <version>6.9.10</version>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -25,7 +25,7 @@
import javax.sql.DataSource;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcColumnBasedConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcColumnBasedConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcColumnBasedConditionalTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -26,7 +26,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
import org.springframework.jdbc.core.JdbcTemplate;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -23,7 +23,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
import org.springframework.jdbc.core.JdbcTemplate;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIndexExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIndexExistsConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIndexExistsConditionalTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -28,10 +28,10 @@
import java.util.Set;
import java.util.TreeSet;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIsNotNullableConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIsNotNullableConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIsNotNullableConditionalTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -20,7 +20,7 @@
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
/**
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfForeignKeyExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfForeignKeyExistsConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfForeignKeyExistsConditionalTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -23,7 +23,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
import org.springframework.jdbc.core.JdbcTemplate;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfPrimaryKeyExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfPrimaryKeyExistsConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfPrimaryKeyExistsConditionalTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -26,7 +26,7 @@
import java.util.Map;
import java.util.TreeMap;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfTableExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfTableExistsConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfTableExistsConditionalTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -23,7 +23,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
import org.springframework.jdbc.core.JdbcTemplate;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -28,7 +28,7 @@
import javax.sql.DataSource;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.core.io.Resource;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OraclePackageCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OraclePackageCreationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OraclePackageCreationTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -26,7 +26,7 @@
import javax.sql.DataSource;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleSequenceCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleSequenceCreationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleSequenceCreationTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -23,7 +23,7 @@
import javax.sql.DataSource;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.jdbc.core.JdbcTemplate;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleTriggerTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleTriggerTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleTriggerTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -18,7 +18,7 @@
package it.openutils.migration.oracle;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.jdbc.core.JdbcTemplate;
import it.openutils.migration.task.setup.GenericConditionalTask;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleViewCreateOrUpdateTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleViewCreateOrUpdateTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleViewCreateOrUpdateTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -28,7 +28,7 @@
import javax.sql.DataSource;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/postgres/PostGreSQLSequenceChecker.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/postgres/PostGreSQLSequenceChecker.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/postgres/PostGreSQLSequenceChecker.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -25,7 +25,7 @@
import javax.sql.DataSource;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
import org.springframework.jdbc.core.JdbcTemplate;
Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerAnonymousUniqueConstraintDelete.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerAnonymousUniqueConstraintDelete.java (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerAnonymousUniqueConstraintDelete.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -0,0 +1,144 @@
+/**
+ *
+ * openutils dbmigration (http://www.openmindlab.com/lab/products/dbmigration.html)
+ * Copyright(C) 2007-2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package it.openutils.migration.sqlserver;
+
+import it.openutils.migration.task.setup.DbTask;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+
+/**
+ * This class can be used to remove anonymous unique constraint from sql server db specifying the table name and the
+ * column name that have the constraint.
+ * @author gcast
+ *
+ */
+public class SqlServerAnonymousUniqueConstraintDelete implements DbTask // NO_UCD (unused code)
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(SqlServerAnonymousUniqueConstraintDelete.class);
+
+ /**
+ * name of the table with the unique constraint to remove.
+ */
+ private String tableName;
+
+ /**
+ * name of the column with the unique constraint to remove.
+ */
+ private String columnName;
+
+ /**
+ * name of the column with the unique constraint to remove.
+ */
+ private String description;
+
+ private static final String QUERY_TO_FIND_NAME_OF_UNIQUE_CONSTRAINT_INDEX = "select indxs.name index_name "
+ + " from sys.indexes indxs, sys.columns clmns, sys.index_columns indx_clmn "
+ + " where indxs.object_id = object_id(?) "
+ + " and clmns.object_id = object_id(?) "
+ + " and indx_clmn.object_id = object_id(?) "
+ + " and indxs.index_id = indx_clmn.index_id "
+ + " and clmns.column_id = indx_clmn.column_id "
+ + " and indxs.is_unique_constraint = 1 "
+ + " and clmns.name = ?";
+
+ /**
+ * Sets the tableName.
+ * @param tableName the tableName to set
+ */
+ public void setTableName(String tableName)
+ {
+ this.tableName = tableName;
+ }
+
+ /**
+ * Sets the columnName.
+ * @param columnName the columnName to set
+ */
+ public void setColumnName(String columnName)
+ {
+ this.columnName = columnName;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void execute(DataSource dataSource)
+ {
+ if (StringUtils.isBlank(tableName) || StringUtils.isBlank(columnName))
+ {
+ log.error(
+ "Both table name and column name must be specificed. table name: \"{}\", column name \"{}\".",
+ tableName,
+ columnName);
+ return;
+ }
+
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+ List<String> query = jdbcTemplate.query(QUERY_TO_FIND_NAME_OF_UNIQUE_CONSTRAINT_INDEX, new RowMapper<String>()
+ {
+
+ @Override
+ public String mapRow(ResultSet rs, int rowNum) throws SQLException
+ {
+ return rs.getString("index_name");
+ }
+ }, tableName, tableName, tableName, columnName);
+ if (query.size() == 1)
+ {
+ String alterTableDropConstraint = "ALTER TABLE " + tableName + " DROP CONSTRAINT " + query.get(0);
+ log.debug("Executing:\n{}", alterTableDropConstraint);
+ jdbcTemplate.update(alterTableDropConstraint);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getDescription()
+ {
+ return description;
+ }
+
+ /**
+ * Sets the description.
+ * @param description the description to set
+ */
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
+}
Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerAnonymousUniqueConstraintDelete.java
___________________________________________________________________
Added: svn
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerDefaultValueConstraintDelete.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerDefaultValueConstraintDelete.java (rev 0)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerDefaultValueConstraintDelete.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -0,0 +1,141 @@
+/**
+ *
+ * openutils dbmigration (http://www.openmindlab.com/lab/products/dbmigration.html)
+ * Copyright(C) 2007-2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package it.openutils.migration.sqlserver;
+
+import it.openutils.migration.task.setup.DbTask;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+
+/**
+ * This class can be used to remove anonymous unique constraint from sql server db specifying the table name and the
+ * column name that have the constraint.
+ * @author gcast
+ *
+ */
+public class SqlServerDefaultValueConstraintDelete implements DbTask // NO_UCD (unused code)
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(SqlServerDefaultValueConstraintDelete.class);
+
+ /**
+ * name of the table with the unique constraint to remove.
+ */
+ private String tableName;
+
+ /**
+ * name of the column with the unique constraint to remove.
+ */
+ private String columnName;
+
+ /**
+ * name of the column with the unique constraint to remove.
+ */
+ private String description;
+
+ private static final String QUERY_TO_FIND_NAME_OF_UNIQUE_CONSTRAINT_INDEX = "SELECT NAME "
+ + " FROM SYSOBJECTS SO "
+ + " JOIN SYSCONSTRAINTS SC ON SO.ID = SC.CONSTID "
+ + " WHERE OBJECT_NAME(SO.PARENT_OBJ) = ? "
+ + " AND SO.XTYPE = 'D' AND SC.COLID = "
+ + " (SELECT COLID FROM SYSCOLUMNS WHERE ID = OBJECT_ID(?) AND NAME = ?)";
+
+ /**
+ * Sets the tableName.
+ * @param tableName the tableName to set
+ */
+ public void setTableName(String tableName)
+ {
+ this.tableName = tableName;
+ }
+
+ /**
+ * Sets the columnName.
+ * @param columnName the columnName to set
+ */
+ public void setColumnName(String columnName)
+ {
+ this.columnName = columnName;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void execute(DataSource dataSource)
+ {
+ if (StringUtils.isBlank(tableName) || StringUtils.isBlank(columnName))
+ {
+ log.error(
+ "Both table name and column name must be specificed. table name: \"{}\", column name \"{}\".",
+ tableName,
+ columnName);
+ return;
+ }
+
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+ List<String> query = jdbcTemplate.query(QUERY_TO_FIND_NAME_OF_UNIQUE_CONSTRAINT_INDEX, new RowMapper<String>()
+ {
+
+ @Override
+ public String mapRow(ResultSet rs, int rowNum) throws SQLException
+ {
+ return rs.getString("name");
+ }
+ }, tableName, tableName, columnName);
+ if (query.size() == 1)
+ {
+ String alterTableDropConstraint = "ALTER TABLE " + tableName + " DROP CONSTRAINT " + query.get(0);
+ log.debug("Executing:\n{}", alterTableDropConstraint);
+ jdbcTemplate.update(alterTableDropConstraint);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getDescription()
+ {
+ return description;
+ }
+
+ /**
+ * Sets the description.
+ * @param description the description to set
+ */
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
+}
Property changes on: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerDefaultValueConstraintDelete.java
___________________________________________________________________
Added: svn
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -25,7 +25,7 @@
import javax.sql.DataSource;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.core.io.Resource;
import org.springframework.jdbc.core.JdbcTemplate;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerObjCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerObjCreationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerObjCreationTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -24,7 +24,7 @@
import javax.sql.DataSource;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.core.io.Resource;
import org.springframework.jdbc.core.JdbcTemplate;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -25,7 +25,7 @@
import javax.sql.DataSource;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.core.io.Resource;
import org.springframework.jdbc.core.JdbcTemplate;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerScriptBasedUnconditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerScriptBasedUnconditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerScriptBasedUnconditionalTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -24,7 +24,7 @@
import javax.sql.DataSource;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerSynonymCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerSynonymCreationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerSynonymCreationTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -17,11 +17,16 @@
*/
package it.openutils.migration.sqlserver;
+
import java.util.List;
import javax.sql.DataSource;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.jdbc.core.JdbcTemplate;
import it.openutils.migration.task.setup.DbTask;
@@ -29,23 +34,14 @@
/**
* @author Danilo Ghirardelli
- * @version $Id:SqlServerSynonymCreationTask.java 3143 2007-09-24 19:50:49Z fgiust $
+ *
*/
public class SqlServerSynonymCreationTask implements DbTask
{
- private String source;
-
private List<String> objects;
- /**
- * Sets the source.
- * @param source the source to set
- */
- public void setSource(String source)
- {
- this.source = source;
- }
+ private Logger log = LoggerFactory.getLogger(SqlServerSynonymCreationTask.class);
/**
* Sets the objects.
@@ -59,6 +55,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void execute(DataSource dataSource)
{
@@ -66,15 +63,40 @@
for (String objectName : objects)
{
+
+ String originalobj = objectName;
+ String synonym = objectName;
+
+ if (StringUtils.contains(objectName, "="))
+ {
+ synonym = StringUtils.substringBefore(originalobj, "=");
+ originalobj = StringUtils.substringAfter(originalobj, "=");
+ }
+
int result = jdbcTemplate.queryForObject(
"select count(*) from dbo.sysobjects where id = object_id(?) and xtype = N'SN'",
- Integer.class,
- objectName);
- if (result == 0)
+ new Object[]{synonym },
+ Integer.class);
+
+ if (result > 0)
{
- jdbcTemplate.update(
- "CREATE SYNONYM [dbo].[" + objectName + "] FOR [" + source + "].[dbo].[" + objectName + "]");
+ // existing synonym, nothing to do
+ continue;
}
+
+ result = jdbcTemplate.queryForObject(
+ "select count(*) from dbo.sysobjects where id = object_id(?)",
+ new Object[]{synonym },
+ Integer.class);
+
+ if (result > 0)
+ {
+ log.warn("An existing object with name {} has been found, but it's not a synonym as expected", synonym);
+ continue;
+ }
+
+ jdbcTemplate.update("CREATE SYNONYM " + synonym + " FOR " + originalobj + "");
+
}
}
@@ -82,8 +104,9 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getDescription()
{
- return "Creating synonyms from " + source;
+ return "Creating synonyms from " + ArrayUtils.toString(objects);
}
}
\ No newline at end of file
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreateOrUpdateTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreateOrUpdateTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreateOrUpdateTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -1,6 +1,6 @@
/**
*
- * openutils db migration (http://www.openmindlab.com/lab/products/dbmigration.html)
+ * openutils dbmigration (http://www.openmindlab.com/lab/products/dbmigration.html)
* Copyright(C) 2007-2010, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,7 +25,7 @@
import javax.sql.DataSource;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.core.io.Resource;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -54,7 +54,7 @@
{
String viewName = this.objectNameFromFileName(script);
- int result = jdbcTemplate.queryForObject(checkQuery, Integer.class, viewName);
+ int result = jdbcTemplate.queryForObject(checkQuery, new Object[]{viewName }, Integer.class);
String scriptContent = readFully(script);
scriptContent = StringUtils.replace(scriptContent, "\t", " ");
@@ -73,17 +73,23 @@
else
{
- List<String> previousDDlList = jdbcTemplate
- .queryForList("exec sp_helptext ?", new Object[]{viewName }, String.class);
+ List<String> previousDDlList = jdbcTemplate.queryForList(
+ "exec sp_helptext ?",
+ new Object[]{viewName },
+ String.class);
String previousDDl = StringUtils.join(previousDDlList.toArray(new String[previousDDlList.size()]));
- if (!StringUtils.equals(previousDDl, scriptContent))
+ if (!StringUtils.equals(
+ StringUtils.replace(previousDDl, " ", ""),
+ StringUtils.replace(scriptContent, " ", "")))
{
log.info(
"Previous definition of view {} differs from actual. Dropping and recreating view",
new Object[]{viewName });
+ // log.warn("=====\n{}\n=====", previousDDl);
+
jdbcTemplate.update("DROP VIEW [dbo].[" + viewName + "]");
createView(jdbcTemplate, scriptContent);
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseConditionalTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -27,11 +27,12 @@
import javax.sql.DataSource;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+
/**
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DatabaseConditionalTaskList.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DatabaseConditionalTaskList.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/DatabaseConditionalTaskList.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -24,7 +24,7 @@
import javax.sql.DataSource;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -34,9 +34,9 @@
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.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericConditionalTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -20,7 +20,7 @@
import java.util.HashMap;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.jdbc.core.JdbcTemplate;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ScriptBasedUnconditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ScriptBasedUnconditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ScriptBasedUnconditionalTask.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -24,7 +24,7 @@
import javax.sql.DataSource;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/ScriptBasedDbUpdate.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/ScriptBasedDbUpdate.java 2016-04-03 20:06:40 UTC (rev 4636)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/ScriptBasedDbUpdate.java 2016-04-04 13:54:34 UTC (rev 4637)
@@ -24,7 +24,7 @@
import javax.sql.DataSource;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2016-04-03 20:06:43
|
Revision: 4636
http://openutils.svn.sourceforge.net/openutils/?rev=4636&view=rev
Author: fgiust
Date: 2016-04-03 20:06:40 +0000 (Sun, 03 Apr 2016)
Log Message:
-----------
upgrade spring version
Modified Paths:
--------------
trunk/openutils-dbmigration/pom.xml
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcColumnBasedConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIndexExistsConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIsNotNullableConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfForeignKeyExistsConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfPrimaryKeyExistsConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfTableExistsConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OraclePackageCreationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleSequenceCreationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleStoredProcedureCallTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleTriggerTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleViewCreateOrUpdateTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/postgres/PostGreSQLSequenceChecker.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerObjCreationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerScriptBasedUnconditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerSynonymCreationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreateOrUpdateTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericConditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ScriptBasedUnconditionalTask.java
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/update/ScriptBasedDbUpdate.java
Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/pom.xml 2016-04-03 20:06:40 UTC (rev 4636)
@@ -148,6 +148,6 @@
</plugins>
</build>
<properties>
- <spring.version>3.0.0.RELEASE</spring.version>
+ <spring.version>4.2.5.RELEASE</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DbSetupManagerImpl.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,9 +18,6 @@
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;
@@ -36,7 +33,10 @@
import org.springframework.transaction.support.TransactionCallbackWithoutResult;
import org.springframework.transaction.support.TransactionTemplate;
+import it.openutils.migration.task.setup.DbTask;
+import it.openutils.migration.task.update.DbUpdate;
+
/**
* DB setup manager: handles db setup and upgrade.
* @author fgiust
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/DefaultDbVersionManagerImpl.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -21,7 +21,7 @@
import javax.sql.DataSource;
import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
/**
@@ -95,11 +95,11 @@
*/
public int getCurrentVersion()
{
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
int initialVersion = 0;
try
{
- initialVersion = jdbcTemplate.queryForInt(versionQuery);
+ initialVersion = jdbcTemplate.queryForObject(versionCreate, Integer.class);
}
catch (EmptyResultDataAccessException e)
{
@@ -113,7 +113,7 @@
*/
public void setNewVersion(int version)
{
- new SimpleJdbcTemplate(dataSource).update(versionUpdate, version);
+ new JdbcTemplate(dataSource).update(versionUpdate, version);
}
}
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcColumnBasedConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcColumnBasedConditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcColumnBasedConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.generic;
-import it.openutils.migration.task.setup.BaseConditionalTask;
-
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
@@ -31,9 +29,11 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.BaseConditionalTask;
+
/**
* Base conditional task that operates on conditions related to a specific column. This base task takes care of
* retrieving the column metadata, so that subclasses only need to override <code>checkColumnMetadata()</code>.
@@ -89,14 +89,14 @@
* {@inheritDoc}
*/
@Override
- public boolean check(SimpleJdbcTemplate jdbcTemplate)
+ public boolean check(JdbcTemplate jdbcTemplate)
{
String columnTrim = StringUtils.trim(column);
final String tableName = StringUtils.substringBefore(columnTrim, ".");
final String columnName = StringUtils.substringAfter(columnTrim, ".");
- return (Boolean) jdbcTemplate.getJdbcOperations().execute(new ConnectionCallback()
+ return (Boolean) jdbcTemplate.execute(new ConnectionCallback()
{
public Object doInConnection(Connection con) throws SQLException, DataAccessException
@@ -136,14 +136,14 @@
* qualified</li>
* <li><strong>COLUMN_SIZE</strong> int => column size.</li>
* <li><strong>BUFFER_LENGTH</strong> is not used.</li>
- * <li><strong>DECIMAL_DIGITS</strong> int => the number of fractional digits. Null is returned for data types
- * where DECIMAL_DIGITS is not applicable.</li>
+ * <li><strong>DECIMAL_DIGITS</strong> int => the number of fractional digits. Null is returned for data types where
+ * DECIMAL_DIGITS is not applicable.</li>
* <li><strong>NUM_PREC_RADIX</strong> int => Radix (typically either 10 or 2)</li>
* <li><strong>NULLABLE</strong> int => is NULL allowed.</li>
* <ul>
- * <li> columnNoNulls - might not allow <code>NULL</code> values</li>
- * <li> columnNullable - definitely allows <code>NULL</code> values</li>
- * <li> columnNullableUnknown - nullability unknown</li>
+ * <li>columnNoNulls - might not allow <code>NULL</code> values</li>
+ * <li>columnNullable - definitely allows <code>NULL</code> values</li>
+ * <li>columnNullableUnknown - nullability unknown</li>
* </ul>
* <li><strong>REMARKS</strong> String => comment describing column (may be <code>null</code>)</li>
* <li><strong>COLUMN_DEF</strong> String => default value for the column, which should be interpreted as a string
@@ -154,23 +154,23 @@
* <li><strong>ORDINAL_POSITION</strong> int => index of column in table (starting at 1)</li>
* <li><strong>IS_NULLABLE</strong> String => ISO rules are used to determine the nullability for a column.</li>
* <ul>
- * <li> YES --- if the parameter can include NULLs</li>
- * <li> NO --- if the parameter cannot include NULLs</li>
- * <li> empty string --- if the nullability for the parameter is unknown</li>
+ * <li>YES --- if the parameter can include NULLs</li>
+ * <li>NO --- if the parameter cannot include NULLs</li>
+ * <li>empty string --- if the nullability for the parameter is unknown</li>
* </ul>
- * <li><strong>SCOPE_CATLOG</strong> String => catalog of table that is the scope of a reference attribute (<code>null</code>
- * if DATA_TYPE isn't REF)</li>
- * <li><strong>SCOPE_SCHEMA</strong> String => schema of table that is the scope of a reference attribute (<code>null</code>
- * if the DATA_TYPE isn't REF)</li>
- * <li><strong>SCOPE_TABLE</strong> String => table name that this the scope of a reference attribure (<code>null</code>
- * if the DATA_TYPE isn't REF)</li>
+ * <li><strong>SCOPE_CATLOG</strong> String => catalog of table that is the scope of a reference attribute (
+ * <code>null</code> if DATA_TYPE isn't REF)</li>
+ * <li><strong>SCOPE_SCHEMA</strong> String => schema of table that is the scope of a reference attribute (
+ * <code>null</code> if the DATA_TYPE isn't REF)</li>
+ * <li><strong>SCOPE_TABLE</strong> String => table name that this the scope of a reference attribure (
+ * <code>null</code> if the DATA_TYPE isn't REF)</li>
* <li><strong>SOURCE_DATA_TYPE</strong> short => source type of a distinct type or user-generated Ref type, SQL
* type from java.sql.Types (<code>null</code> if DATA_TYPE isn't DISTINCT or user-generated REF)</li>
* <li><strong>IS_AUTOINCREMENT</strong> String => Indicates whether this column is auto incremented</li>
* <ul>
- * <li> YES --- if the column is auto incremented</li>
- * <li> NO --- if the column is not auto incremented</li>
- * <li> empty string --- if it cannot be determined whether the column is auto incremented parameter is unknown</li>
+ * <li>YES --- if the column is auto incremented</li>
+ * <li>NO --- if the column is not auto incremented</li>
+ * <li>empty string --- if it cannot be determined whether the column is auto incremented parameter is unknown</li>
* </ul>
* </ol>
* @param metadata column metadata
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.generic;
-import it.openutils.migration.task.setup.BaseConditionalTask;
-
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
@@ -28,9 +26,11 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.BaseConditionalTask;
+
/**
* Task that executes if a given column exists.
* @author fgiust
@@ -85,14 +85,14 @@
* {@inheritDoc}
*/
@Override
- public boolean check(SimpleJdbcTemplate jdbcTemplate)
+ public boolean check(JdbcTemplate jdbcTemplate)
{
String columnTrim = StringUtils.trim(column);
final String tableName = StringUtils.substringBefore(columnTrim, ".");
final String columnName = StringUtils.substringAfter(columnTrim, ".");
- return (Boolean) jdbcTemplate.getJdbcOperations().execute(new ConnectionCallback()
+ return (Boolean) jdbcTemplate.execute(new ConnectionCallback()
{
public Object doInConnection(Connection con) throws SQLException, DataAccessException
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIndexExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIndexExistsConditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIndexExistsConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.generic;
-import it.openutils.migration.task.setup.BaseConditionalTask;
-
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
@@ -38,9 +36,11 @@
import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.BaseConditionalTask;
+
/**
* Task that executes if a given column have at least one index.
* @author Antonio Gagliardi
@@ -111,7 +111,7 @@
*/
@SuppressWarnings("unchecked")
@Override
- public boolean check(SimpleJdbcTemplate jdbcTemplate)
+ public boolean check(JdbcTemplate jdbcTemplate)
{
Set<IndexItem> indexExpected = new TreeSet<IndexItem>();
@@ -143,8 +143,7 @@
return indexs.values();
}
};
- Collection<Set<IndexItem>> indexs = (Collection<Set<IndexItem>>) jdbcTemplate.getJdbcOperations().execute(
- action);
+ Collection<Set<IndexItem>> indexs = (Collection<Set<IndexItem>>) jdbcTemplate.execute(action);
log.debug("Expected:{}", asString(indexExpected));
for (Set<IndexItem> index : indexs)
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIsNotNullableConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIsNotNullableConditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnIsNotNullableConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -20,7 +20,9 @@
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
+
/**
* Task that executes if a given column is not nullable (IS_NULLABLE = NO).
* @author fgiust
@@ -36,7 +38,7 @@
protected boolean checkColumnMetadata(Map<String, Object> metadata)
{
- String isNullable = (String) metadata.get("IS_NULLABLE");
- return "NO".equals(isNullable);
+ String isNullable = StringUtils.trim((String) metadata.get("IS_NULLABLE"));
+ return "NO".equalsIgnoreCase(isNullable);
}
}
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfForeignKeyExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfForeignKeyExistsConditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfForeignKeyExistsConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.generic;
-import it.openutils.migration.task.setup.BaseConditionalTask;
-
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
@@ -28,9 +26,11 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.BaseConditionalTask;
+
/**
* Task that executes if a named foreign key eists.
* @author fgiust
@@ -76,14 +76,14 @@
* {@inheritDoc}
*/
@Override
- public boolean check(SimpleJdbcTemplate jdbcTemplate)
+ public boolean check(JdbcTemplate jdbcTemplate)
{
String fkNameTrim = StringUtils.trim(fkName);
final String tableName = StringUtils.substringBefore(fkNameTrim, ".");
final String fkName = StringUtils.substringAfter(fkNameTrim, ".");
- return (Boolean) jdbcTemplate.getJdbcOperations().execute(new ConnectionCallback()
+ return (Boolean) jdbcTemplate.execute(new ConnectionCallback()
{
public Object doInConnection(Connection con) throws SQLException, DataAccessException
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfPrimaryKeyExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfPrimaryKeyExistsConditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfPrimaryKeyExistsConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.generic;
-import it.openutils.migration.task.setup.BaseConditionalTask;
-
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
@@ -33,9 +31,11 @@
import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.BaseConditionalTask;
+
/**
* Task that executes if a given column have at least one index.
* @author Antonio Gagliardi
@@ -60,7 +60,7 @@
*/
@SuppressWarnings("unchecked")
@Override
- public boolean check(SimpleJdbcTemplate jdbcTemplate)
+ public boolean check(JdbcTemplate jdbcTemplate)
{
checkInputs();
@@ -83,7 +83,7 @@
return primaryKey.values();
}
};
- Collection<String> primaryKeyActual = (Collection<String>) jdbcTemplate.getJdbcOperations().execute(action);
+ Collection<String> primaryKeyActual = (Collection<String>) jdbcTemplate.execute(action);
log.debug("Actual:{}", asString(primaryKeyActual));
if (primaryKeyActual.isEmpty())
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfTableExistsConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfTableExistsConditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfTableExistsConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.generic;
-import it.openutils.migration.task.setup.BaseConditionalTask;
-
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
@@ -28,9 +26,11 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.BaseConditionalTask;
+
/**
* Task that executes if a given table exists.
* @author fgiust
@@ -72,7 +72,6 @@
this.schema = schema;
}
-
/**
* Sets the table.
* @param table the table to set
@@ -86,12 +85,12 @@
* {@inheritDoc}
*/
@Override
- public boolean check(SimpleJdbcTemplate jdbcTemplate)
+ public boolean check(JdbcTemplate jdbcTemplate)
{
final String tableName = StringUtils.trim(table);
- return (Boolean) jdbcTemplate.getJdbcOperations().execute(new ConnectionCallback()
+ return (Boolean) jdbcTemplate.execute(new ConnectionCallback()
{
public Object doInConnection(Connection con) throws SQLException, DataAccessException
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.generic;
-import it.openutils.migration.task.setup.GenericConditionalTask;
-
import java.io.IOException;
import java.io.InputStream;
import java.sql.Connection;
@@ -35,9 +33,10 @@
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import it.openutils.migration.task.setup.GenericConditionalTask;
+
/**
* @author fgiust
* @version $Id:SqlServerObjCreationTask.java 3143 2007-09-24 19:50:49Z fgiust $
@@ -81,7 +80,7 @@
@Override
public void execute(DataSource dataSource)
{
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (Resource script : scripts)
{
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OraclePackageCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OraclePackageCreationTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OraclePackageCreationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.oracle;
-import it.openutils.migration.task.setup.DbTask;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
@@ -32,9 +30,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.DbTask;
+
/**
* Db tasks that handles the initial setup of packages.
* @author quario
@@ -110,7 +110,7 @@
*/
public void execute(DataSource dataSource)
{
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (Resource script : scripts)
{
@@ -143,11 +143,12 @@
if (StringUtils.isNotBlank(owner))
{
- result = jdbcTemplate.queryForInt(selectAllPackages, new Object[]{packageName, owner });
+ result = jdbcTemplate
+ .queryForObject(selectAllPackages, Integer.class, new Object[]{packageName, owner });
}
else
{
- result = jdbcTemplate.queryForInt(selectUserPackages, packageName);
+ result = jdbcTemplate.queryForObject(selectUserPackages, Integer.class, packageName);
}
if (result <= 0)
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleSequenceCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleSequenceCreationTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleSequenceCreationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.oracle;
-import it.openutils.migration.task.setup.DbTask;
-
import java.text.MessageFormat;
import java.util.List;
@@ -28,9 +26,11 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.DbTask;
+
/**
* Db tasks that handles the initial setup of sequences.
* @author fgiust
@@ -112,7 +112,7 @@
*/
public void execute(DataSource dataSource)
{
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (String sequenceName : sequences)
{
int result = 0;
@@ -120,19 +120,19 @@
if (StringUtils.contains(sequenceName, "."))
{
String[] tokens = StringUtils.split(sequenceName, ".");
- result = jdbcTemplate.queryForInt(selectAllSequences, new Object[]{tokens[1], tokens[0] });
+ result = jdbcTemplate
+ .queryForObject(selectAllSequences, Integer.class, new Object[]{tokens[1], tokens[0] });
}
else
{
- result = jdbcTemplate.queryForInt(selectUserSequences, sequenceName);
+ result = jdbcTemplate.queryForObject(selectUserSequences, Integer.class, sequenceName);
}
if (result <= 0)
{
log.info("Creating new {}", sequenceName);
- jdbcTemplate.update(MessageFormat.format(creationQuery, new Object[]{
- sequenceName,
- String.valueOf(startsWith) }));
+ jdbcTemplate.update(
+ MessageFormat.format(creationQuery, new Object[]{sequenceName, String.valueOf(startsWith) }));
}
}
}
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleStoredProcedureCallTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleStoredProcedureCallTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleStoredProcedureCallTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,24 +18,24 @@
package it.openutils.migration.oracle;
-import it.openutils.migration.task.setup.GenericConditionalTask;
-
import java.sql.CallableStatement;
import java.sql.Connection;
import java.sql.SQLException;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.support.JdbcUtils;
+import it.openutils.migration.task.setup.GenericConditionalTask;
+
public class OracleStoredProcedureCallTask extends GenericConditionalTask
{
@Override
- protected void executeSingle(SimpleJdbcTemplate jdbcTemplate, final String scriptContent)
+ protected void executeSingle(JdbcTemplate jdbcTemplate, final String scriptContent)
{
- jdbcTemplate.getJdbcOperations().execute(new ConnectionCallback()
+ jdbcTemplate.execute(new ConnectionCallback()
{
public Object doInConnection(Connection con) throws SQLException, DataAccessException
{
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleTriggerTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleTriggerTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleTriggerTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,16 +18,16 @@
package it.openutils.migration.oracle;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.jdbc.core.JdbcTemplate;
+
import it.openutils.migration.task.setup.GenericConditionalTask;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
-
public class OracleTriggerTask extends GenericConditionalTask
{
@Override
- protected void executeSingle(SimpleJdbcTemplate jdbcTemplate, final String scriptContent)
+ protected void executeSingle(JdbcTemplate jdbcTemplate, final String scriptContent)
{
if (StringUtils.isNotBlank(scriptContent))
{
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleViewCreateOrUpdateTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleViewCreateOrUpdateTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/oracle/OracleViewCreateOrUpdateTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.oracle;
-import it.openutils.migration.task.setup.DbTask;
-
import java.io.IOException;
import java.io.InputStream;
import java.text.MessageFormat;
@@ -34,9 +32,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.DbTask;
+
/**
* <p>
* Db tasks that handles the initial setup of views.
@@ -45,8 +45,8 @@
* Limitations:
* </p>
* <ol>
- * <li> * not supported in field list</li>
- * <li> fields must be enclosed in quotes</li>
+ * <li>* not supported in field list</li>
+ * <li>fields must be enclosed in quotes</li>
* </ol>
* @author albertoq
* @version $Id$
@@ -110,12 +110,12 @@
public void execute(DataSource dataSource)
{
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (Resource script : scripts)
{
String viewName = this.objectNameFromFileName(script);
- int result = jdbcTemplate.queryForInt(this.selectUserViewExistence, viewName);
+ int result = jdbcTemplate.queryForObject(this.selectUserViewExistence, Integer.class, viewName);
String scriptContent = readFully(script);
@@ -138,10 +138,8 @@
continue;
}
- String previousDDl = (String) jdbcTemplate.getJdbcOperations().queryForObject(
- this.selectUserViewDDL,
- new Object[]{viewName },
- String.class);
+ String previousDDl = jdbcTemplate
+ .queryForObject(this.selectUserViewDDL, new Object[]{viewName }, String.class);
if (!StringUtils.equals(previousDDl.trim(), scriptBody.trim()))
{
@@ -182,7 +180,7 @@
* @param script
* @return
*/
- private void createView(SimpleJdbcTemplate jdbcTemplate, String script)
+ private void createView(JdbcTemplate jdbcTemplate, String script)
{
String[] ddls = StringUtils.split(script, ";");
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/postgres/PostGreSQLSequenceChecker.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/postgres/PostGreSQLSequenceChecker.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/postgres/PostGreSQLSequenceChecker.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -17,8 +17,6 @@
*/
package it.openutils.migration.postgres;
-import it.openutils.migration.task.setup.GenericConditionalTask;
-
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -32,7 +30,9 @@
import org.springframework.jdbc.core.ConnectionCallback;
import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.GenericConditionalTask;
+
/**
* This is just a patch to move sequences after inserting values from dbMigration. The real solution should be to have
* all the database objects generated by dbMigration and not by hibernate. THIS TASK IS NOT CLUSTER SAFE NOR THREAD
@@ -107,31 +107,31 @@
});
for (String tableName : tables)
{
- if (jdbcTemplate
- .queryForLong("SELECT COUNT(*) FROM information_schema.sequences WHERE SEQUENCE_NAME ILIKE '"
+ if (jdbcTemplate.queryForObject(
+ "SELECT COUNT(*) FROM information_schema.sequences WHERE SEQUENCE_NAME ILIKE '"
+ tableName
- + "_id_seq'") > 0)
+ + "_id_seq'",
+ Long.class) > 0)
{
- String idColumnName = (String) jdbcTemplate.queryForObject(
- "SELECT COLUMN_NAME FROM information_schema.columns WHERE TABLE_NAME ILIKE '"
- + tableName
- + "' AND COLUMN_DEFAULT ILIKE 'nextval(%"
- + tableName
- + "_id_seq%'",
- String.class);
- long tableRows = jdbcTemplate.queryForLong("SELECT MAX(" + idColumnName + ") FROM " + tableName);
- long sequenceVal = jdbcTemplate.queryForLong("SELECT last_value FROM " + tableName + "_id_seq");
+ String idColumnName = jdbcTemplate
+ .queryForObject(
+ "SELECT COLUMN_NAME FROM information_schema.columns WHERE TABLE_NAME ILIKE '"
+ + tableName
+ + "' AND COLUMN_DEFAULT ILIKE 'nextval(%"
+ + tableName
+ + "_id_seq%'",
+ String.class);
+ long tableRows = jdbcTemplate
+ .queryForObject("SELECT MAX(" + idColumnName + ") FROM " + tableName, Long.class);
+ long sequenceVal = jdbcTemplate
+ .queryForObject("SELECT last_value FROM " + tableName + "_id_seq", Long.class);
if ((sequenceVal >= 0) && (tableRows > sequenceVal))
{
- jdbcTemplate.execute("SELECT setval('"
- + tableName
- + "_id_seq', "
- + Long.toString(tableRows + offset)
- + ")");
- log.info("Moved sequence \"{}_id_seq\" value from {} to {}.", new Object[]{
- tableName,
- sequenceVal,
- (tableRows + offset) });
+ jdbcTemplate.execute(
+ "SELECT setval('" + tableName + "_id_seq', " + Long.toString(tableRows + offset) + ")");
+ log.info(
+ "Moved sequence \"{}_id_seq\" value from {} to {}.",
+ new Object[]{tableName, sequenceVal, (tableRows + offset) });
jdbcTemplate.execute("REINDEX TABLE " + tableName);
log.info("Reindexed table: " + tableName);
}
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerFunctionCreateOrUpdateTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.sqlserver;
-import it.openutils.migration.task.setup.GenericConditionalTask;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
@@ -29,9 +27,11 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.GenericConditionalTask;
+
/**
* Compares the function script with the one stored in the db and drops and recreates it if the scripts differs. Be
* aware that tabs chars are ALWAYS considered different, so remove them from your scripts! This works ONLY for SQL
@@ -51,11 +51,11 @@
{
String checkQuery = "select count(*) from dbo.sysobjects where id = object_id(?) and xtype in (N'FN', N'IF', N'TF')";
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (Resource script : scripts)
{
String functionName = this.objectNameFromFileName(script);
- int result = jdbcTemplate.queryForInt(checkQuery, functionName);
+ int result = jdbcTemplate.queryForObject(checkQuery, Integer.class, functionName);
String scriptContent = readFully(script);
scriptContent = StringUtils.replace(scriptContent, "\t", " ");
if (StringUtils.isBlank(scriptContent))
@@ -69,10 +69,8 @@
}
else
{ // If the script is too long a list will be returned, and it must be joined to get the original script.
- List<String> previousDDlList = jdbcTemplate.getJdbcOperations().queryForList(
- "exec sp_helptext ?",
- new Object[]{functionName },
- String.class);
+ List<String> previousDDlList = jdbcTemplate
+ .queryForList("exec sp_helptext ?", new Object[]{functionName }, String.class);
String previousDDl = StringUtils.join(previousDDlList.toArray(new String[previousDDlList.size()]));
if (!StringUtils.equals(previousDDl, scriptContent))
{
@@ -93,7 +91,7 @@
* @param script Function script.
* @return
*/
- private void createFunction(SimpleJdbcTemplate jdbcTemplate, String script)
+ private void createFunction(JdbcTemplate jdbcTemplate, String script)
{
String[] ddls = StringUtils.split(script, ";");
for (String ddl : ddls)
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerObjCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerObjCreationTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerObjCreationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.sqlserver;
-import it.openutils.migration.task.setup.GenericConditionalTask;
-
import java.io.IOException;
import java.io.InputStream;
@@ -28,9 +26,11 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.GenericConditionalTask;
+
/**
* @author fgiust
* @version $Id:SqlServerObjCreationTask.java 3143 2007-09-24 19:50:49Z fgiust $
@@ -90,7 +90,7 @@
@Override
public void execute(DataSource dataSource)
{
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (Resource script : scripts)
{
String fqTableName = this.objectNameFromFileName(script);
@@ -99,11 +99,12 @@
if (StringUtils.contains(fqTableName, "."))
{
String[] tokens = StringUtils.split(fqTableName, ".");
- result = jdbcTemplate.queryForInt(qualifiedObjQuery, new Object[]{tokens[1], tokens[0] });
+ result = jdbcTemplate
+ .queryForObject(qualifiedObjQuery, Integer.class, new Object[]{tokens[1], tokens[0] });
}
else
{
- result = jdbcTemplate.queryForInt(unqualifiedObjQuery, fqTableName);
+ result = jdbcTemplate.queryForObject(unqualifiedObjQuery, Integer.class, fqTableName);
}
if (result == 0)
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerProcedureCreateOrUpdateTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.sqlserver;
-import it.openutils.migration.task.setup.GenericConditionalTask;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
@@ -29,9 +27,11 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.GenericConditionalTask;
+
/**
* Compares the procedure script with the one stored in the db and drops and recreates it if the scripts differs. Be
* aware that tabs chars are ALWAYS considered different, so remove them from your scripts! This works ONLY for SQL
@@ -50,11 +50,11 @@
public void execute(DataSource dataSource)
{
String checkQuery = "select count(*) from dbo.sysobjects where id = object_id(?) and (OBJECTPROPERTY(id, N'IsProcedure') = 1)";
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (Resource script : scripts)
{
String procedureName = this.objectNameFromFileName(script);
- int result = jdbcTemplate.queryForInt(checkQuery, procedureName);
+ int result = jdbcTemplate.queryForObject(checkQuery, Integer.class, procedureName);
String scriptContent = readFully(script);
scriptContent = StringUtils.replace(scriptContent, "\t", " ");
if (StringUtils.isBlank(scriptContent))
@@ -68,10 +68,8 @@
}
else
{ // If the script is too long a list will be returned, and it must be joined to get the original script.
- List<String> previousDDlList = jdbcTemplate.getJdbcOperations().queryForList(
- "exec sp_helptext ?",
- new Object[]{procedureName },
- String.class);
+ List<String> previousDDlList = jdbcTemplate
+ .queryForList("exec sp_helptext ?", new Object[]{procedureName }, String.class);
String previousDDl = StringUtils.join(previousDDlList.toArray(new String[previousDDlList.size()]));
if (!StringUtils.equals(previousDDl, scriptContent))
{
@@ -92,7 +90,7 @@
* @param script Stored procedure script.
* @return
*/
- private void createProcedure(SimpleJdbcTemplate jdbcTemplate, String script)
+ private void createProcedure(JdbcTemplate jdbcTemplate, String script)
{
String[] ddls = StringUtils.split(script, ";");
for (String ddl : ddls)
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerScriptBasedUnconditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerScriptBasedUnconditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerScriptBasedUnconditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,10 +18,6 @@
package it.openutils.migration.sqlserver;
-import it.openutils.migration.task.setup.BaseDbTask;
-import it.openutils.migration.task.setup.DbTask;
-import it.openutils.migration.task.setup.ScriptBasedUnconditionalTask;
-
import java.io.IOException;
import java.util.List;
@@ -32,9 +28,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.BaseDbTask;
+import it.openutils.migration.task.setup.DbTask;
+import it.openutils.migration.task.setup.ScriptBasedUnconditionalTask;
+
/**
* @author fgiust
* @version $Id:SqlServerScriptBasedUnconditionalTask.java 3143 2007-09-24 19:50:49Z fgiust $
@@ -86,7 +86,7 @@
}
String[] ddls = splitStatements(scriptContent);
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (final String ddl : ddls)
{
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerSynonymCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerSynonymCreationTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerSynonymCreationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,15 +18,15 @@
package it.openutils.migration.sqlserver;
-import it.openutils.migration.task.setup.DbTask;
-
import java.util.List;
import javax.sql.DataSource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.DbTask;
+
/**
* @author Danilo Ghirardelli
* @version $Id:SqlServerSynonymCreationTask.java 3143 2007-09-24 19:50:49Z fgiust $
@@ -62,22 +62,18 @@
public void execute(DataSource dataSource)
{
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (String objectName : objects)
{
- int result = jdbcTemplate.queryForInt(
+ int result = jdbcTemplate.queryForObject(
"select count(*) from dbo.sysobjects where id = object_id(?) and xtype = N'SN'",
+ Integer.class,
objectName);
if (result == 0)
{
- jdbcTemplate.update("CREATE SYNONYM [dbo].["
- + objectName
- + "] FOR ["
- + source
- + "].[dbo].["
- + objectName
- + "]");
+ jdbcTemplate.update(
+ "CREATE SYNONYM [dbo].[" + objectName + "] FOR [" + source + "].[dbo].[" + objectName + "]");
}
}
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreateOrUpdateTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreateOrUpdateTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/sqlserver/SqlServerViewCreateOrUpdateTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -18,8 +18,6 @@
package it.openutils.migration.sqlserver;
-import it.openutils.migration.task.setup.GenericConditionalTask;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
@@ -29,9 +27,11 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
+import it.openutils.migration.task.setup.GenericConditionalTask;
+
/**
* @author Danilo Ghirardelli
* @version $Id: SqlServerViewCreateOrUpdateTask.java 391 2007-07-10 17:25:42Z fgiust $
@@ -49,12 +49,12 @@
String checkQuery = "select count(*) from dbo.sysobjects where id = object_id(?) and OBJECTPROPERTY(id, N'IsView') = 1";
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
for (Resource script : scripts)
{
String viewName = this.objectNameFromFileName(script);
- int result = jdbcTemplate.queryForInt(checkQuery, viewName);
+ int result = jdbcTemplate.queryForObject(checkQuery, Integer.class, viewName);
String scriptContent = readFully(script);
scriptContent = StringUtils.replace(scriptContent, "\t", " ");
@@ -73,10 +73,8 @@
else
{
- List<String> previousDDlList = jdbcTemplate.getJdbcOperations().queryForList(
- "exec sp_helptext ?",
- new Object[]{viewName },
- String.class);
+ List<String> previousDDlList = jdbcTemplate
+ .queryForList("exec sp_helptext ?", new Object[]{viewName }, String.class);
String previousDDl = StringUtils.join(previousDDlList.toArray(new String[previousDDlList.size()]));
@@ -100,7 +98,7 @@
* @param script
* @return
*/
- private void createView(SimpleJdbcTemplate jdbcTemplate, String script)
+ private void createView(JdbcTemplate jdbcTemplate, String script)
{
String[] ddls = StringUtils.split(script, ";");
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseConditionalTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/BaseConditionalTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -31,7 +31,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
/**
@@ -125,10 +125,10 @@
/**
* Subclasses need to override this method and provide specific checks.
- * @param jdbcTemplate SimpleJdbcTemplate
+ * @param jdbcTemplate JdbcTemplate
* @return true if the condition is met
*/
- public abstract boolean check(SimpleJdbcTemplate jdbcTemplate);
+ public abstract boolean check(JdbcTemplate jdbcTemplate);
/**
* {@inheritDoc}
@@ -192,7 +192,7 @@
*/
public void execute(DataSource dataSource)
{
- SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource);
+ JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
if (check(jdbcTemplate) ^ not)
{
@@ -241,7 +241,7 @@
* @param jdbcTemplate
* @param scriptContent
*/
- protected void executeSingle(SimpleJdbcTemplate jdbcTemplate, String scriptContent)
+ protected void executeSingle(JdbcTemplate jdbcTemplate, String scriptContent)
{
String[] ddls;
if (StringUtils.isNotEmpty(splitChar))
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2015-04-17 11:06:02 UTC (rev 4635)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2016-04-03 20:06:40 UTC (rev 4636)
@@ -141,25 +141,25 @@
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 sheetName = StringUtils.trim(hssfworkbook.getSheetName(j));
- QueryConfig conf = config.get(sheetName);
- if (conf == null)
- {
- suggestSheetConfig(sheet, sheetName, conf, dataSource);
- continue;
- }
-
- String tableName = (StringUtils.isBlank(conf.getTableName())) ? sheetName : conf.getTableName();
- processSheet(sheet, tableName, conf, dataSource);
- }
+ 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 sheetName = StringUtils.trim(hssfworkbook.getSheetName(j));
+ QueryConfig conf = config.get(sheetName);
+ if (conf == null)
+ {
+ suggestSheetConfig(sheet, sheetName, conf, dataSource);
+ continue;
+ }
+ String tableName = (StringUtils.isBlank(conf.getTableName())) ? sheetName : conf.getTableName();
+ processSheet(sheet, tableName, conf, dataSource);
+ }
+
}
catch (IOException e)
{
@@ -210,17 +210,19 @@
buffer.append(" <entry key=\"");
buffer.append(tableName);
- buffer.append("\">\n"
- + " <bean class=\"it.openutils.migration.task.setup.ExcelConfigurationTask$QueryConfig\">\n"
- + " <property name=\"checkQuery\">\n"
- + " <value>");
+ buffer.append(
+ "\">\n"
+ + " <bean class=\"it.openutils.migration.task.setup.ExcelConfigurationTask$QueryConfig\">\n"
+ + " <property name=\"checkQuery\">\n"
+ + " <value>");
String initialCol = columns.get(0);
buffer.append("select count(" + initialCol + ") from " + tableName + " where " + initialCol + " = ?");
- buffer.append("</value>\n"
- + " </property>\n"
- + " <property name=\"insertQuery\">\n"
- + " <value>");
+ buffer.append(
+ "</value>\n"
+ + " </property>\n"
+ + " <property name=\"insertQuery\">\n"
+ + " <value>");
buffer.append("INSERT INTO ");
buffer.append(tableName);
@@ -429,12 +431,14 @@
int existing;
try
{
- existing = jdbcTemplate.queryForInt(checkStatement, checkParams, checkParamTypes);
+ existing = jdbcTemplate.queryForObject(checkStatement, Integer.class, checkParams, checkParamTypes);
}
catch (BadSqlGrammarException bsge)
{
- log.error("Error executing check query, current sheet will be skipped. {} Query in error: {}", bsge
- .getMessage(), checkStatement);
+ log.error(
+ "Error executing check query, current sheet will be skipped. {} Query in error: {}",
+ bsge.getMessage(),
+ checkStatement);
return;
}
@@ -478,16 +482,17 @@
if (log.isDebugEnabled())
{
- log.debug("Missing record with key {}; inserting {}", ArrayUtils.toString(checkParams), ArrayUtils
- .toString(insertParams));
+ 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});
+ log.warn(
+ "Invalid number of param/type for table {}. Params: {}, types: {}",
+ new Object[]{tableName, insertParams.length, insertTypes.length });
}
try
@@ -496,15 +501,14 @@
}
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()});
+ log.error(
+ "Error executing update, record at {}:{} will be skipped. Query in error: '{}', values:...
[truncated message content] |
|
From: <gca...@us...> - 2015-04-17 11:06:05
|
Revision: 4635
http://openutils.svn.sourceforge.net/openutils/?rev=4635&view=rev
Author: gcatania
Date: 2015-04-17 11:06:02 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
update parent version
Modified Paths:
--------------
magnoliamodules/trunk/magnolia-test-webapp/pom.xml
magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
magnoliamodules/trunk/openutils-mgnlcache/pom.xml
magnoliamodules/trunk/openutils-mgnlcas/pom.xml
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
magnoliamodules/trunk/openutils-mgnlext/pom.xml
magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnlmail/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
magnoliamodules/trunk/openutils-mgnlrules/pom.xml
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltasks/pom.xml
magnoliamodules/trunk/openutils-mgnltests/pom.xml
magnoliamodules/trunk/openutils-mgnlutils/pom.xml
Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlbootstrapsync/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
Modified: magnoliamodules/trunk/openutils-mgnlext/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlext/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlext/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-mgnlstruts11</artifactId>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnltests/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnltests/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml 2015-04-17 11:06:02 UTC (rev 4635)
@@ -3,7 +3,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2015-04-17 10:55:50
|
Revision: 4634
http://openutils.svn.sourceforge.net/openutils/?rev=4634&view=rev
Author: gcatania
Date: 2015-04-17 10:55:38 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
update parent version
Modified Paths:
--------------
branches/openutils-bshd5-backport/pom.xml
trunk/openutils-bshd5/pom.xml
trunk/openutils-dbmigration/pom.xml
trunk/openutils-deployment/pom.xml
trunk/openutils-elfunctions/pom.xml
trunk/openutils-log4j/pom.xml
trunk/openutils-maven-skin/pom.xml
trunk/openutils-spring/pom.xml
trunk/openutils-testing/pom.xml
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-testng/pom.xml
trunk/openutils-testing4dwr/pom.xml
trunk/openutils-testing4dwr-junit/pom.xml
trunk/openutils-testing4dwr-testng/pom.xml
trunk/openutils-testing4web/pom.xml
Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml 2015-04-17 10:50:43 UTC (rev 4633)
+++ branches/openutils-bshd5-backport/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-bshd5</artifactId>
<packaging>bundle</packaging>
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2015-04-17 10:50:43 UTC (rev 4633)
+++ trunk/openutils-bshd5/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-bshd5</artifactId>
<packaging>bundle</packaging>
Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2015-04-17 10:50:43 UTC (rev 4633)
+++ trunk/openutils-dbmigration/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-dbmigration</artifactId>
<name>openutils dbmigration</name>
Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2015-04-17 10:50:43 UTC (rev 4633)
+++ trunk/openutils-deployment/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-deployment</artifactId>
<name>openutils deployment tools</name>
Modified: trunk/openutils-elfunctions/pom.xml
===================================================================
--- trunk/openutils-elfunctions/pom.xml 2015-04-17 10:50:43 UTC (rev 4633)
+++ trunk/openutils-elfunctions/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml 2015-04-17 10:50:43 UTC (rev 4633)
+++ trunk/openutils-log4j/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
@@ -6,7 +6,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-log4j</artifactId>
<packaging>jar</packaging>
Modified: trunk/openutils-maven-skin/pom.xml
===================================================================
--- trunk/openutils-maven-skin/pom.xml 2015-04-17 10:50:43 UTC (rev 4633)
+++ trunk/openutils-maven-skin/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-maven-skin</artifactId>
<packaging>jar</packaging>
Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2015-04-17 10:50:43 UTC (rev 4633)
+++ trunk/openutils-spring/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-spring</artifactId>
<name>openutils spring tools</name>
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2015-04-17 10:50:43 UTC (rev 4633)
+++ trunk/openutils-testing/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-testing</artifactId>
<name>Openutils testing library</name>
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2015-04-17 10:50:43 UTC (rev 4633)
+++ trunk/openutils-testing-junit/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-testing-junit</artifactId>
<name>Openutils testing library (JUnit)</name>
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2015-04-17 10:50:43 UTC (rev 4633)
+++ trunk/openutils-testing-testng/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-testing-testng</artifactId>
<name>Openutils testing library (TestNG)</name>
Modified: trunk/openutils-testing4dwr/pom.xml
===================================================================
--- trunk/openutils-testing4dwr/pom.xml 2015-04-17 10:50:43 UTC (rev 4633)
+++ trunk/openutils-testing4dwr/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-testing4dwr</artifactId>
<name>openutils dwr test utils</name>
Modified: trunk/openutils-testing4dwr-junit/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-junit/pom.xml 2015-04-17 10:50:43 UTC (rev 4633)
+++ trunk/openutils-testing4dwr-junit/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-testing4dwr-junit</artifactId>
<name>openutils testing4dwr (junit)</name>
Modified: trunk/openutils-testing4dwr-testng/pom.xml
===================================================================
--- trunk/openutils-testing4dwr-testng/pom.xml 2015-04-17 10:50:43 UTC (rev 4633)
+++ trunk/openutils-testing4dwr-testng/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-testing4dwr-testng</artifactId>
<name>openutils testing4dwr (testng)</name>
Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml 2015-04-17 10:50:43 UTC (rev 4633)
+++ trunk/openutils-testing4web/pom.xml 2015-04-17 10:55:38 UTC (rev 4634)
@@ -5,7 +5,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.14</version>
+ <version>1.15</version>
</parent>
<artifactId>openutils-testing4web</artifactId>
<name>Openutils testing4web</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2015-04-17 10:50:45
|
Revision: 4633
http://openutils.svn.sourceforge.net/openutils/?rev=4633&view=rev
Author: gcatania
Date: 2015-04-17 10:50:43 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-parent/pom.xml
Modified: trunk/openutils-parent/pom.xml
===================================================================
--- trunk/openutils-parent/pom.xml 2015-04-17 10:50:33 UTC (rev 4632)
+++ trunk/openutils-parent/pom.xml 2015-04-17 10:50:43 UTC (rev 4633)
@@ -4,14 +4,14 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<packaging>pom</packaging>
- <version>1.15</version>
+ <version>1.16-SNAPSHOT</version>
<name>openutils</name>
<url>http://openutils.sourceforge.net</url>
<description>openutils parent pom</description>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-parent-1.15</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-parent-1.15</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-parent-1.15</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-parent</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-parent</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-parent</url>
</scm>
<issueManagement>
<system>jira</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2015-04-17 10:50:40
|
Revision: 4632
http://openutils.svn.sourceforge.net/openutils/?rev=4632&view=rev
Author: gcatania
Date: 2015-04-17 10:50:33 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-parent-1.15
Added Paths:
-----------
tags/openutils-parent-1.15/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2015-04-17 10:50:28
|
Revision: 4631
http://openutils.svn.sourceforge.net/openutils/?rev=4631&view=rev
Author: gcatania
Date: 2015-04-17 10:50:26 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-parent-1.15
Modified Paths:
--------------
trunk/openutils-parent/pom.xml
Modified: trunk/openutils-parent/pom.xml
===================================================================
--- trunk/openutils-parent/pom.xml 2015-04-17 10:46:28 UTC (rev 4630)
+++ trunk/openutils-parent/pom.xml 2015-04-17 10:50:26 UTC (rev 4631)
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
<modelVersion>4.0.0</modelVersion>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<packaging>pom</packaging>
- <version>1.15-SNAPSHOT</version>
+ <version>1.15</version>
<name>openutils</name>
<url>http://openutils.sourceforge.net</url>
<description>openutils parent pom</description>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-parent</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/trunk/openutils-parent</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-parent</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-parent-1.15</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-parent-1.15</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-parent-1.15</url>
</scm>
<issueManagement>
<system>jira</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2015-04-17 10:46:35
|
Revision: 4630
http://openutils.svn.sourceforge.net/openutils/?rev=4630&view=rev
Author: gcatania
Date: 2015-04-17 10:46:28 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
parent version bumps
Modified Paths:
--------------
trunk/openutils-parent/pom.xml
Modified: trunk/openutils-parent/pom.xml
===================================================================
--- trunk/openutils-parent/pom.xml 2015-04-17 09:31:14 UTC (rev 4629)
+++ trunk/openutils-parent/pom.xml 2015-04-17 10:46:28 UTC (rev 4630)
@@ -106,7 +106,7 @@
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
+ <version>2.7</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
@@ -114,14 +114,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
+ <version>3.4</version>
<configuration>
<stagingSiteURL>scp://shell.sourceforge.net/home/frs/project/openutils/htdocs/staging/${project.artifactId}/</stagingSiteURL>
</configuration>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.4.1</version>
+ <version>2.5.1</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<preparationGoals>install</preparationGoals>
@@ -131,14 +131,14 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
+ <version>2.18.1</version>
<configuration>
<useManifestOnlyJar>false</useManifestOnlyJar>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.3</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -147,11 +147,11 @@
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.5.2</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
+ <version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -163,7 +163,7 @@
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.8.2</version>
</plugin>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
@@ -200,7 +200,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5.3</version>
<executions>
<execution>
<id>bundle</id>
@@ -219,7 +219,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.10.3</version>
<configuration>
<encoding>UTF-8</encoding>
<quiet>true</quiet>
@@ -232,7 +232,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
- <version>2.5</version>
+ <version>2.8</version>
</extension>
</extensions>
</build>
@@ -240,7 +240,7 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.10.3</version>
<configuration>
<encoding>UTF-8</encoding>
<quiet>true</quiet>
@@ -249,11 +249,11 @@
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</plugin>
<plugin>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.7</version>
+ <version>2.11</version>
<reportSets>
<reportSet>
<reports>
@@ -264,15 +264,15 @@
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.16</version>
+ <version>2.18.1</version>
</plugin>
<plugin>
<artifactId>maven-changelog-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
</plugin>
</plugins>
</reporting>
@@ -322,22 +322,22 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.5</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
+ <version>${slf4j.version}</version>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
@@ -378,7 +378,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
+ <version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -395,5 +395,6 @@
</profiles>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <slf4j.version>1.7.12</slf4j.version>
</properties>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2015-04-17 09:31:21
|
Revision: 4629
http://openutils.svn.sourceforge.net/openutils/?rev=4629&view=rev
Author: gcatania
Date: 2015-04-17 09:31:14 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
update staging URLS
Modified Paths:
--------------
trunk/openutils-parent/pom.xml
Modified: trunk/openutils-parent/pom.xml
===================================================================
--- trunk/openutils-parent/pom.xml 2015-04-17 08:55:57 UTC (rev 4628)
+++ trunk/openutils-parent/pom.xml 2015-04-17 09:31:14 UTC (rev 4629)
@@ -116,7 +116,7 @@
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<configuration>
- <stagingSiteURL>scp://shell.sourceforge.net/home/frs/project/o/op/openutils/htdocs/staging/${project.artifactId}/</stagingSiteURL>
+ <stagingSiteURL>scp://shell.sourceforge.net/home/frs/project/openutils/htdocs/staging/${project.artifactId}/</stagingSiteURL>
</configuration>
</plugin>
<plugin>
@@ -280,7 +280,7 @@
<site>
<id>sourceforge</id>
<name>sourceforge</name>
- <url>scp://shell.sourceforge.net/home/frs/project/o/op/openutils/htdocs/</url>
+ <url>scp://shell.sourceforge.net/home/frs/project/openutils/htdocs/</url>
</site>
<downloadUrl>https://sourceforge.net/projects/openutils/files/</downloadUrl>
<repository>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2015-04-17 08:56:04
|
Revision: 4628
http://openutils.svn.sourceforge.net/openutils/?rev=4628&view=rev
Author: gcatania
Date: 2015-04-17 08:55:57 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
branches/openutils-bshd5-backport/pom.xml
Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml 2015-04-17 08:55:52 UTC (rev 4627)
+++ branches/openutils-bshd5-backport/pom.xml 2015-04-17 08:55:57 UTC (rev 4628)
@@ -9,7 +9,7 @@
<artifactId>openutils-bshd5</artifactId>
<packaging>bundle</packaging>
<name>openutils base Spring-Hibernate DAO</name>
- <version>1.9.3</version>
+ <version>1.9.4-SNAPSHOT</version>
<description>Openutils base Spring-Hibernate DAO (for java 5 and more)</description>
<licenses>
<license>
@@ -24,9 +24,9 @@
</issueManagement>
<inceptionYear>2005</inceptionYear>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-bshd5-1.9.3</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-bshd5-1.9.3</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-bshd5-1.9.3</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code//branches/openutils-bshd5-backport</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code//branches/openutils-bshd5-backport</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree//branches/openutils-bshd5-backport</url>
</scm>
<build>
<testResources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2015-04-17 08:55:53
|
Revision: 4627
http://openutils.svn.sourceforge.net/openutils/?rev=4627&view=rev
Author: gcatania
Date: 2015-04-17 08:55:52 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-bshd5-1.9.3
Added Paths:
-----------
tags/openutils-bshd5-1.9.3/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2015-04-17 08:55:47
|
Revision: 4626
http://openutils.svn.sourceforge.net/openutils/?rev=4626&view=rev
Author: gcatania
Date: 2015-04-17 08:55:45 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-bshd5-1.9.3
Modified Paths:
--------------
branches/openutils-bshd5-backport/pom.xml
Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml 2015-04-17 08:48:02 UTC (rev 4625)
+++ branches/openutils-bshd5-backport/pom.xml 2015-04-17 08:55:45 UTC (rev 4626)
@@ -9,7 +9,7 @@
<artifactId>openutils-bshd5</artifactId>
<packaging>bundle</packaging>
<name>openutils base Spring-Hibernate DAO</name>
- <version>1.9.3-SNAPSHOT</version>
+ <version>1.9.3</version>
<description>Openutils base Spring-Hibernate DAO (for java 5 and more)</description>
<licenses>
<license>
@@ -24,9 +24,9 @@
</issueManagement>
<inceptionYear>2005</inceptionYear>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code//branches/openutils-bshd5-backport</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code//branches/openutils-bshd5-backport</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree//branches/openutils-bshd5-backport</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-bshd5-1.9.3</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-bshd5-1.9.3</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-bshd5-1.9.3</url>
</scm>
<build>
<testResources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2015-04-17 08:48:05
|
Revision: 4625
http://openutils.svn.sourceforge.net/openutils/?rev=4625&view=rev
Author: gcatania
Date: 2015-04-17 08:48:02 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
Merged revisions 4624 via svnmerge from
svn+ssh://gcatania@svn.code.sf.net/p/openutils/code/trunk/openutils-bshd5
........
r4624 | gcatania | 2015-04-17 10:43:39 +0200 (ven, 17 apr 2015) | 1 line
BSHD-27 regression after refactoring - distinct root entity transformer got lost
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4624&view=rev
Modified Paths:
--------------
branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
Property Changed:
----------------
branches/openutils-bshd5-backport/
Index: branches/openutils-bshd5-backport
===================================================================
--- branches/openutils-bshd5-backport 2015-04-17 08:43:39 UTC (rev 4624)
+++ branches/openutils-bshd5-backport 2015-04-17 08:48:02 UTC (rev 4625)
Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4383,4572-4573,4575,4577,4585,4587-4588
+/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4239,4241-4409,4411-4452,4455,4457-4570,4572-4624
\ No newline at end of property
Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2015-04-17 08:43:39 UTC (rev 4624)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2015-04-17 08:48:02 UTC (rev 4625)
@@ -814,7 +814,8 @@
@Override
protected Criteria createCriteria(Session session)
{
- Criteria crit = new FilterMetadataSupport(rootEntity, filterMetadata).create(session);
+ Criteria crit = new FilterMetadataSupport(rootEntity, filterMetadata).create(session).setResultTransformer(
+ CriteriaSpecification.DISTINCT_ROOT_ENTITY);
if (additionalCriteria != null)
{
for (Criterion c : additionalCriteria)
@@ -847,19 +848,14 @@
{
super(rootEntity, maxResults, page, metadata, additionalCriteria, orders);
this.properties = properties;
-
}
@Override
protected Criteria createCriteria(Session session)
{
Criteria crit = super.createCriteria(session);
- if (CollectionUtils.isEmpty(properties))
+ if (CollectionUtils.isNotEmpty(properties))
{
- crit.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
- }
- else
- {
ProjectionList projectionList = Projections.projectionList();
for (String property : properties)
{
@@ -941,7 +937,7 @@
@Override
protected Criteria createCriteria(Session session)
{
- return exampleTree.create(session);
+ return exampleTree.create(session).setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
}
}
@@ -966,12 +962,8 @@
protected Criteria createCriteria(Session session)
{
Criteria crit = super.createCriteria(session);
- if (CollectionUtils.isEmpty(properties))
+ if (CollectionUtils.isNotEmpty(properties))
{
- crit.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
- }
- else
- {
ProjectionList projectionList = Projections.projectionList();
for (String property : properties)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2015-04-17 08:43:42
|
Revision: 4624
http://openutils.svn.sourceforge.net/openutils/?rev=4624&view=rev
Author: gcatania
Date: 2015-04-17 08:43:39 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
BSHD-27 regression after refactoring - distinct root entity transformer got lost
Modified Paths:
--------------
trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2015-04-13 19:46:54 UTC (rev 4623)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2015-04-17 08:43:39 UTC (rev 4624)
@@ -796,7 +796,8 @@
@Override
protected Criteria createCriteria(Session session)
{
- Criteria crit = new FilterMetadataSupport(rootEntity, filterMetadata).create(session);
+ Criteria crit = new FilterMetadataSupport(rootEntity, filterMetadata).create(session).setResultTransformer(
+ CriteriaSpecification.DISTINCT_ROOT_ENTITY);
if (additionalCriteria != null)
{
for (Criterion c : additionalCriteria)
@@ -829,19 +830,14 @@
{
super(rootEntity, maxResults, page, metadata, additionalCriteria, orders);
this.properties = properties;
-
}
@Override
protected Criteria createCriteria(Session session)
{
Criteria crit = super.createCriteria(session);
- if (CollectionUtils.isEmpty(properties))
+ if (CollectionUtils.isNotEmpty(properties))
{
- crit.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
- }
- else
- {
ProjectionList projectionList = Projections.projectionList();
for (String property : properties)
{
@@ -923,7 +919,7 @@
@Override
protected Criteria createCriteria(Session session)
{
- return exampleTree.create(session);
+ return exampleTree.create(session).setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
}
}
@@ -948,12 +944,8 @@
protected Criteria createCriteria(Session session)
{
Criteria crit = super.createCriteria(session);
- if (CollectionUtils.isEmpty(properties))
+ if (CollectionUtils.isNotEmpty(properties))
{
- crit.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
- }
- else
- {
ProjectionList projectionList = Projections.projectionList();
for (String property : properties)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2015-04-13 19:47:02
|
Revision: 4623
http://openutils.svn.sourceforge.net/openutils/?rev=4623&view=rev
Author: molaschi
Date: 2015-04-13 19:46:54 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2015-04-13 19:46:42 UTC (rev 4622)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2015-04-13 19:46:54 UTC (rev 4623)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlmessages</artifactId>
<name>Messages Module for Magnolia CMS</name>
<description>Manage your translations from the Magnolia admin interface</description>
- <version>5.0.12</version>
+ <version>5.0.13-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -24,9 +24,9 @@
</issueManagement>
<inceptionYear>2008</inceptionYear>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlmessages-5.0.12</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlmessages-5.0.12</developerConnection>
- <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlmessages-5.0.12</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmessages</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmessages</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlmessages</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2015-04-13 19:46:50
|
Revision: 4622
http://openutils.svn.sourceforge.net/openutils/?rev=4622&view=rev
Author: molaschi
Date: 2015-04-13 19:46:42 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmessages-5.0.12
Added Paths:
-----------
tags/openutils-mgnlmessages-5.0.12/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2015-04-13 19:46:34
|
Revision: 4621
http://openutils.svn.sourceforge.net/openutils/?rev=4621&view=rev
Author: molaschi
Date: 2015-04-13 19:46:27 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmessages-5.0.12
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2015-04-13 19:44:11 UTC (rev 4620)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2015-04-13 19:46:27 UTC (rev 4621)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlmessages</artifactId>
<name>Messages Module for Magnolia CMS</name>
<description>Manage your translations from the Magnolia admin interface</description>
- <version>5.0.12-SNAPSHOT</version>
+ <version>5.0.12</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -24,9 +24,9 @@
</issueManagement>
<inceptionYear>2008</inceptionYear>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmessages</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmessages</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlmessages</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlmessages-5.0.12</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlmessages-5.0.12</developerConnection>
+ <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlmessages-5.0.12</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2015-04-13 19:44:13
|
Revision: 4620
http://openutils.svn.sourceforge.net/openutils/?rev=4620&view=rev
Author: molaschi
Date: 2015-04-13 19:44:11 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
fix imported tag libraries
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag 2015-04-13 15:32:36 UTC (rev 4619)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag 2015-04-13 19:44:11 UTC (rev 4620)
@@ -1,12 +1,10 @@
-<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib"
- xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
- xmlns:media="http://net.sourceforge.openutils/mgnlMedia" xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld"
- xmlns:su="http://openutils.sf.net/openutils-stringutils" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:mu="mgnlutils"
- xmlns:du="dateutils" xmlns:fdt="urn:jsptagdir:/WEB-INF/tags/fieradigitale-tags" xmlns:mgnlt="urn:jsptagdir:/WEB-INF/tags/mgnltags"
- xmlns:fd="fieradigitale">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+ xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn"
+ xmlns:mu="mgnlutils">
<jsp:directive.attribute name="jqueryui" required="false" rtexprvalue="true" type="java.lang.Boolean" />
<jsp:directive.attribute name="jquery" required="false" rtexprvalue="true" type="java.lang.Boolean" />
- <c:if test="${mgnl.editMode and cmsfn:canEdit()}">
+ <c:if test="${cmsfn:isEditMode() and mu:canEdit()}">
<c:if test="${not empty jquery and jquery}">
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"><!-- -->
</script>
@@ -23,7 +21,7 @@
style="position:absolute;background:#000 url(${appCtx}/.resources/messages/icons/edit.png) center \
center no-repeat;border-radius:4px;-moz-border-radius:4px;\
-webkit-border-radius:4px;width:24px;height:24px;z-index:1000; top:-5px; left:-24px;"></a>');
-
+
function init(container, dialog) {
container.css({
"-webkit-border-radius" : 4,
@@ -35,18 +33,18 @@
var msgLocale = container.attr("data-msglocale");
var msgDefaultLocale = container.attr("data-msgdefaultlocale");
var defaultMsg = container.attr("data-msgdefault");
-
+
container.append(editLink.clone()).css('position','relative').find('a')
.fadeTo('slow',0.3)
- .live('mouseenter',function(){
+ .on('mouseenter',function(){
$(this).fadeTo('slow',1.0);
msgsWithSameKey.animate({"background-color" : 'yellow'});
})
- .live('mouseleave',function(){
+ .on('mouseleave',function(){
editLink.fadeTo('slow',0.3);
msgsWithSameKey.css({"background-color" : 'transparent'});
})
- .live('click',function(evt){
+ .on('click',function(evt){
evt.preventDefault();
currentMsgEdit = container;
$("#dialog-msgEdit-default").css({
@@ -58,8 +56,8 @@
dialog.dialog( "open" );
});
};
-
- $.fn.mgnlMessageEdit = function(params) {
+
+ $.fn.mgnlMessageEdit = function(params) {
var dialog = $("#dialog-msgEdit").dialog({
autoOpen: false,
height: 220,
@@ -99,19 +97,19 @@
},
close: function() {
}
-
+
});
$(this).each(function(i,el){
- init($(el), dialog);
+ init($(el), dialog);
});
- };
-
+ };
+
})($);
-
+
$('head').append('<link type="text/css" rel="stylesheet" href="${appCtx}/.resources/messages/css/messages.css" />');
$('head').append('<link type="text/css" rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.3/themes/smoothness/jquery-ui.css" />');
-
- $(document).ready(function(){
+
+ $(document).ready(function(){
$(".msgEdit").mgnlMessageEdit();
});
]]>
@@ -131,4 +129,4 @@
</form>
</div>
</c:if>
-</jsp:root>
\ No newline at end of file
+</jsp:root>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2015-04-13 15:32:43
|
Revision: 4619
http://openutils.svn.sourceforge.net/openutils/?rev=4619&view=rev
Author: molaschi
Date: 2015-04-13 15:32:36 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2015-04-13 15:32:25 UTC (rev 4618)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2015-04-13 15:32:36 UTC (rev 4619)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlmessages</artifactId>
<name>Messages Module for Magnolia CMS</name>
<description>Manage your translations from the Magnolia admin interface</description>
- <version>5.0.11</version>
+ <version>5.0.12-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -24,9 +24,9 @@
</issueManagement>
<inceptionYear>2008</inceptionYear>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlmessages-5.0.11</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlmessages-5.0.11</developerConnection>
- <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlmessages-5.0.11</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmessages</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmessages</developerConnection>
+ <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlmessages</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2015-04-13 15:32:32
|
Revision: 4618
http://openutils.svn.sourceforge.net/openutils/?rev=4618&view=rev
Author: molaschi
Date: 2015-04-13 15:32:25 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmessages-5.0.11
Added Paths:
-----------
tags/openutils-mgnlmessages-5.0.11/openutils-mgnlmessages/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2015-04-13 15:32:17
|
Revision: 4617
http://openutils.svn.sourceforge.net/openutils/?rev=4617&view=rev
Author: molaschi
Date: 2015-04-13 15:32:14 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmessages-5.0.11
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2015-04-13 15:31:12 UTC (rev 4616)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2015-04-13 15:32:14 UTC (rev 4617)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlmessages</artifactId>
<name>Messages Module for Magnolia CMS</name>
<description>Manage your translations from the Magnolia admin interface</description>
- <version>5.0.11-SNAPSHOT</version>
+ <version>5.0.11</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -24,9 +24,9 @@
</issueManagement>
<inceptionYear>2008</inceptionYear>
<scm>
- <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmessages</connection>
- <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlmessages</developerConnection>
- <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlmessages</url>
+ <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlmessages-5.0.11</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlmessages-5.0.11</developerConnection>
+ <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlmessages-5.0.11</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2015-04-13 15:31:24
|
Revision: 4616
http://openutils.svn.sourceforge.net/openutils/?rev=4616&view=rev
Author: molaschi
Date: 2015-04-13 15:31:12 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
[maven-release-plugin] rollback the release of openutils-mgnlmessages-5.0.11
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2015-04-13 15:20:45 UTC (rev 4615)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml 2015-04-13 15:31:12 UTC (rev 4616)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlmessages</artifactId>
<name>Messages Module for Magnolia CMS</name>
<description>Manage your translations from the Magnolia admin interface</description>
- <version>5.0.12-SNAPSHOT</version>
+ <version>5.0.11-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
