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...> - 2011-06-11 07:50:15
|
Revision: 3515
http://openutils.svn.sourceforge.net/openutils/?rev=3515&view=rev
Author: fgiust
Date: 2011-06-11 07:50:09 +0000 (Sat, 11 Jun 2011)
Log Message:
-----------
upgrade to java 6
Modified Paths:
--------------
trunk/openutils-parent/pom.xml
Modified: trunk/openutils-parent/pom.xml
===================================================================
--- trunk/openutils-parent/pom.xml 2011-06-07 11:34:01 UTC (rev 3514)
+++ trunk/openutils-parent/pom.xml 2011-06-11 07:50:09 UTC (rev 3515)
@@ -129,8 +129,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-06-07 11:34:07
|
Revision: 3514
http://openutils.svn.sourceforge.net/openutils/?rev=3514&view=rev
Author: fgiust
Date: 2011-06-07 11:34:01 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
renaming of old directory
Modified Paths:
--------------
trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java
Modified: trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java
===================================================================
--- trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2011-06-07 11:32:11 UTC (rev 3513)
+++ trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2011-06-07 11:34:01 UTC (rev 3514)
@@ -460,8 +460,10 @@
// remove cache folder
if (cacheDir.exists())
{
- cacheDir.renameTo(new File(cacheDir.getParentFile(), "deleted." + System.currentTimeMillis()));
+ final File renamedDir = new File(cacheDir.getParentFile(), "deleted." + System.currentTimeMillis());
+ cacheDir.renameTo(renamedDir);
+
new Thread()
{
@@ -472,7 +474,7 @@
public void run()
{
log.info("Deleting stale cache dir {}", cacheDir.getAbsolutePath());
- boolean deleted = cacheDir.delete();
+ boolean deleted = renamedDir.delete();
if (deleted)
{
log.info("Cache dir {} successfully deleted", cacheDir.getAbsolutePath());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-06-07 11:32:22
|
Revision: 3513
http://openutils.svn.sourceforge.net/openutils/?rev=3513&view=rev
Author: fgiust
Date: 2011-06-07 11:32:11 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
logging
Modified Paths:
--------------
trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java
Modified: trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java
===================================================================
--- trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2011-06-06 17:24:41 UTC (rev 3512)
+++ trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java 2011-06-07 11:32:11 UTC (rev 3513)
@@ -471,7 +471,16 @@
@Override
public void run()
{
- cacheDir.delete();
+ log.info("Deleting stale cache dir {}", cacheDir.getAbsolutePath());
+ boolean deleted = cacheDir.delete();
+ if (deleted)
+ {
+ log.info("Cache dir {} successfully deleted", cacheDir.getAbsolutePath());
+ }
+ else
+ {
+ log.info("Unable to delete cache dir {}", cacheDir.getAbsolutePath());
+ }
}
}.start();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2011-06-06 17:44:34
|
See <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/155/changes> |
|
From: <hu...@op...> - 2011-06-06 17:44:30
|
See <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/155/changes> |
|
From: <fg...@us...> - 2011-06-06 17:24:47
|
Revision: 3512
http://openutils.svn.sourceforge.net/openutils/?rev=3512&view=rev
Author: fgiust
Date: 2011-06-06 17:24:41 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/pom.xml
Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml 2011-06-06 17:24:33 UTC (rev 3511)
+++ trunk/openutils-mgnlcriteria/pom.xml 2011-06-06 17:24:41 UTC (rev 3512)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
- <version>3.3.2</version>
+ <version>3.3.3-SNAPSHOT</version>
<inceptionYear>2009</inceptionYear>
<description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
<licenses>
@@ -23,9 +23,9 @@
<url>http://jira.openmindlab.com/browse/CRIT</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-3.3.2</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-3.3.2</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlcriteria-3.3.2</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcriteria</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-06-06 17:24:39
|
Revision: 3511
http://openutils.svn.sourceforge.net/openutils/?rev=3511&view=rev
Author: fgiust
Date: 2011-06-06 17:24:33 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlcriteria-3.3.2
Added Paths:
-----------
tags/openutils-mgnlcriteria-3.3.2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-06-06 17:24:19
|
Revision: 3510
http://openutils.svn.sourceforge.net/openutils/?rev=3510&view=rev
Author: fgiust
Date: 2011-06-06 17:24:13 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcriteria-3.3.2
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/pom.xml
Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml 2011-06-06 17:23:08 UTC (rev 3509)
+++ trunk/openutils-mgnlcriteria/pom.xml 2011-06-06 17:24:13 UTC (rev 3510)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -9,7 +8,7 @@
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>Criteria API for Magnolia CMS</name>
- <version>3.3.2-SNAPSHOT</version>
+ <version>3.3.2</version>
<inceptionYear>2009</inceptionYear>
<description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
<licenses>
@@ -24,9 +23,9 @@
<url>http://jira.openmindlab.com/browse/CRIT</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcriteria</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-3.3.2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-3.3.2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlcriteria-3.3.2</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 3509
http://openutils.svn.sourceforge.net/openutils/?rev=3509&view=rev
Author: fgiust
Date: 2011-06-06 17:23:08 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
license header
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java
Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java 2011-06-06 17:21:52 UTC (rev 3508)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java 2011-06-06 17:23:08 UTC (rev 3509)
@@ -1,4 +1,23 @@
/**
+ *
+ * Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
+ * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
*
*/
package net.sourceforge.openutils.mgnlcriteria.advanced.impl;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-06-06 17:21:59
|
Revision: 3508
http://openutils.svn.sourceforge.net/openutils/?rev=3508&view=rev
Author: fgiust
Date: 2011-06-06 17:21:52 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
CRIT-38 Criteria return all elements if offset is set and offset > maxResult - 1 and DocumentOrder = true
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java
trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-06-06 13:45:34 UTC (rev 3507)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2011-06-06 17:21:52 UTC (rev 3508)
@@ -71,6 +71,8 @@
private final boolean applyLocalPaging;
+ private int offset;
+
/**
* @param jcrQueryResult
* @param itemsPerPage
@@ -108,6 +110,37 @@
Query spellCheckerQuery,
boolean applyLocalPaging)
{
+ this(
+ jcrQueryResult,
+ itemsPerPage,
+ pageNumberStartingFromOne,
+ statement,
+ hm,
+ spellCheckerQuery,
+ applyLocalPaging,
+ 0);
+ }
+
+ /**
+ * @param jcrQueryResult
+ * @param itemsPerPage
+ * @param pageNumberStartingFromOne
+ * @param statement
+ * @param hm
+ * @param spellCheckerQuery
+ * @param applyLocalPaging don't assume the result iterator is already paginated, do it "manually"
+ * @param offset TODO
+ */
+ public AdvancedResultImpl(
+ QueryResultImpl jcrQueryResult,
+ int itemsPerPage,
+ int pageNumberStartingFromOne,
+ String statement,
+ HierarchyManager hm,
+ Query spellCheckerQuery,
+ boolean applyLocalPaging,
+ int offset)
+ {
this.jcrQueryResult = jcrQueryResult;
this.itemsPerPage = itemsPerPage;
this.statement = statement;
@@ -115,6 +148,7 @@
this.spellCheckerQuery = spellCheckerQuery;
this.pageNumberStartingFromOne = pageNumberStartingFromOne;
this.applyLocalPaging = applyLocalPaging;
+ this.offset = offset;
}
/**
@@ -179,8 +213,12 @@
if (applyLocalPaging && itemsPerPage > 0)
{
- final int offset = (Math.max(pageNumberStartingFromOne, 1) - 1) * itemsPerPage;
+ if (offset == 0)
+ {
+ offset = (Math.max(pageNumberStartingFromOne, 1) - 1) * itemsPerPage;
+ }
+
// removing preceding records
rows.skip(offset);
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java 2011-06-06 13:45:34 UTC (rev 3507)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java 2011-06-06 17:21:52 UTC (rev 3508)
@@ -145,7 +145,8 @@
stmt,
hm,
spellCheckerQuery,
- forcePagingWithDocumentOrder);
+ forcePagingWithDocumentOrder,
+ offset);
}
finally
{
Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2011-06-06 13:45:34 UTC (rev 3507)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2011-06-06 17:21:52 UTC (rev 3508)
@@ -216,4 +216,66 @@
Assert.assertEquals(i, PAGINATION_LENGTH, "Wrong number of results returned by the iterator.");
}
+
+ /**
+ * Retrieves all letters.
+ * @throws Exception
+ */
+ @Test
+ public void testNoOrderWithOffset() throws Exception
+ {
+
+ int offset = 9;
+
+ Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE);
+ criteria.setBasePath("/letters");
+ criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+ criteria.setForcePagingWithDocumentOrder(true);
+ criteria.setFirstResult(offset);
+ criteria.setMaxResults(Integer.MAX_VALUE);
+
+ log.debug(criteria.toXpathExpression());
+
+ AdvancedResult advResult = criteria.execute();
+
+ Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length, "Unset total size.");
+
+ ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+ Assert.assertEquals(resultIterator.getSize(), LETTERS_ARRAY.length - offset, "Wrong iterator size.");
+
+ int i = 0;
+ for (AdvancedResultItem currentResult : resultIterator)
+ {
+ Assert.assertEquals(currentResult.getTitle(), LETTERS_ARRAY[i + offset], "Position "
+ + i
+ + ": found "
+ + currentResult.getTitle()
+ + " instead of "
+ + LETTERS_ARRAY[i + offset]);
+ i++;
+ }
+ Assert.assertEquals(i, LETTERS_ARRAY.length - offset, "Wrong number of results returned by the iterator.");
+
+ resultIterator = advResult.getItems();
+ i = 0;
+
+ // check that hasNext doesn't change the result of getPosition()
+ while (resultIterator.hasNext() && resultIterator.hasNext() && resultIterator.hasNext())
+ {
+ AdvancedResultItem currentResult = resultIterator.next();
+ Assert.assertEquals(currentResult.getTitle(), LETTERS_ARRAY[i + offset], "Position "
+ + i
+ + ": found "
+ + currentResult.getTitle()
+ + " instead of "
+ + LETTERS_ARRAY[i + offset]);
+ i++;
+ }
+
+ Assert.assertEquals(
+ i,
+ LETTERS_ARRAY.length - offset,
+ "Wrong number of results returned by the iterator when calling hasNext() more than once.");
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2011-06-06 14:45:03
|
See <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/154/changes> Changes: [molaschi] CRIT-39 ------------------------------------------ Started by an SCM change Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria U src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java At revision 3507 Found mavenVersion 2.2.1 from file jar:file:/usr/local/maven/lib/maven-2.2.1-uber.jar!/META-INF/maven/org.apache.maven/maven-core/pom.properties Parsing POMs [openutils-mgnlcriteria] $ /usr/local/jdk1.6.0_20/bin/java -cp /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.403.jar:/usr/local/maven/boot/classworlds-1.1.jar hudson.maven.agent.Main /usr/local/maven /data/webapps/hudson/WEB-INF/lib/remoting-1.403.jar /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.403.jar 51329 /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar <===[HUDSON REMOTING CAPACITY]===> channel started Executing Maven: -B -f <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/pom.xml> clean install [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Building Criteria API for Magnolia CMS [INFO] task-segment: [clean, install] [INFO] ------------------------------------------------------------------------ [INFO] [clean:clean {execution: default-clean}] [INFO] Deleting directory <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target> [INFO] [resources:resources {execution: default-resources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] Copying 1 resource [INFO] [compiler:compile {execution: default-compile}] [INFO] Compiling 46 source files to <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target/classes> [INFO] [resources:testResources {execution: default-testResources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 15 resources [INFO] [compiler:testCompile {execution: default-testCompile}] [INFO] Compiling 17 source files to <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target/test-classes> [INFO] [surefire:test {execution: default-test}] [INFO] Surefire report directory: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target/surefire-reports> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running TestSuite Tests run: 71, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.165 sec Results : Tests run: 71, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [jar:jar {execution: default-jar}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT.jar> [INFO] Preparing source:jar [WARNING] Removing: jar from forked lifecycle, to prevent recursive invocation. [INFO] No goals needed for project - skipping [INFO] [source:jar {execution: attach-sources}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT-sources.jar> [INFO] [assembly:single {execution: bundle}] [INFO] Reading assembly descriptor: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/src/main/assembly/assembly-bundle.xml> [INFO] Building zip: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT-bundle.zip> [INFO] [license:check {execution: default}] [INFO] Checking licenses... [INFO] Missing header in: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java> [JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/pom.xml> to /data/hudson-data/jobs/openutils-mgnlcriteria/modules/net.sourceforge.openutils$openutils-mgnlcriteria/builds/2011-06-06_16-29-01/archive/net.sourceforge.openutils/openutils-mgnlcriteria/3.3.2-SNAPSHOT/pom.xml [JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT.jar> to /data/hudson-data/jobs/openutils-mgnlcriteria/modules/net.sourceforge.openutils$openutils-mgnlcriteria/builds/2011-06-06_16-29-01/archive/net.sourceforge.openutils/openutils-mgnlcriteria/3.3.2-SNAPSHOT/openutils-mgnlcriteria-3.3.2-SNAPSHOT.jar [JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT-sources.jar> to /data/hudson-data/jobs/openutils-mgnlcriteria/modules/net.sourceforge.openutils$openutils-mgnlcriteria/builds/2011-06-06_16-29-01/archive/net.sourceforge.openutils/openutils-mgnlcriteria/3.3.2-SNAPSHOT/openutils-mgnlcriteria-3.3.2-SNAPSHOT-sources.jar [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Some files do not have the expected license header [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 58 seconds [INFO] Finished at: Mon Jun 06 16:30:04 CEST 2011 [INFO] Final Memory: 53M/321M [INFO] ------------------------------------------------------------------------ Waiting for Jenkins to finish collecting data Sending e-mails to: ope...@li... channel stopped |
|
From: <hu...@op...> - 2011-06-06 14:45:00
|
See <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/154/changes> Changes: [molaschi] CRIT-39 ------------------------------------------ <===[HUDSON REMOTING CAPACITY]===> channel started Executing Maven: -B -f <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/pom.xml> clean install [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Building Criteria API for Magnolia CMS [INFO] task-segment: [clean, install] [INFO] ------------------------------------------------------------------------ [INFO] [clean:clean {execution: default-clean}] [INFO] Deleting directory <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target> [INFO] [resources:resources {execution: default-resources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] Copying 1 resource [INFO] [compiler:compile {execution: default-compile}] [INFO] Compiling 46 source files to <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target/classes> [INFO] [resources:testResources {execution: default-testResources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 15 resources [INFO] [compiler:testCompile {execution: default-testCompile}] [INFO] Compiling 17 source files to <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target/test-classes> [INFO] [surefire:test {execution: default-test}] [INFO] Surefire report directory: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target/surefire-reports> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running TestSuite Tests run: 71, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.165 sec Results : Tests run: 71, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [jar:jar {execution: default-jar}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT.jar> [INFO] Preparing source:jar [WARNING] Removing: jar from forked lifecycle, to prevent recursive invocation. [INFO] No goals needed for project - skipping [INFO] [source:jar {execution: attach-sources}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT-sources.jar> [INFO] [assembly:single {execution: bundle}] [INFO] Reading assembly descriptor: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/src/main/assembly/assembly-bundle.xml> [INFO] Building zip: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT-bundle.zip> [INFO] [license:check {execution: default}] [INFO] Checking licenses... [INFO] Missing header in: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java> [JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/pom.xml> to /data/hudson-data/jobs/openutils-mgnlcriteria/modules/net.sourceforge.openutils$openutils-mgnlcriteria/builds/2011-06-06_16-29-01/archive/net.sourceforge.openutils/openutils-mgnlcriteria/3.3.2-SNAPSHOT/pom.xml [JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT.jar> to /data/hudson-data/jobs/openutils-mgnlcriteria/modules/net.sourceforge.openutils$openutils-mgnlcriteria/builds/2011-06-06_16-29-01/archive/net.sourceforge.openutils/openutils-mgnlcriteria/3.3.2-SNAPSHOT/openutils-mgnlcriteria-3.3.2-SNAPSHOT.jar [JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT-sources.jar> to /data/hudson-data/jobs/openutils-mgnlcriteria/modules/net.sourceforge.openutils$openutils-mgnlcriteria/builds/2011-06-06_16-29-01/archive/net.sourceforge.openutils/openutils-mgnlcriteria/3.3.2-SNAPSHOT/openutils-mgnlcriteria-3.3.2-SNAPSHOT-sources.jar [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Some files do not have the expected license header [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 58 seconds [INFO] Finished at: Mon Jun 06 16:30:04 CEST 2011 [INFO] Final Memory: 53M/321M [INFO] ------------------------------------------------------------------------ Waiting for Jenkins to finish collecting data |
|
From: <mol...@us...> - 2011-06-06 13:45:40
|
Revision: 3507
http://openutils.svn.sourceforge.net/openutils/?rev=3507&view=rev
Author: molaschi
Date: 2011-06-06 13:45:34 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
CRIT-39
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java 2011-06-04 08:09:41 UTC (rev 3506)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/MappedDefaultContent.java 2011-06-06 13:45:34 UTC (rev 3507)
@@ -24,6 +24,7 @@
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.link.LinkException;
import info.magnolia.link.LinkTransformerManager;
@@ -291,7 +292,7 @@
{
NodeData nd = iter.next();
final String key = nd.getName();
- final String value = nd.getString();
+ final String value = NodeDataUtil.getValueString(nd);
keys.add(new Map.Entry<String, Object>()
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2011-06-04 08:54:28
|
See <https://hudson.openmindonline.it/job/openutils-bshd5/41/changes> |
|
From: <hu...@op...> - 2011-06-04 08:54:25
|
See <https://hudson.openmindonline.it/job/openutils-bshd5/net.sourceforge.openutils$openutils-bshd5/41/changes> |
|
From: <fg...@us...> - 2011-06-04 08:09:47
|
Revision: 3506
http://openutils.svn.sourceforge.net/openutils/?rev=3506&view=rev
Author: fgiust
Date: 2011-06-04 08:09:41 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2011-06-04 08:09:32 UTC (rev 3505)
+++ trunk/openutils-bshd5/pom.xml 2011-06-04 08:09:41 UTC (rev 3506)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-bshd5</artifactId>
<name>openutils base Spring-Hibernate DAO</name>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<description>Openutils base Spring-Hibernate DAO (for java 5 and more)</description>
<licenses>
<license>
@@ -23,9 +23,9 @@
</issueManagement>
<inceptionYear>2005</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.1.0</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.1.0</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-2.1.0</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-bshd5</url>
</scm>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-06-04 08:09:38
|
Revision: 3505
http://openutils.svn.sourceforge.net/openutils/?rev=3505&view=rev
Author: fgiust
Date: 2011-06-04 08:09:32 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-bshd5-2.1.0
Added Paths:
-----------
tags/openutils-bshd5-2.1.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-06-04 08:09:13
|
Revision: 3504
http://openutils.svn.sourceforge.net/openutils/?rev=3504&view=rev
Author: fgiust
Date: 2011-06-04 08:09:07 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-bshd5-2.1.0
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2011-06-04 08:08:36 UTC (rev 3503)
+++ trunk/openutils-bshd5/pom.xml 2011-06-04 08:09:07 UTC (rev 3504)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -9,7 +8,7 @@
</parent>
<artifactId>openutils-bshd5</artifactId>
<name>openutils base Spring-Hibernate DAO</name>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<description>Openutils base Spring-Hibernate DAO (for java 5 and more)</description>
<licenses>
<license>
@@ -24,9 +23,9 @@
</issueManagement>
<inceptionYear>2005</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-bshd5</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.1.0</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.1.0</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-2.1.0</url>
</scm>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-06-04 08:08:42
|
Revision: 3503
http://openutils.svn.sourceforge.net/openutils/?rev=3503&view=rev
Author: fgiust
Date: 2011-06-04 08:08:36 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
add scm url
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2011-06-04 08:07:32 UTC (rev 3502)
+++ trunk/openutils-bshd5/pom.xml 2011-06-04 08:08:36 UTC (rev 3503)
@@ -9,7 +9,7 @@
</parent>
<artifactId>openutils-bshd5</artifactId>
<name>openutils base Spring-Hibernate DAO</name>
- <version>2.0.7-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<description>Openutils base Spring-Hibernate DAO (for java 5 and more)</description>
<licenses>
<license>
@@ -23,6 +23,11 @@
<url>http://jira.openmindlab.com/browse/BSHD</url>
</issueManagement>
<inceptionYear>2005</inceptionYear>
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-bshd5</url>
+ </scm>
<build>
<plugins>
<plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-06-04 08:07:38
|
Revision: 3502
http://openutils.svn.sourceforge.net/openutils/?rev=3502&view=rev
Author: fgiust
Date: 2011-06-04 08:07:32 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
[maven-release-plugin] rollback the release of openutils-bshd5-2.1.0
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2011-06-04 08:06:17 UTC (rev 3501)
+++ trunk/openutils-bshd5/pom.xml 2011-06-04 08:07:32 UTC (rev 3502)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -8,7 +9,7 @@
</parent>
<artifactId>openutils-bshd5</artifactId>
<name>openutils base Spring-Hibernate DAO</name>
- <version>2.1.0</version>
+ <version>2.0.7-SNAPSHOT</version>
<description>Openutils base Spring-Hibernate DAO (for java 5 and more)</description>
<licenses>
<license>
@@ -194,10 +195,4 @@
<properties>
<spring.version>3.0.0.RELEASE</spring.version>
</properties>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.1.0</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.1.0</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-2.1.0</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-06-04 08:06:25
|
Revision: 3501
http://openutils.svn.sourceforge.net/openutils/?rev=3501&view=rev
Author: fgiust
Date: 2011-06-04 08:06:17 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-bshd5-2.1.0
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2011-06-04 08:05:48 UTC (rev 3500)
+++ trunk/openutils-bshd5/pom.xml 2011-06-04 08:06:17 UTC (rev 3501)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -9,7 +8,7 @@
</parent>
<artifactId>openutils-bshd5</artifactId>
<name>openutils base Spring-Hibernate DAO</name>
- <version>2.0.7-SNAPSHOT</version>
+ <version>2.1.0</version>
<description>Openutils base Spring-Hibernate DAO (for java 5 and more)</description>
<licenses>
<license>
@@ -195,4 +194,10 @@
<properties>
<spring.version>3.0.0.RELEASE</spring.version>
</properties>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.1.0</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.1.0</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-2.1.0</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-06-04 08:05:54
|
Revision: 3500
http://openutils.svn.sourceforge.net/openutils/?rev=3500&view=rev
Author: fgiust
Date: 2011-06-04 08:05:48 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
update hibernate dependencies
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2011-06-04 08:01:45 UTC (rev 3499)
+++ trunk/openutils-bshd5/pom.xml 2011-06-04 08:05:48 UTC (rev 3500)
@@ -48,12 +48,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
+ <version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.6</version>
+ <version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>3.3.1.GA</version>
+ <version>3.5.6-Final</version>
<exclusions>
<exclusion>
<groupId>cglib</groupId>
@@ -119,6 +119,26 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.5.6-Final</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
@@ -166,26 +186,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.4.0.GA</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.1</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-06-04 08:01:52
|
Revision: 3499
http://openutils.svn.sourceforge.net/openutils/?rev=3499&view=rev
Author: fgiust
Date: 2011-06-04 08:01:45 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
license headers
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java
trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/EnhancedExample.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadata.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOTest.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/PersonDAO.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Address.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Chance.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/FantasticThing.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/FullName.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Person.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Title.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Wish.java
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/pom.xml 2011-06-04 08:01:45 UTC (rev 3499)
@@ -8,9 +8,9 @@
<version>1.9</version>
</parent>
<artifactId>openutils-bshd5</artifactId>
- <name>openutils base Spring-Hibernate DAO for java 5.0</name>
+ <name>openutils base Spring-Hibernate DAO</name>
<version>2.0.7-SNAPSHOT</version>
- <description>Openutils base Spring-Hibernate DAO for java 5.0</description>
+ <description>Openutils base Spring-Hibernate DAO (for java 5 and more)</description>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -22,6 +22,7 @@
<system>jira</system>
<url>http://jira.openmindlab.com/browse/BSHD</url>
</issueManagement>
+ <inceptionYear>2005</inceptionYear>
<build>
<plugins>
<plugin>
@@ -157,15 +158,7 @@
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
- <!--
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aspects</artifactId>
- <version>${spring.version}</version>
- <scope>test</scope>
- </dependency>
- -->
- <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>5.7</version>
@@ -202,4 +195,4 @@
<properties>
<spring.version>3.0.0.RELEASE</spring.version>
</properties>
-</project>
+</project>
\ No newline at end of file
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
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 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/EnhancedExample.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/EnhancedExample.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/EnhancedExample.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadata.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadata.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadata.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOTest.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOTest.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/PersonDAO.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/PersonDAO.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/dao/PersonDAO.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Address.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Address.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Address.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Chance.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Chance.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Chance.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/FantasticThing.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/FantasticThing.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/FantasticThing.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/FullName.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/FullName.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/FullName.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Person.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Person.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Person.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Title.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Title.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Title.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Wish.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Wish.java 2011-06-04 07:59:28 UTC (rev 3498)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Wish.java 2011-06-04 08:01:45 UTC (rev 3499)
@@ -1,8 +1,8 @@
/**
*
- * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ * openutils base Spring-Hibernate DAO (http://www.openmindlab.com/lab/products/bshd5.html)
*
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2005-2011, Openmind S.r.l. http://www.openmindonline.it
*
*
* This library is free software; you can redistribute it and/or
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-06-04 07:59:35
|
Revision: 3498
http://openutils.svn.sourceforge.net/openutils/?rev=3498&view=rev
Author: fgiust
Date: 2011-06-04 07:59:28 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
BSHD-9 pagination
Added Paths:
-----------
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java
Added: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java (rev 0)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java 2011-06-04 07:59:28 UTC (rev 3498)
@@ -0,0 +1,75 @@
+/**
+ *
+ * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ *
+ * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package it.openutils.hibernate.paging;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public interface PaginatedResult<T> extends Serializable
+{
+
+ /**
+ * Gets the maximum number of results per page
+ * @return the maximum number of results per page
+ */
+ int getItemsPerPage();
+
+ /**
+ * Gets the page number (1, 2, 3...)
+ * @return the page number (1, 2, 3...)
+ */
+ int getPage();
+
+ /**
+ * Gets the total number of results that would be retrieved without pagination.
+ * @return the total number of results that would be retrieved without pagination.
+ */
+ int getTotalSize();
+
+ /**
+ * Gets the total number of pages
+ * @return total number of pages
+ */
+ int getNumberOfPages();
+
+ /**
+ * Gets an iterator over the results
+ * @return an iterator over the results
+ */
+ Collection<T> getItems();
+
+ /**
+ * Returns the fist result if available, null otherwise.
+ * @return the fist result if available, null otherwise.
+ */
+ T getFirstResult();
+
+}
Property changes on: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResult.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java (rev 0)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java 2011-06-04 07:59:28 UTC (rev 3498)
@@ -0,0 +1,120 @@
+/**
+ *
+ * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ *
+ * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package it.openutils.hibernate.paging;
+
+import java.util.Collection;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class PaginatedResultImpl<T> implements PaginatedResult<T>
+{
+
+ private final int itemsPerPage;
+
+ private final int pageNumberStartingFromOne;
+
+ private final int totalSize;
+
+ private Collection<T> results;
+
+ /**
+ * Stable serialVersionUID.
+ */
+ private static final long serialVersionUID = 42L;
+
+ /**
+ * @param itemsPerPage
+ * @param pageNumberStartingFromOne
+ * @param totalSize
+ */
+ public PaginatedResultImpl(int itemsPerPage, int pageNumberStartingFromOne, int totalSize)
+ {
+ this.itemsPerPage = itemsPerPage;
+ this.pageNumberStartingFromOne = pageNumberStartingFromOne;
+ this.totalSize = totalSize;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getItemsPerPage()
+ {
+ return itemsPerPage;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getPage()
+ {
+ return pageNumberStartingFromOne;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getTotalSize()
+ {
+ return totalSize;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getNumberOfPages()
+ {
+ return itemsPerPage > 0 ? (int) Math.round(Math.ceil(((float) totalSize / (float) itemsPerPage))) : 1;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Collection<T> getItems()
+ {
+ return this.results;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public T getFirstResult()
+ {
+ if (this.results != null && this.results.size() > 0)
+ {
+ return this.results.iterator().next();
+ }
+ return null;
+ }
+
+ public void setResults(Collection<T> results)
+ {
+ this.results = results;
+ }
+
+}
Property changes on: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultImpl.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java (rev 0)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java 2011-06-04 07:59:28 UTC (rev 3498)
@@ -0,0 +1,91 @@
+/**
+ *
+ * openutils base Spring-Hibernate DAO for java 5.0 (http://www.openmindlab.com/lab/products/bshd5.html)
+ *
+ * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package it.openutils.hibernate.paging;
+
+import java.util.Collection;
+
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Projections;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public final class PaginatedResultUtils
+{
+
+ /**
+ * Logger.
+ */
+ static Logger log = LoggerFactory.getLogger(PaginatedResultUtils.class);
+
+ /**
+ * Executes a criteria query and returns a paginated result.
+ * @param <T> element type
+ * @param criteria criteria query
+ * @param pagesize number of elements per page
+ * @param pageNumberStartingFromOne page number, starting from 1
+ * @return an instance of Paginated result
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> PaginatedResult<T> search(Criteria criteria, int pagesize, int pageNumberStartingFromOne)
+ {
+ if (pagesize > 0)
+ {
+ criteria.setMaxResults(pagesize);
+ }
+
+ if (pageNumberStartingFromOne > 1 && pagesize > 0)
+ {
+ int firstresult = (pageNumberStartingFromOne - 1) * pagesize;
+ log.debug("Setting first result {}", firstresult);
+ criteria.setFirstResult(firstresult);
+ }
+
+ Collection<T> results = criteria.list();
+
+ // reset firstresult for count
+ criteria.setFirstResult(0);
+ Number count = (Number) criteria.setProjection(Projections.count("id")).uniqueResult();
+
+ if (count == null)
+ {
+ count = 0;
+ }
+
+ PaginatedResultImpl<T> result = new PaginatedResultImpl<T>(
+ pagesize,
+ pageNumberStartingFromOne,
+ count.intValue());
+
+ result.setResults(results);
+
+ return result;
+ }
+}
Property changes on: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/paging/PaginatedResultUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 3497
http://openutils.svn.sourceforge.net/openutils/?rev=3497&view=rev
Author: fgiust
Date: 2011-05-30 10:54:51 +0000 (Mon, 30 May 2011)
Log Message:
-----------
content -> contentNode
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.dialogs.i18nTabNewLocale.xml
Modified: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.dialogs.i18nTabNewLocale.xml
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.dialogs.i18nTabNewLocale.xml 2011-05-27 06:28:14 UTC (rev 3496)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.dialogs.i18nTabNewLocale.xml 2011-05-30 10:54:51 UTC (rev 3497)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<sv:node sv:name="i18nTabNewLocale" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:content</sv:value>
+ <sv:value>mgnl:contentNode</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
