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
|
Revision: 4109
http://openutils.svn.sourceforge.net/openutils/?rev=4109&view=rev
Author: diego_schivo
Date: 2012-07-18 15:17:12 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
CONTROLS-51 EditCodeGridColumnType: escapeEditCodeGridColumnValue, unescapeEditCodeGridColumnValue
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java 2012-07-18 14:34:39 UTC (rev 4108)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java 2012-07-18 15:17:12 UTC (rev 4109)
@@ -57,12 +57,12 @@
public static String escapeEditCodeGridColumnValue(String value)
{
- return StringEscapeUtils.escapeXml(StringEscapeUtils.escapeJava(value));
+ return StringEscapeUtils.escapeJava(StringEscapeUtils.escapeXml(value));
}
public static String unescapeEditCodeGridColumnValue(String value)
{
- return StringEscapeUtils.unescapeJava(StringEscapeUtils.unescapeXml(value));
+ return StringEscapeUtils.unescapeXml(StringEscapeUtils.unescapeJava(value));
}
private Logger log = LoggerFactory.getLogger(getClass());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4108
http://openutils.svn.sourceforge.net/openutils/?rev=4108&view=rev
Author: diego_schivo
Date: 2012-07-18 14:34:39 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
CONTROLS-51 fileNodeName
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java 2012-07-18 13:38:26 UTC (rev 4107)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java 2012-07-18 14:34:39 UTC (rev 4108)
@@ -164,7 +164,10 @@
log.error("can't write to tmp file [" + tmpFile + "]");
}
Document doc = new Document(tmpFile, type);
- String fileNodeName = Path.getUniqueLabel(hm, filesNode.getHandle(), "file");
+ String fileNodeName = Path.getUniqueLabel(
+ hm,
+ filesNode.getHandle(),
+ String.valueOf(System.currentTimeMillis()));
SaveHandlerImpl.saveDocument(filesNode, doc, fileNodeName, "", "");
String link = filesNode.getName() + "/" + fileNodeName + "/" + doc.getFileNameWithExtension();
column[index] = link;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2012-07-18 13:38:36
|
Revision: 4107
http://openutils.svn.sourceforge.net/openutils/?rev=4107&view=rev
Author: diego_schivo
Date: 2012-07-18 13:38:26 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
CONTROLS-51 Grid: add the possibility to store editcode columns into binary properties
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java 2012-07-17 16:56:01 UTC (rev 4106)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java 2012-07-18 13:38:26 UTC (rev 4107)
@@ -85,7 +85,7 @@
/**
* {@inheritDoc}
*/
- public void processColumnOnLoad(String[] column, Content colConfig)
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
{
}
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java 2012-07-17 16:56:01 UTC (rev 4106)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java 2012-07-18 13:38:26 UTC (rev 4107)
@@ -83,7 +83,7 @@
/**
* {@inheritDoc}
*/
- public void processColumnOnLoad(String[] column, Content colConfig)
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
{
// TODO Auto-generated method stub
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-07-17 16:56:01 UTC (rev 4106)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-07-18 13:38:26 UTC (rev 4107)
@@ -49,6 +49,7 @@
result.append("/.resources/controls/js/PipeComboBox.js\"></script>");
// Combobox must be patched because of a bug. For reference, see:
// http://www.sencha.com/forum/showthread.php?17465-1.1.1-Local-ComboBox-data-store-filter-not-cleared-on-call-to-setValue%28%29
+ result.append("<script type=\"text/javascript\">");
result.append("var PatchedComboBox = Ext.extend(Ext.form.ComboBox, {");
result.append(" setValue: function(v) {");
result.append(" this.store.clearFilter();");
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java 2012-07-17 16:56:01 UTC (rev 4106)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java 2012-07-18 13:38:26 UTC (rev 4107)
@@ -19,12 +19,35 @@
package net.sourceforge.openutils.mgnlcontrols.configuration;
+import info.magnolia.cms.beans.runtime.Document;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.NodeData;
+import info.magnolia.cms.core.Path;
import info.magnolia.cms.i18n.Messages;
+import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.admininterface.SaveHandlerImpl;
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
import java.util.Map;
+import javax.jcr.RepositoryException;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+import org.safehaus.uuid.UUIDGenerator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
/**
* @author diego
* @version $Id: $
@@ -32,6 +55,18 @@
public class EditCodeGridColumnType extends AbstractGridColumnType
{
+ public static String escapeEditCodeGridColumnValue(String value)
+ {
+ return StringEscapeUtils.escapeXml(StringEscapeUtils.escapeJava(value));
+ }
+
+ public static String unescapeEditCodeGridColumnValue(String value)
+ {
+ return StringEscapeUtils.unescapeJava(StringEscapeUtils.unescapeXml(value));
+ }
+
+ private Logger log = LoggerFactory.getLogger(getClass());
+
/**
* {@inheritDoc}
*/
@@ -47,6 +82,110 @@
* {@inheritDoc}
*/
@Override
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
+ {
+ if (NodeDataUtil.getBoolean(colConfig, "binary", false))
+ {
+ HierarchyManager hm = storageNode.getHierarchyManager();
+ for (int index = 0; index < column.length; index++)
+ {
+ String value = StringUtils.EMPTY;
+ String link = StringUtils.trim(column[index]);
+ if (StringUtils.isNotBlank(link))
+ {
+ NodeData nodeData = null;
+ try
+ {
+ nodeData = hm.getNodeData(storageNode.getHandle()
+ + "/"
+ + StringUtils.substringBeforeLast(link, "/"));
+ }
+ catch (RepositoryException e)
+ {
+ log.warn(e.getMessage(), e);
+ }
+ if (nodeData != null)
+ {
+ try
+ {
+ value = escapeEditCodeGridColumnValue(StringUtils.join(
+ IOUtils.readLines(nodeData.getStream(), "UTF-8"),
+ '\n'));
+ }
+ catch (Exception e)
+ {
+ log.warn(e.getMessage(), e);
+ }
+ }
+ }
+ column[index] = value;
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void processColumnOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
+ throws RepositoryException, AccessDeniedException
+ {
+ if (NodeDataUtil.getBoolean(colConfig, "binary", false))
+ {
+ String filename = NodeDataUtil.getString(colConfig, "binaryFilename", "file.txt");
+ String type = NodeDataUtil.getString(colConfig, "binaryType", "text/plain");
+ HierarchyManager hm = parentNode.getHierarchyManager();
+ Content filesNode = ContentUtil.getOrCreateContent(parentNode, propertyName
+ + "_"
+ + colConfig.getName()
+ + "_files", ItemType.CONTENTNODE);
+
+ for (Iterator<NodeData> iter = filesNode.getNodeDataCollection().iterator(); iter.hasNext();)
+ {
+ NodeData fileNodeData = iter.next();
+ fileNodeData.delete();
+ }
+
+ String uuid = UUIDGenerator.getInstance().generateTimeBasedUUID().toString();
+ File tmpDir = new File(Path.getTempDirectoryPath() + "/fckeditor/" + uuid);
+ for (int index = 0; index < column.length; index++)
+ {
+ if (StringUtils.isEmpty(column[index]))
+ {
+ continue;
+ }
+ File tmpFile = new File(tmpDir, filename);
+ try
+ {
+ FileUtils.writeStringToFile(tmpFile, unescapeEditCodeGridColumnValue(column[index]), "UTF-8");
+ }
+ catch (IOException e)
+ {
+ log.error("can't write to tmp file [" + tmpFile + "]");
+ }
+ Document doc = new Document(tmpFile, type);
+ String fileNodeName = Path.getUniqueLabel(hm, filesNode.getHandle(), "file");
+ SaveHandlerImpl.saveDocument(filesNode, doc, fileNodeName, "", "");
+ String link = filesNode.getName() + "/" + fileNodeName + "/" + doc.getFileNameWithExtension();
+ column[index] = link;
+ doc.delete();
+ }
+ try
+ {
+ FileUtils.deleteDirectory(new java.io.File(Path.getTempDirectory() + "/fckeditor/" + uuid));
+ }
+ catch (IOException e)
+ {
+ log.error("can't delete tmp file [" + Path.getTempDirectory() + "/fckeditor/" + uuid + "]");
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("rawtypes")
+ @Override
protected void addColumnData(Map<String, String> column, String propertyName, int colIndex, Map colMap,
Messages msgs)
{
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java 2012-07-17 16:56:01 UTC (rev 4106)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java 2012-07-18 13:38:26 UTC (rev 4107)
@@ -67,8 +67,10 @@
* Possibly transforms the column values on grid load.
* @param column
* @param colConfig
+ * @param propertyName
+ * @param storageNode
*/
- public void processColumnOnLoad(String[] column, Content colConfig);
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode);
/**
* Possibly transforms the column values on grid save.
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2012-07-17 16:56:01 UTC (rev 4106)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2012-07-18 13:38:26 UTC (rev 4107)
@@ -82,7 +82,7 @@
* {@inheritDoc}
*/
@Override
- public void processColumnOnLoad(String[] column, Content colConfig)
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
{
String repository = StringUtils.defaultIfEmpty(
NodeDataUtil.getString(colConfig, "repository"),
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java 2012-07-17 16:56:01 UTC (rev 4106)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java 2012-07-18 13:38:26 UTC (rev 4107)
@@ -105,7 +105,7 @@
GridColumnType colType = colTypeMap.get(colTypeName);
if (colType != null)
{
- colType.processColumnOnLoad(column, colConfig);
+ colType.processColumnOnLoad(column, colConfig, getName(), getStorageNode());
}
}
colIndex++;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4106
http://openutils.svn.sourceforge.net/openutils/?rev=4106&view=rev
Author: diego_schivo
Date: 2012-07-17 16:56:01 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
MESSAGES-19 RepositoryMessagesImpl fix
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2012-07-17 16:55:29 UTC (rev 4105)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2012-07-17 16:56:01 UTC (rev 4106)
@@ -112,6 +112,12 @@
{
return "???" + key + "???";
}
+ catch (IllegalArgumentException e)
+ {
+ // MESSAGES-19 Uncaught IllegalArgumentException using jackrabbit 2.4.1
+ // at org.apache.jackrabbit.core.id.NodeId.<init>(NodeId.java:129)
+ return "???" + key + "???";
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4105
http://openutils.svn.sourceforge.net/openutils/?rev=4105&view=rev
Author: diego_schivo
Date: 2012-07-17 16:55:29 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
MESSAGES-19 RepositoryMessagesImplTest.testFixIllegalArgumentExceptionOnJackrabbit2_4_1()
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImplTest.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImplTest.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImplTest.java 2012-07-17 16:11:00 UTC (rev 4104)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImplTest.java 2012-07-17 16:55:29 UTC (rev 4105)
@@ -1,7 +1,7 @@
/**
*
- * 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
+ * Messages Module for Magnolia CMS (http://www.openmindlab.com/lab/products/messages.html)
+ * Copyright(C) 2008-2012, 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
@@ -66,4 +66,16 @@
Assert.assertEquals(MessagesManager.get("buttons.save"), "\u4fdd\u5b58");
}
+ /**
+ * @throws Exception
+ */
+ @Test
+ public void testFixIllegalArgumentExceptionOnJackrabbit2_4_1() throws Exception
+ {
+ MgnlContext.getInstance().setLocale(Locale.ENGLISH);
+ // MESSAGES-19 Uncaught IllegalArgumentException using jackrabbit 2.4.1
+ // at org.apache.jackrabbit.core.id.NodeId.<init>(NodeId.java:129)
+ Assert.assertEquals(MessagesManager.get("[foo]"), "???[foo]???");
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2012-07-17 16:11:11
|
Revision: 4104
http://openutils.svn.sourceforge.net/openutils/?rev=4104&view=rev
Author: diego_schivo
Date: 2012-07-17 16:11:00 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
MESSAGES-18 Add unit-test for RepositoryMessagesImpl
Added Paths:
-----------
magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/
magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImplTest.java
magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/msg-bootstrap/
magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/msg-bootstrap/messages.buttons.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/msg-repository/
magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/msg-repository/jackrabbit-test-configuration.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/msg-repository/test-repositories.xml
magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/test-magnolia.properties
Added: magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImplTest.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImplTest.java (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImplTest.java 2012-07-17 16:11:00 UTC (rev 4104)
@@ -0,0 +1,69 @@
+/**
+ *
+ * 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.mgnlmessages.i18n;
+
+import info.magnolia.cms.i18n.MessagesManager;
+import info.magnolia.context.MgnlContext;
+import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
+
+import java.util.Locale;
+
+import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
+
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+
+/**
+ * @author diego
+ * @version $Id: $
+ */
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/msg-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/msg-repository/test-repositories.xml", bootstrapFiles = "/msg-bootstrap/messages.buttons.xml")
+public class RepositoryMessagesImplTest extends TestNgRepositoryTestcase
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ @BeforeClass
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ MgnlContext.getHierarchyManager(MessagesConfigurationManager.MESSAGES_REPO).save();
+ }
+
+ /**
+ * @throws Exception
+ */
+ @Test
+ public void testButtonsSave() throws Exception
+ {
+ MgnlContext.getInstance().setLocale(Locale.ENGLISH);
+ Assert.assertEquals(MessagesManager.get("buttons.save"), "Save");
+ MgnlContext.getInstance().setLocale(Locale.ITALIAN);
+ Assert.assertEquals(MessagesManager.get("buttons.save"), "Salva");
+ MgnlContext.getInstance().setLocale(Locale.JAPANESE);
+ Assert.assertEquals(MessagesManager.get("buttons.save"), "\u4fdd\u5b58");
+ }
+
+}
Added: magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/msg-bootstrap/messages.buttons.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/msg-bootstrap/messages.buttons.xml (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/msg-bootstrap/messages.buttons.xml 2012-07-17 16:11:00 UTC (rev 4104)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="buttons" 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:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>1efcd4ef-89b3-470b-9a6e-159cb4bf5a7e</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2012-07-17T17:49:13.408+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-07-17T17:49:13.408+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:title" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="save">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <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>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>873b9d3f-bdfa-4b0a-93df-1a3d5f8401b4</sv:value>
+ </sv:property>
+ <sv:property sv:name="it" sv:type="String">
+ <sv:value>Salva</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2012-07-17T17:49:13.409+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-07-17T17:49:13.409+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:title" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+</sv:node>
Added: magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/msg-repository/jackrabbit-test-configuration.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/msg-repository/jackrabbit-test-configuration.xml (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/msg-repository/jackrabbit-test-configuration.xml 2012-07-17 16:11:00 UTC (rev 4104)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN" "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
+<!-- TESTING-ONLY configuration! repositories are in memory only and any change is lost upon restart -->
+<Repository>
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+ </FileSystem>
+ <Security appName="Jackrabbit">
+ <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager"></AccessManager>
+ <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
+ <param name="anonymousId" value="anonymous" />
+ </LoginModule>
+ </Security>
+ <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default" />
+ <Workspace name="default">
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+ </FileSystem>
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
+ <param name="blobFSBlockSize" value="1" /><!-- store in memory -->
+ </PersistenceManager>
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="indexingConfiguration" value="${rep.home}/../../test-classes/crit-repository/indexing_configuration.xml" />
+ <param name="path" value="${wsp.home}/index" />
+ <param name="useCompoundFile" value="false" /><!-- lasciare a false solo per i tests -->
+ <param name="minMergeDocs" value="100" />
+ <param name="volatileIdleTime" value="3" />
+ <param name="maxMergeDocs" value="100000" />
+ <param name="mergeFactor" value="10" />
+ <param name="maxFieldLength" value="10000" />
+ <param name="bufferSize" value="10" />
+ <param name="cacheSize" value="1000" />
+ <param name="autoRepair" value="true" />
+ <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
+ <param name="respectDocumentOrder" value="true" />
+ <param name="resultFetchSize" value="2147483647" />
+ <param name="extractorPoolSize" value="3" />
+ <param name="extractorTimeout" value="100" />
+ <param name="extractorBackLogSize" value="100" />
+ <param name="enableConsistencyCheck" value="true" />
+ <param name="autoRepair" value="true" />
+ <param name="forceConsistencyCheck" value="false" />
+ <param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
+ <param name="supportHighlighting" value="true" />
+ <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
+ </SearchIndex>
+ </Workspace>
+ <Versioning rootPath="${rep.home}/version">
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+ </FileSystem>
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
+ <param name="blobFSBlockSize" value="1" /><!-- store in memory -->
+ </PersistenceManager>
+ </Versioning>
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="indexingConfiguration" value="${rep.home}/../../test-classes/crit-repository/indexing_configuration.xml" />
+ <param name="path" value="${rep.home}/index" />
+ <param name="useCompoundFile" value="false" /><!-- lasciare a false solo per i tests -->
+ <param name="minMergeDocs" value="100" />
+ <param name="volatileIdleTime" value="3" />
+ <param name="maxMergeDocs" value="100000" />
+ <param name="mergeFactor" value="10" />
+ <param name="maxFieldLength" value="10000" />
+ <param name="bufferSize" value="10" />
+ <param name="cacheSize" value="1000" />
+ <param name="forceConsistencyCheck" value="false" />
+ <param name="autoRepair" value="true" />
+ <param name="analyzer" value="net.sourceforge.openutils.mgnlcriteria.utils.ASCIIFoldingAnalyzer" />
+ <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
+ <param name="respectDocumentOrder" value="true" />
+ <param name="resultFetchSize" value="2147483647" />
+ <param name="extractorPoolSize" value="3" />
+ <param name="extractorTimeout" value="100" />
+ <param name="extractorBackLogSize" value="100" />
+ <param name="supportHighlighting" value="true" />
+ <param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager" />
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+ </FileSystem>
+ </SearchIndex>
+ <!-- <DataStore class="org.apache.jackrabbit.core.data.FileDataStore"> <param name="minRecordLength" value="100000000"
+ /> </DataStore> -->
+</Repository>
\ No newline at end of file
Added: magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/msg-repository/test-repositories.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/msg-repository/test-repositories.xml (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/msg-repository/test-repositories.xml 2012-07-17 16:11:00 UTC (rev 4104)
@@ -0,0 +1,52 @@
+<!--
+ $Id: test-repositories.xml 2067 2010-02-27 15:11:31Z fgiust $
+-->
+<!DOCTYPE JCR [
+<!ELEMENT Map (#PCDATA)>
+<!ATTLIST Map
+ name CDATA #REQUIRED
+ repositoryName CDATA #REQUIRED
+ workspaceName CDATA #REQUIRED>
+<!ELEMENT JCR (RepositoryMapping|Repository)*>
+<!ELEMENT param (#PCDATA)>
+<!ATTLIST param
+ name CDATA #REQUIRED
+ value CDATA #REQUIRED>
+<!ELEMENT Repository (param|workspace)*>
+<!ATTLIST Repository
+ loadOnStartup CDATA #REQUIRED
+ name CDATA #REQUIRED
+ provider CDATA #REQUIRED>
+<!ELEMENT workspace (#PCDATA)>
+<!ATTLIST workspace
+ name CDATA #REQUIRED>
+<!ELEMENT RepositoryMapping (Map)*>
+]><JCR>
+ <RepositoryMapping>
+ <Map name="website" repositoryName="magnolia" workspaceName="website" />
+ <Map name="messages" repositoryName="magnolia" workspaceName="messages" />
+ <Map name="config" repositoryName="magnolia" workspaceName="config" />
+ <Map name="users" repositoryName="magnolia" workspaceName="users" />
+ <Map name="userroles" repositoryName="magnolia" workspaceName="userroles" />
+ <Map name="usergroups" repositoryName="magnolia" workspaceName="usergroups" />
+ <Map name="mgnlSystem" repositoryName="magnolia" workspaceName="mgnlSystem" /> <!-- System internal data -->
+ <Map name="mgnlVersion" repositoryName="magnolia" workspaceName="mgnlVersion" /> <!-- magnolia version workspace -->
+ </RepositoryMapping>
+
+ <!-- magnolia default repository -->
+ <Repository name="magnolia" provider="info.magnolia.jackrabbit.ProviderImpl" loadOnStartup="true">
+ <param name="configFile" value="${magnolia.repositories.jackrabbit.config}" />
+ <param name="repositoryHome" value="${magnolia.repositories.home}/magnolia" />
+ <param name="contextFactoryClass" value="org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory" />
+ <param name="providerURL" value="localhost" />
+ <param name="bindName" value="${magnolia.webapp}" />
+ <workspace name="website" />
+ <workspace name="messages" />
+ <workspace name="config" />
+ <workspace name="users" />
+ <workspace name="userroles" />
+ <workspace name="usergroups" />
+ <workspace name="mgnlSystem" />
+ <workspace name="mgnlVersion" />
+ </Repository>
+</JCR>
\ No newline at end of file
Added: magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/test-magnolia.properties
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/test-magnolia.properties (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/test-magnolia.properties 2012-07-17 16:11:00 UTC (rev 4104)
@@ -0,0 +1,41 @@
+magnolia.basedir=target/magnolia-test-data
+magnolia.cache.startdir=${magnolia.basedir}/cache
+magnolia.upload.tmpdir=${magnolia.basedir}/tmp
+magnolia.exchange.history=${magnolia.basedir}/history
+
+magnolia.app.rootdir=.
+
+magnolia.repositories.home=target/test-repositories
+# points to the classpath resources, but will be extracted and the property reset
+
+magnolia.repositories.config=/test-repositories.xml
+magnolia.repositories.jackrabbit.config=/jackrabbit-test-configuration.xml
+
+log4j.config=WEB-INF/config/default/log4j.xml
+magnolia.logs.dir=${magnolia.base}/logs
+
+# The directories in which the bootstrap files are searched
+magnolia.bootstrap.dir=WEB-INF/bootstrap/author WEB-INF/bootstrap/common
+
+
+magnolia.bootstrap.authorInstance=true
+magnolia.bootstrap.samples=false
+magnolia.develop=true
+
+magnolia.connection.jcr.userId = admin
+magnolia.connection.jcr.password = admin
+
+magnolia.update.auto=true
+
+magnolia.defaultpage = /sapere.html
+
+####### solo per test #####
+info.magnolia.logging.AuditLoggingManager=info.magnolia.logging.AuditLoggingManager
+info.magnolia.link.LinkTransformerManager=info.magnolia.link.LinkTransformerManager
+#######
+
+info.magnolia.cms.i18n.I18nContentSupport=info.magnolia.cms.i18n.DefaultI18nContentSupport
+
+info.magnolia.cms.core.search.SearchFactory=info.magnolia.cms.core.search.DefaultSearchFactory
+
+info.magnolia.cms.i18n.MessagesManager=net.sourceforge.openutils.mgnlmessages.i18n.MultiBundleMgnlMessagesManager
\ 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...> - 2012-07-10 20:52:09
|
Revision: 4103
http://openutils.svn.sourceforge.net/openutils/?rev=4103&view=rev
Author: gcatania
Date: 2012-07-10 20:52:03 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
fix scm tags on backport branch
Modified Paths:
--------------
branches/openutils-bshd5-backport/pom.xml
Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml 2012-07-07 23:15:53 UTC (rev 4102)
+++ branches/openutils-bshd5-backport/pom.xml 2012-07-10 20:52:03 UTC (rev 4103)
@@ -24,9 +24,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/branches/openutils-bshd5-backport</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/branches/openutils-bshd5-backport</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/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...> - 2012-07-07 23:16:00
|
Revision: 4102
http://openutils.svn.sourceforge.net/openutils/?rev=4102&view=rev
Author: gcatania
Date: 2012-07-07 23:15:53 +0000 (Sat, 07 Jul 2012)
Log Message:
-----------
fix mess by maven release plugin
Added Paths:
-----------
tags/openutils-bshd5-1.9.0/
Removed Paths:
-------------
tags/openutils-bshd5-1.9.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2012-07-07 21:31:14
|
Revision: 4101
http://openutils.svn.sourceforge.net/openutils/?rev=4101&view=rev
Author: gcatania
Date: 2012-07-07 21:31:08 +0000 (Sat, 07 Jul 2012)
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 2012-07-07 21:30:59 UTC (rev 4100)
+++ branches/openutils-bshd5-backport/pom.xml 2012-07-07 21:31:08 UTC (rev 4101)
@@ -9,7 +9,7 @@
<artifactId>openutils-bshd5</artifactId>
<packaging>bundle</packaging>
<name>openutils base Spring-Hibernate DAO</name>
- <version>1.9.0</version>
+ <version>1.9.1-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:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.9.0</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.9.0</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-1.9.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>
<testResources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2012-07-07 21:31:05
|
Revision: 4100
http://openutils.svn.sourceforge.net/openutils/?rev=4100&view=rev
Author: gcatania
Date: 2012-07-07 21:30:59 +0000 (Sat, 07 Jul 2012)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-bshd5-1.9.0
Added Paths:
-----------
tags/openutils-bshd5-1.9.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2012-07-07 21:30:37
|
Revision: 4099
http://openutils.svn.sourceforge.net/openutils/?rev=4099&view=rev
Author: gcatania
Date: 2012-07-07 21:30:30 +0000 (Sat, 07 Jul 2012)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-bshd5-1.9.0
Modified Paths:
--------------
branches/openutils-bshd5-backport/pom.xml
Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml 2012-07-05 15:16:19 UTC (rev 4098)
+++ branches/openutils-bshd5-backport/pom.xml 2012-07-07 21:30:30 UTC (rev 4099)
@@ -9,7 +9,7 @@
<artifactId>openutils-bshd5</artifactId>
<packaging>bundle</packaging>
<name>openutils base Spring-Hibernate DAO</name>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0</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: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-1.9.0</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-1.9.0</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-1.9.0</url>
</scm>
<build>
<testResources>
@@ -203,7 +203,7 @@
<hibernate.driver>org.hsqldb.jdbcDriver</hibernate.driver>
<hibernate.url>jdbc:hsqldb:mem:daotest</hibernate.url>
<hibernate.user>sa</hibernate.user>
- <hibernate.password></hibernate.password>
+ <hibernate.password />
<hibernate.dialect>org.hibernate.dialect.HSQLDialect</hibernate.dialect>
</properties>
<dependencies>
@@ -221,7 +221,7 @@
<hibernate.driver>org.apache.derby.jdbc.EmbeddedDriver</hibernate.driver>
<hibernate.url>jdbc:derby:memory:daotest;create=true</hibernate.url>
<hibernate.user>sa</hibernate.user>
- <hibernate.password></hibernate.password>
+ <hibernate.password />
<hibernate.dialect>org.hibernate.dialect.DerbyDialect</hibernate.dialect>
</properties>
<build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2012-07-05 16:34:07
|
See <https://hudson.openmindonline.it/job/openutils-bshd5/75/changes> Changes: [gcatania] BSHD-16 formatting, pom cleanup [gcatania] BSHD-16 hibernate 4 compatbility changes [gcatania] BSHD-10 update slfj and spring versions [gcatania] BSHD-17 added derby profile for unit tests [gcatania] BSHD-17 preliminary: avoid possible sql keywords as field names ------------------------------------------ Started by an SCM change Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5 U src/test/java/it/openutils/hibernate/test/model/Address.java U src/test/java/it/openutils/hibernate/test/model/CarModel.java U src/test/java/it/openutils/hibernate/test/EntityBuilder.java U src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java U src/test/resources/spring-tests.xml U src/test/resources/hibernate.cfg.xml U src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java U src/main/java/it/openutils/hibernate/example/ExampleTree.java U src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java U src/main/java/it/openutils/dao/hibernate/HibernateDAO.java U src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java U pom.xml At revision 4098 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-bshd5] $ /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 41759 /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-bshd5/ws/openutils-bshd5/pom.xml> clean install [INFO] Scanning for projects... [WARNING] POM for 'biz.aQute:bndlib:pom:1.50.0:runtime' is invalid. Its dependencies (if any) will NOT be available to the current build. [INFO] ------------------------------------------------------------------------ [INFO] Building openutils base Spring-Hibernate DAO [INFO] task-segment: [clean, install] [INFO] ------------------------------------------------------------------------ [INFO] [clean:clean {execution: default-clean}] [INFO] Deleting directory <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/target> [INFO] [resources:resources {execution: default-resources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] skip non existing resourceDirectory <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/src/main/resources> Downloading: http://repository.openmindonline.it/org/slf4j/slf4j-log4j12/1.6.6/slf4j-log4j12-1.6.6.pom [WARNING] Unable to get resource 'org.slf4j:slf4j-log4j12:pom:1.6.6' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/slf4j/jcl-over-slf4j/1.6.6/jcl-over-slf4j-1.6.6.pom [WARNING] Unable to get resource 'org.slf4j:jcl-over-slf4j:pom:1.6.6' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/springframework/spring-orm/3.1.1.RELEASE/spring-orm-3.1.1.RELEASE.pom [WARNING] Unable to get resource 'org.springframework:spring-orm:pom:3.1.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/springframework/spring-aop/3.1.1.RELEASE/spring-aop-3.1.1.RELEASE.pom [WARNING] Unable to get resource 'org.springframework:spring-aop:pom:3.1.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/hibernate/hibernate-core/4.1.1.Final/hibernate-core-4.1.1.Final.pom [WARNING] Unable to get resource 'org.hibernate:hibernate-core:pom:4.1.1.Final' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/springframework/spring-test/3.1.1.RELEASE/spring-test-3.1.1.RELEASE.pom [WARNING] Unable to get resource 'org.springframework:spring-test:pom:3.1.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/hsqldb/hsqldb/2.2.8/hsqldb-2.2.8.pom [WARNING] Unable to get resource 'org.hsqldb:hsqldb:pom:2.2.8' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/springframework/spring-orm/3.1.1.RELEASE/spring-orm-3.1.1.RELEASE.jar Downloading: http://repository.openmindonline.it/org/hibernate/hibernate-core/4.1.1.Final/hibernate-core-4.1.1.Final.jar Downloading: http://repository.openmindonline.it/org/slf4j/slf4j-log4j12/1.6.6/slf4j-log4j12-1.6.6.jar [WARNING] Unable to get resource 'org.springframework:spring-orm:jar:3.1.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out [WARNING] Unable to get resource 'org.slf4j:slf4j-log4j12:jar:1.6.6' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/springframework/spring-aop/3.1.1.RELEASE/spring-aop-3.1.1.RELEASE.jar [WARNING] Unable to get resource 'org.hibernate:hibernate-core:jar:4.1.1.Final' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out Downloading: http://repository.openmindonline.it/org/slf4j/jcl-over-slf4j/1.6.6/jcl-over-slf4j-1.6.6.jar [WARNING] Unable to get resource 'org.slf4j:jcl-over-slf4j:jar:1.6.6' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out [WARNING] Unable to get resource 'org.springframework:spring-aop:jar:3.1.1.RELEASE' from repository central (http://repo1.maven.org/maven2): Error transferring file: Connection timed out [JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-bshd5/ws/openutils-bshd5/pom.xml> to /data/hudson-data/jobs/openutils-bshd5/modules/net.sourceforge.openutils$openutils-bshd5/builds/2012-07-05_17-40-32/archive/net.sourceforge.openutils/openutils-bshd5/3.0.0-SNAPSHOT/pom.xml [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Failed to resolve artifact. Missing: ---------- 1) org.springframework:spring-orm:jar:3.1.1.RELEASE Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.springframework -DartifactId=spring-orm -Dversion=3.1.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.springframework -DartifactId=spring-orm -Dversion=3.1.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT 2) org.springframework:spring-orm:jar:3.1.1.RELEASE 2) org.slf4j:slf4j-log4j12:jar:1.6.6 Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.slf4j -DartifactId=slf4j-log4j12 -Dversion=1.6.6 -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.slf4j -DartifactId=slf4j-log4j12 -Dversion=1.6.6 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT 2) org.slf4j:slf4j-log4j12:jar:1.6.6 3) org.hibernate:hibernate-core:jar:4.1.1.Final Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.hibernate -DartifactId=hibernate-core -Dversion=4.1.1.Final -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.hibernate -DartifactId=hibernate-core -Dversion=4.1.1.Final -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT 2) org.hibernate:hibernate-core:jar:4.1.1.Final 4) org.slf4j:jcl-over-slf4j:jar:1.6.6 Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.slf4j -DartifactId=jcl-over-slf4j -Dversion=1.6.6 -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.slf4j -DartifactId=jcl-over-slf4j -Dversion=1.6.6 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT 2) org.slf4j:jcl-over-slf4j:jar:1.6.6 5) org.springframework:spring-aop:jar:3.1.1.RELEASE Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.springframework -DartifactId=spring-aop -Dversion=3.1.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.springframework -DartifactId=spring-aop -Dversion=3.1.1.RELEASE -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT 2) org.springframework:spring-aop:jar:3.1.1.RELEASE ---------- 5 required artifacts are missing. for artifact: net.sourceforge.openutils:openutils-bshd5:bundle:3.0.0-SNAPSHOT from the specified remote repositories: openmind (http://repository.openmindonline.it) [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 28 minutes 29 seconds [INFO] Finished at: Thu Jul 05 18:09:06 CEST 2012 [INFO] Final Memory: 30M/158M [INFO] ------------------------------------------------------------------------ channel stopped |
|
From: <gca...@us...> - 2012-07-05 15:16:30
|
Revision: 4098
http://openutils.svn.sourceforge.net/openutils/?rev=4098&view=rev
Author: gcatania
Date: 2012-07-05 15:16:19 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
dependency update for backport branch
Modified Paths:
--------------
branches/openutils-bshd5-backport/pom.xml
Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml 2012-07-05 15:11:03 UTC (rev 4097)
+++ branches/openutils-bshd5-backport/pom.xml 2012-07-05 15:16:19 UTC (rev 4098)
@@ -9,7 +9,7 @@
<artifactId>openutils-bshd5</artifactId>
<packaging>bundle</packaging>
<name>openutils base Spring-Hibernate DAO</name>
- <version>2.5.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<description>Openutils base Spring-Hibernate DAO (for java 5 and more)</description>
<licenses>
<license>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2012-07-05 15:11:14
|
Revision: 4097
http://openutils.svn.sourceforge.net/openutils/?rev=4097&view=rev
Author: gcatania
Date: 2012-07-05 15:11:03 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
BSHD-16 formatting, pom cleanup
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2012-07-05 15:08:33 UTC (rev 4096)
+++ trunk/openutils-bshd5/pom.xml 2012-07-05 15:11:03 UTC (rev 4097)
@@ -53,14 +53,14 @@
</descriptors>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- BSHD-16 without manifest only jar, hibernate has classpath issues -->
<useManifestOnlyJar>true</useManifestOnlyJar>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.7</version>
@@ -154,28 +154,6 @@
<version>6.5.2</version>
<scope>test</scope>
</dependency>
-<!--
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>${hibernate.version}</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>
--->
</dependencies>
<properties>
<slf4j.version>1.6.6</slf4j.version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2012-07-05 15:08:39
|
Revision: 4096
http://openutils.svn.sourceforge.net/openutils/?rev=4096&view=rev
Author: gcatania
Date: 2012-07-05 15:08:33 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Blocked revisions 4041,4057,4093-4094 via svnmerge
........
r4041 | gcatania | 2012-05-20 16:42:04 +0200 (Sun, 20 May 2012) | 1 line
snapshot version bump
........
r4057 | gcatania | 2012-06-06 23:28:38 +0200 (Wed, 06 Jun 2012) | 1 line
BSHD-10 dependency update
........
r4093 | gcatania | 2012-07-05 16:55:25 +0200 (Thu, 05 Jul 2012) | 1 line
BSHD-10 update slfj and spring versions
........
r4094 | gcatania | 2012-07-05 17:03:58 +0200 (Thu, 05 Jul 2012) | 1 line
BSHD-16 hibernate 4 compatbility changes
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4041&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4057&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4093&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4094&view=rev
Property Changed:
----------------
branches/openutils-bshd5-backport/
Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-blocked
- /trunk/openutils-bshd5:4041,4057
+ /trunk/openutils-bshd5:4041,4057,4093-4094
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2012-07-05 15:05:13
|
Revision: 4095
http://openutils.svn.sourceforge.net/openutils/?rev=4095&view=rev
Author: gcatania
Date: 2012-07-05 15:05:00 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Merged revisions 4091-4092 via svnmerge from
https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5
........
r4091 | gcatania | 2012-07-05 16:42:38 +0200 (Thu, 05 Jul 2012) | 1 line
BSHD-17 preliminary: avoid possible sql keywords as field names
........
r4092 | gcatania | 2012-07-05 16:49:05 +0200 (Thu, 05 Jul 2012) | 1 line
BSHD-17 added derby profile for unit tests
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4091&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4092&view=rev
Modified Paths:
--------------
branches/openutils-bshd5-backport/pom.xml
branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/EntityBuilder.java
branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java
branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Address.java
branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CarModel.java
branches/openutils-bshd5-backport/src/test/resources/spring-tests.xml
Property Changed:
----------------
branches/openutils-bshd5-backport/
branches/openutils-bshd5-backport/pom.xml
branches/openutils-bshd5-backport/src/
Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
- /trunk/openutils-bshd5:1-4040,4042-4056,4058-4089
+ /trunk/openutils-bshd5:1-4040,4042-4056,4058-4092
Modified: svn:mergeinfo
- /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*,4084-4085*,4087*,4089*
+ /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*,4084-4085*,4087*,4089*,4091-4092*
Modified: branches/openutils-bshd5-backport/pom.xml
===================================================================
--- branches/openutils-bshd5-backport/pom.xml 2012-07-05 15:03:58 UTC (rev 4094)
+++ branches/openutils-bshd5-backport/pom.xml 2012-07-05 15:05:00 UTC (rev 4095)
@@ -29,6 +29,12 @@
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-bshd5</url>
</scm>
<build>
+ <testResources>
+ <testResource>
+ <filtering>true</filtering>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -159,12 +165,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>2.2.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<version>${hibernate.annotations.version}</version>
@@ -192,4 +192,61 @@
<hibernate.annotations.version>3.4.0.GA</hibernate.annotations.version>
<javassist.version>3.14.0-GA</javassist.version>
</properties>
+
+ <profiles>
+ <profile>
+ <id>test-hsql</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <hibernate.driver>org.hsqldb.jdbcDriver</hibernate.driver>
+ <hibernate.url>jdbc:hsqldb:mem:daotest</hibernate.url>
+ <hibernate.user>sa</hibernate.user>
+ <hibernate.password></hibernate.password>
+ <hibernate.dialect>org.hibernate.dialect.HSQLDialect</hibernate.dialect>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>2.2.8</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>test-derby</id>
+ <properties>
+ <hibernate.driver>org.apache.derby.jdbc.EmbeddedDriver</hibernate.driver>
+ <hibernate.url>jdbc:derby:memory:daotest;create=true</hibernate.url>
+ <hibernate.user>sa</hibernate.user>
+ <hibernate.password></hibernate.password>
+ <hibernate.dialect>org.hibernate.dialect.DerbyDialect</hibernate.dialect>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>derby.stream.error.file</name>
+ <value>${project.build.directory}/derby.log</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.9.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Property changes on: branches/openutils-bshd5-backport/pom.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/openutils-bshd5/pom.xml:4045-4047,4059,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089
+ /trunk/openutils-bshd5/pom.xml:4045-4047,4059,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089,4091-4092
Property changes on: branches/openutils-bshd5-backport/src
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089
+ /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089,4091-4092
Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/EntityBuilder.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/EntityBuilder.java 2012-07-05 15:03:58 UTC (rev 4094)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/EntityBuilder.java 2012-07-05 15:05:00 UTC (rev 4095)
@@ -115,7 +115,7 @@
CarModel prius = new CarModel();
prius.setName("Prius");
prius.setMake(toyota);
- prius.setYear(Integer.valueOf(2008));
+ prius.setLaunchYear(Integer.valueOf(2008));
List<CarModel> toyotaModels = toyota.getModels();
if (toyotaModels == null)
Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java 2012-07-05 15:03:58 UTC (rev 4094)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java 2012-07-05 15:05:00 UTC (rev 4095)
@@ -128,7 +128,7 @@
Assert.assertEquals(rd.getEmployer(), toyota);
Assert.assertEquals(prius.getMake(), toyota);
Assert.assertEquals(rd.getHipsterFactor(), 97);
- Assert.assertEquals(rd.getDesignedModels().iterator().next().getYear(), Integer.valueOf(2008));
+ Assert.assertEquals(rd.getDesignedModels().iterator().next().getLaunchYear(), Integer.valueOf(2008));
}
@Test
Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Address.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Address.java 2012-07-05 15:03:58 UTC (rev 4094)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/Address.java 2012-07-05 15:05:00 UTC (rev 4095)
@@ -47,7 +47,7 @@
private String street;
@Column(nullable = false, scale = 4)
- private Integer no;
+ private Integer streetNumber;
@Column(nullable = false, length = 50)
private String city;
@@ -62,10 +62,10 @@
{
}
- public Address(String street, Integer no, String city, String county, Integer zipCode)
+ public Address(String street, Integer streetNumber, String city, String county, Integer zipCode)
{
this.street = street;
- this.no = no;
+ this.streetNumber = streetNumber;
this.city = city;
this.county = county;
this.zipCode = zipCode;
@@ -104,19 +104,19 @@
}
/**
- * @return the no
+ * @return the streetNumber
*/
- public Integer getNo()
+ public Integer getStreetNumber()
{
- return no;
+ return streetNumber;
}
/**
- * @param no the no to set
+ * @param streetNumber the no to set
*/
- public void setNo(Integer no)
+ public void setStreetNumber(Integer streetNumber)
{
- this.no = no;
+ this.streetNumber = streetNumber;
}
/**
@@ -178,7 +178,7 @@
result = prime * result + ((city == null) ? 0 : city.hashCode());
result = prime * result + ((county == null) ? 0 : county.hashCode());
result = prime * result + ((id == null) ? 0 : id.hashCode());
- result = prime * result + ((no == null) ? 0 : no.hashCode());
+ result = prime * result + ((streetNumber == null) ? 0 : streetNumber.hashCode());
result = prime * result + ((street == null) ? 0 : street.hashCode());
result = prime * result + ((zipCode == null) ? 0 : zipCode.hashCode());
return result;
@@ -236,14 +236,14 @@
{
return false;
}
- if (no == null)
+ if (streetNumber == null)
{
- if (other.no != null)
+ if (other.streetNumber != null)
{
return false;
}
}
- else if (!no.equals(other.no))
+ else if (!streetNumber.equals(other.streetNumber))
{
return false;
}
@@ -284,8 +284,8 @@
+ county
+ ", id="
+ id
- + ", no="
- + no
+ + ", streetNumber="
+ + streetNumber
+ ", street="
+ street
+ ", zipCode="
Modified: branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CarModel.java
===================================================================
--- branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CarModel.java 2012-07-05 15:03:58 UTC (rev 4094)
+++ branches/openutils-bshd5-backport/src/test/java/it/openutils/hibernate/test/model/CarModel.java 2012-07-05 15:05:00 UTC (rev 4095)
@@ -52,7 +52,7 @@
private String name;
@Column
- private Integer year;
+ private Integer launchYear;
/**
* @return the id
@@ -103,19 +103,19 @@
}
/**
- * @return the year
+ * @return the launchYear
*/
- public Integer getYear()
+ public Integer getLaunchYear()
{
- return year;
+ return launchYear;
}
/**
- * @param year the year to set
+ * @param launchYear the launchYear to set
*/
- public void setYear(Integer year)
+ public void setLaunchYear(Integer launchYear)
{
- this.year = year;
+ this.launchYear = launchYear;
}
/**
@@ -129,7 +129,7 @@
result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((make == null) ? 0 : make.hashCode());
result = prime * result + ((name == null) ? 0 : name.hashCode());
- result = prime * result + ((year == null) ? 0 : year.hashCode());
+ result = prime * result + ((launchYear == null) ? 0 : launchYear.hashCode());
return result;
}
@@ -185,14 +185,14 @@
{
return false;
}
- if (year == null)
+ if (launchYear == null)
{
- if (other.year != null)
+ if (other.launchYear != null)
{
return false;
}
}
- else if (!year.equals(other.year))
+ else if (!launchYear.equals(other.launchYear))
{
return false;
}
@@ -211,8 +211,8 @@
.append(id)
.append(", name=")
.append(name)
- .append(", year=")
- .append(year)
+ .append(", launchYear=")
+ .append(launchYear)
.append("]");
return builder.toString();
}
Modified: branches/openutils-bshd5-backport/src/test/resources/spring-tests.xml
===================================================================
--- branches/openutils-bshd5-backport/src/test/resources/spring-tests.xml 2012-07-05 15:03:58 UTC (rev 4094)
+++ branches/openutils-bshd5-backport/src/test/resources/spring-tests.xml 2012-07-05 15:05:00 UTC (rev 4095)
@@ -11,10 +11,10 @@
<context:annotation-config />
<context:component-scan base-package="it.openutils.hibernate.test" />
<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
- <property name="driverClassName" value="org.hsqldb.jdbcDriver" />
- <property name="url" value="jdbc:hsqldb:mem:daotest" />
- <property name="username" value="sa" />
- <property name="password" value="" />
+ <property name="driverClassName" value="${hibernate.driver}" />
+ <property name="url" value="${hibernate.url}" />
+ <property name="username" value="${hibernate.user}" />
+ <property name="password" value="${hibernate.password}" />
</bean>
<bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
<property name="dataSource" ref="dataSource" />
@@ -22,7 +22,7 @@
<property name="configurationClass" value="org.hibernate.cfg.AnnotationConfiguration" />
<property name="hibernateProperties">
<props>
- <prop key="hibernate.dialect">org.hibernate.dialect.HSQLDialect</prop>
+ <prop key="hibernate.dialect">${hibernate.dialect}</prop>
<prop key="hibernate.show_sql">true</prop>
<prop key="hibernate.hbm2ddl.auto">create-drop</prop>
</props>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2012-07-05 15:04:08
|
Revision: 4094
http://openutils.svn.sourceforge.net/openutils/?rev=4094&view=rev
Author: gcatania
Date: 2012-07-05 15:03:58 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
BSHD-16 hibernate 4 compatbility changes
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/ExampleTree.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
trunk/openutils-bshd5/src/test/resources/hibernate.cfg.xml
trunk/openutils-bshd5/src/test/resources/spring-tests.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2012-07-05 14:55:25 UTC (rev 4093)
+++ trunk/openutils-bshd5/pom.xml 2012-07-05 15:03:58 UTC (rev 4094)
@@ -53,7 +53,14 @@
</descriptors>
</configuration>
</plugin>
- <plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- BSHD-16 without manifest only jar, hibernate has classpath issues -->
+ <useManifestOnlyJar>true</useManifestOnlyJar>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.7</version>
@@ -147,6 +154,7 @@
<version>6.5.2</version>
<scope>test</scope>
</dependency>
+<!--
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
@@ -167,10 +175,11 @@
</exclusion>
</exclusions>
</dependency>
+-->
</dependencies>
<properties>
<slf4j.version>1.6.6</slf4j.version>
- <hibernate.version>3.5.6-Final</hibernate.version>
+ <hibernate.version>4.1.1.Final</hibernate.version>
<javassist.version>3.16.1-GA</javassist.version>
<spring.version>3.1.1.RELEASE</spring.version>
</properties>
@@ -204,7 +213,7 @@
<hibernate.url>jdbc:derby:memory:daotest;create=true</hibernate.url>
<hibernate.user>sa</hibernate.user>
<hibernate.password></hibernate.password>
- <hibernate.dialect>org.hibernate.dialect.DerbyDialect</hibernate.dialect>
+ <hibernate.dialect>org.hibernate.dialect.DerbyTenSevenDialect</hibernate.dialect>
</properties>
<build>
<plugins>
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 2012-07-05 14:55:25 UTC (rev 4093)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java 2012-07-05 15:03:58 UTC (rev 4094)
@@ -318,7 +318,9 @@
* Load object matching the given key and return it. Lazy object will be initialized.
* @param key the id of the entity instance to load
* @return the found entity instance, or null if none found
+ * @deprecated same as {@link #get(Serializable)}
*/
+ @Deprecated
T loadIfAvailable(K key);
/**
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 2012-07-05 14:55:25 UTC (rev 4093)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2012-07-05 15:03:58 UTC (rev 4094)
@@ -30,7 +30,6 @@
import it.openutils.hibernate.example.FilterMetadataSupport;
import java.io.Serializable;
-import java.sql.SQLException;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -42,9 +41,9 @@
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Criteria;
import org.hibernate.Hibernate;
-import org.hibernate.HibernateException;
import org.hibernate.Query;
import org.hibernate.Session;
+import org.hibernate.SessionFactory;
import org.hibernate.criterion.CriteriaSpecification;
import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.Order;
@@ -52,9 +51,9 @@
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Property;
import org.hibernate.type.Type;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.aop.framework.AopContext;
-import org.springframework.orm.hibernate3.HibernateCallback;
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
/**
@@ -64,11 +63,13 @@
* @param <T> Persistence class
* @param <K> Object Key
*/
-public abstract class HibernateDAOImpl<T, K extends Serializable> extends HibernateDaoSupport
- implements
- HibernateDAO<T, K>
+public abstract class HibernateDAOImpl<T, K extends Serializable> implements HibernateDAO<T, K>
{
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
+ private SessionFactory sessionFactory;
+
private Class<T> referenceClass;
private boolean aopenabled;
@@ -106,7 +107,21 @@
this.referenceClass = referenceClass;
}
+ private Session getCurrentSession()
+ {
+ return sessionFactory.getCurrentSession();
+ }
+
/**
+ * creates a criteria for this dao's reference class, associated to the current session
+ * @return a new criteria for the reference class
+ */
+ private Criteria createCriteria()
+ {
+ return getCurrentSession().createCriteria(getReferenceClass());
+ }
+
+ /**
* {@inheritDoc}
*/
public List<T> findAll()
@@ -128,29 +143,22 @@
*/
public List<T> find(final List< ? extends Criterion> criteria, final Order... orders)
{
- return getHibernateTemplate().execute(new HibernateCallback<List<T>>()
+ Criteria crit = createCriteria();
+ if (criteria != null)
{
-
- public List<T> doInHibernate(final Session ses) throws HibernateException
+ for (Criterion c : criteria)
{
- Criteria crit = ses.createCriteria(getReferenceClass());
- if (criteria != null)
- {
- for (Criterion c : criteria)
- {
- crit.add(c);
- }
- }
- if (orders != null)
- {
- for (Order o : orders)
- {
- crit.addOrder(o);
- }
- }
- return crit.list();
+ crit.add(c);
}
- });
+ }
+ if (orders != null)
+ {
+ for (Order o : orders)
+ {
+ crit.addOrder(o);
+ }
+ }
+ return crit.list();
}
/**
@@ -158,7 +166,7 @@
*/
public List<T> find(String query)
{
- return getHibernateTemplate().find(query);
+ return getCurrentSession().createQuery(query).list();
}
/**
@@ -174,15 +182,7 @@
*/
public List<T> find(final String query, final Object[] paramValues, final Type[] paramTypes)
{
- return getHibernateTemplate().execute(new HibernateCallback<List<T>>()
- {
-
- public List<T> doInHibernate(final Session ses) throws HibernateException
- {
- // hibernate 3
- return ses.createQuery(query).setParameters(paramValues, paramTypes).list();
- }
- });
+ return getCurrentSession().createQuery(query).setParameters(paramValues, paramTypes).list();
}
/**
@@ -312,23 +312,18 @@
*/
public T load(K key)
{
- T result = getHibernateTemplate().load(getReferenceClass(), key);
+ T result = (T) sessionFactory.getCurrentSession().load(getReferenceClass(), key);
Hibernate.initialize(result);
return result;
}
/**
- * {@inheritDoc}
+ * @deprecated same as {@link #get(Serializable)};
*/
+ @Deprecated
public T loadIfAvailable(K key)
{
- T result = getHibernateTemplate().get(getReferenceClass(), key);
- if (result != null)
- {
- Hibernate.initialize(result);
- return result;
- }
- return null;
+ return get(key);
}
/**
@@ -336,7 +331,7 @@
*/
public T get(K key)
{
- return getHibernateTemplate().get(getReferenceClass(), key);
+ return (T) sessionFactory.getCurrentSession().get(getReferenceClass(), key);
}
/**
@@ -344,7 +339,7 @@
*/
public K save(T obj)
{
- return (K) getHibernateTemplate().save(obj);
+ return (K) sessionFactory.getCurrentSession().save(obj);
}
/**
@@ -352,7 +347,7 @@
*/
public void update(T obj)
{
- getHibernateTemplate().update(obj);
+ sessionFactory.getCurrentSession().update(obj);
}
/**
@@ -360,7 +355,7 @@
*/
public void saveOrUpdate(T obj)
{
- getHibernateTemplate().saveOrUpdate(obj);
+ sessionFactory.getCurrentSession().saveOrUpdate(obj);
}
/**
@@ -368,15 +363,10 @@
*/
public boolean delete(final K key)
{
- return getHibernateTemplate().execute(new HibernateCallback<Boolean>()
- {
-
- public Boolean doInHibernate(final Session ses) throws HibernateException
- {
- ses.delete(ses.load(getReferenceClass(), key));
- return true;
- }
- });
+ Session s = getCurrentSession();
+ Object toDelete = s.load(getReferenceClass(), key);
+ s.delete(toDelete);
+ return true;
}
/**
@@ -384,7 +374,7 @@
*/
public void refresh(T obj)
{
- getHibernateTemplate().refresh(obj);
+ getCurrentSession().refresh(obj);
}
/**
@@ -392,7 +382,7 @@
*/
public void evict(T obj)
{
- getHibernateTemplate().evict(obj);
+ getCurrentSession().evict(obj);
}
/**
@@ -400,15 +390,7 @@
*/
public T merge(final T obj)
{
- return getHibernateTemplate().execute(new HibernateCallback<T>()
- {
-
- public T doInHibernate(final Session ses) throws HibernateException
- {
- return (T) ses.merge(obj);
- }
- });
-
+ return (T) getCurrentSession().merge(obj);
}
/**
@@ -425,7 +407,7 @@
*/
public List<T> findFiltered(ExampleTree exampleTree, int maxResults, int page, Order... orders)
{
- return getHibernateTemplate().execute(new ExampleTreeCallback<T>(exampleTree, maxResults, page, orders));
+ return new ExampleTreeCallback<T>(exampleTree, maxResults, page, orders).doInHibernate(getCurrentSession());
}
/**
@@ -443,8 +425,8 @@
public List<Object> findFilteredProperties(ExampleTree exampleTree, int maxResults, int page,
List<String> properties, Order... orders)
{
- return getHibernateTemplate().execute(
- new ExampleTreePropertiesCallback(exampleTree, maxResults, page, properties, orders));
+ return new ExampleTreePropertiesCallback(exampleTree, maxResults, page, properties, orders)
+ .doInHibernate(getCurrentSession());
}
/**
@@ -483,7 +465,7 @@
public List<T> findFiltered(T filter, Map<String, ? extends FilterMetadata> metadata, int maxResults, int page,
List< ? extends Criterion> criteria, Order... orders)
{
- HibernateCallback<List<T>> callback;
+ BaseCallback<T> callback;
if (MapUtils.isEmpty(metadata) && CollectionUtils.isEmpty(criteria))
{
callback = new ExampleTreeCallback<T>(defaultExample(filter), maxResults, page, orders);
@@ -492,7 +474,7 @@
{
callback = new LegacySupportCallback<T>(filter, maxResults, page, metadata, criteria, orders);
}
- return getHibernateTemplate().execute(callback);
+ return callback.doInHibernate(getCurrentSession());
}
/**
@@ -515,7 +497,7 @@
Map<String, ? extends FilterMetadata> metadata, int maxResults, int page, List< ? extends Criterion> criteria,
List<String> properties)
{
- HibernateCallback<List<Object>> callback;
+ BaseCallback<Object> callback;
if (MapUtils.isEmpty(metadata) && CollectionUtils.isEmpty(criteria))
{
callback = new ExampleTreePropertiesCallback(defaultExample(filter), maxResults, page, properties, orders);
@@ -531,7 +513,7 @@
properties,
orders);
}
- return getHibernateTemplate().execute(callback);
+ return callback.doInHibernate(getCurrentSession());
}
/**
@@ -575,26 +557,19 @@
*/
protected List<Object> findByNamedQuery(final String name, final Serializable[] params, final Integer maxResults)
{
- return getHibernateTemplate().execute(new HibernateCallback<List<Object>>()
+ Query q = getCurrentSession().getNamedQuery(name);
+ if (maxResults != null)
{
-
- public List<Object> doInHibernate(final Session ses) throws HibernateException
+ q.setMaxResults(maxResults);
+ }
+ if (params != null)
+ {
+ for (int i = 0; i < params.length; i++)
{
- Query q = ses.getNamedQuery(name);
- if (maxResults != null)
- {
- q.setMaxResults(maxResults);
- }
- if (params != null)
- {
- for (int i = 0; i < params.length; i++)
- {
- q.setParameter(i, params[i]);
- }
- }
- return q.list();
+ q.setParameter(i, params[i]);
}
- });
+ }
+ return q.list();
}
/**
@@ -606,27 +581,20 @@
*/
protected List<Object> findByNamedQuery(final String name, final Map<String, ? > params, final Integer maxResults)
{
- return getHibernateTemplate().execute(new HibernateCallback<List<Object>>()
+ Query q = getCurrentSession().getNamedQuery(name);
+ if (maxResults != null)
{
+ q.setMaxResults(maxResults);
+ }
- public List<Object> doInHibernate(final Session ses) throws HibernateException
+ if (params != null)
+ {
+ for (Map.Entry<String, ? > entry : params.entrySet())
{
- Query q = ses.getNamedQuery(name);
- if (maxResults != null)
- {
- q.setMaxResults(maxResults);
- }
-
- if (params != null)
- {
- for (Map.Entry<String, ? > entry : params.entrySet())
- {
- setParameterValue(q, entry.getKey(), entry.getValue());
- }
- }
- return q.list();
+ setParameterValue(q, entry.getKey(), entry.getValue());
}
- });
+ }
+ return q.list();
}
/**
@@ -743,17 +711,33 @@
}
catch (AspectException exc)
{
- logger.debug("Not running inside an AOP proxy, so no proxy can be returned: " + exc.getMessage());
+ logger.debug("Not running inside an AOP proxy, so no proxy can be returned: {}", exc.getMessage());
}
catch (IllegalStateException e)
{
- logger.warn("Cannot access proxy: " + e.getMessage());
+ logger.warn("Cannot access proxy: {}", e.getMessage());
aopenabled = false;
}
return this;
}
/**
+ * @param sessionFactory the sessionFactory to set
+ */
+ public void setSessionFactory(SessionFactory sessionFactory)
+ {
+ this.sessionFactory = sessionFactory;
+ }
+
+ /**
+ * @return the sessionFactory
+ */
+ public SessionFactory getSessionFactory()
+ {
+ return sessionFactory;
+ }
+
+ /**
* @author gcatania
*/
@SuppressWarnings("deprecation")
@@ -847,7 +831,7 @@
* @author gcatania
* @param R the result class
*/
-abstract class BaseCallback<R> implements HibernateCallback<List<R>>
+abstract class BaseCallback<R>
{
private final Order[] orders;
@@ -870,7 +854,7 @@
*/
protected abstract Criteria createCriteria(Session session);
- public final List<R> doInHibernate(Session session) throws HibernateException, SQLException
+ public final List<R> doInHibernate(Session session)
{
Criteria crit = createCriteria(session);
crit.setMaxResults(maxResults);
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 2012-07-05 14:55:25 UTC (rev 4093)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2012-07-05 15:03:58 UTC (rev 4094)
@@ -37,7 +37,6 @@
import java.util.Set;
import org.hibernate.Criteria;
-import org.hibernate.EntityMode;
import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@@ -239,12 +238,9 @@
private final SessionFactory sessionFactory;
- private final EntityMode entityMode;
-
public ExampleTreeWalker(Session session)
{
sessionFactory = session.getSessionFactory();
- entityMode = session.getEntityMode();
}
public Criteria walk(Criteria rootCriteria)
@@ -281,7 +277,7 @@
continue;
}
- Object propertyValue = classMetadata.getPropertyValue(entity, propertyName, entityMode);
+ Object propertyValue = classMetadata.getPropertyValue(entity, propertyName);
if (propertyType.isCollectionType())
{
propertyValue = ExampleTreeUtils.getValueFromCollection(propertyValue);
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java 2012-07-05 14:55:25 UTC (rev 4093)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java 2012-07-05 15:03:58 UTC (rev 4094)
@@ -33,7 +33,7 @@
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
-import org.hibernate.engine.SessionImplementor;
+import org.hibernate.engine.spi.SessionImplementor;
import org.hibernate.metadata.ClassMetadata;
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 2012-07-05 14:55:25 UTC (rev 4093)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2012-07-05 15:03:58 UTC (rev 4094)
@@ -33,7 +33,6 @@
import java.util.Set;
import org.hibernate.Criteria;
-import org.hibernate.EntityMode;
import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@@ -96,12 +95,9 @@
private final SessionFactory sessionFactory;
- private final EntityMode entityMode;
-
public ExampleTreeWalker(Session session)
{
sessionFactory = session.getSessionFactory();
- entityMode = session.getEntityMode();
}
public Criteria walk(Criteria rootCriteria, Object rootEntity)
@@ -128,7 +124,7 @@
{
continue;
}
- Object propertyValue = classMetadata.getPropertyValue(entity, propertyName, entityMode);
+ Object propertyValue = classMetadata.getPropertyValue(entity, propertyName);
FilterMetadata fm = currFilterMetadata.get(propertyName);
if (fm != null && propertyValue != null)
{
Modified: trunk/openutils-bshd5/src/test/resources/hibernate.cfg.xml
===================================================================
--- trunk/openutils-bshd5/src/test/resources/hibernate.cfg.xml 2012-07-05 14:55:25 UTC (rev 4093)
+++ trunk/openutils-bshd5/src/test/resources/hibernate.cfg.xml 2012-07-05 15:03:58 UTC (rev 4094)
@@ -1,6 +1,6 @@
<!DOCTYPE hibernate-configuration PUBLIC
"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+ "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
<hibernate-configuration>
<session-factory>
<mapping class="it.openutils.hibernate.test.model.Address" />
Modified: trunk/openutils-bshd5/src/test/resources/spring-tests.xml
===================================================================
--- trunk/openutils-bshd5/src/test/resources/spring-tests.xml 2012-07-05 14:55:25 UTC (rev 4093)
+++ trunk/openutils-bshd5/src/test/resources/spring-tests.xml 2012-07-05 15:03:58 UTC (rev 4094)
@@ -3,11 +3,11 @@
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/aop
- http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+ http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+ http://www.springframework.org/schema/context/spring-context-3.1.xsd">
<context:annotation-config />
<context:component-scan base-package="it.openutils.hibernate.test" />
<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
@@ -16,10 +16,9 @@
<property name="username" value="${hibernate.user}" />
<property name="password" value="${hibernate.password}" />
</bean>
- <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
+ <bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
<property name="dataSource" ref="dataSource" />
<property name="configLocation" value="classpath:hibernate.cfg.xml" />
- <property name="configurationClass" value="org.hibernate.cfg.AnnotationConfiguration" />
<property name="hibernateProperties">
<props>
<prop key="hibernate.dialect">${hibernate.dialect}</prop>
@@ -28,7 +27,7 @@
</props>
</property>
</bean>
- <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
+ <bean id="transactionManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager">
<property name="sessionFactory" ref="sessionFactory" />
</bean>
</beans>
\ 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...> - 2012-07-05 14:55:34
|
Revision: 4093
http://openutils.svn.sourceforge.net/openutils/?rev=4093&view=rev
Author: gcatania
Date: 2012-07-05 14:55:25 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
BSHD-10 update slfj and spring versions
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2012-07-05 14:49:05 UTC (rev 4092)
+++ trunk/openutils-bshd5/pom.xml 2012-07-05 14:55:25 UTC (rev 4093)
@@ -169,10 +169,10 @@
</dependency>
</dependencies>
<properties>
- <slf4j.version>1.6.5</slf4j.version>
+ <slf4j.version>1.6.6</slf4j.version>
<hibernate.version>3.5.6-Final</hibernate.version>
<javassist.version>3.16.1-GA</javassist.version>
- <spring.version>3.0.0.RELEASE</spring.version>
+ <spring.version>3.1.1.RELEASE</spring.version>
</properties>
<profiles>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2012-07-05 14:49:14
|
Revision: 4092
http://openutils.svn.sourceforge.net/openutils/?rev=4092&view=rev
Author: gcatania
Date: 2012-07-05 14:49:05 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
BSHD-17 added derby profile for unit tests
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
trunk/openutils-bshd5/src/test/resources/spring-tests.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2012-07-05 14:42:38 UTC (rev 4091)
+++ trunk/openutils-bshd5/pom.xml 2012-07-05 14:49:05 UTC (rev 4092)
@@ -29,6 +29,12 @@
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-bshd5</url>
</scm>
<build>
+ <testResources>
+ <testResource>
+ <filtering>true</filtering>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -142,12 +148,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>2.2.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<version>${hibernate.version}</version>
@@ -174,4 +174,61 @@
<javassist.version>3.16.1-GA</javassist.version>
<spring.version>3.0.0.RELEASE</spring.version>
</properties>
+
+ <profiles>
+ <profile>
+ <id>test-hsql</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <hibernate.driver>org.hsqldb.jdbcDriver</hibernate.driver>
+ <hibernate.url>jdbc:hsqldb:mem:daotest</hibernate.url>
+ <hibernate.user>sa</hibernate.user>
+ <hibernate.password></hibernate.password>
+ <hibernate.dialect>org.hibernate.dialect.HSQLDialect</hibernate.dialect>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>2.2.8</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>test-derby</id>
+ <properties>
+ <hibernate.driver>org.apache.derby.jdbc.EmbeddedDriver</hibernate.driver>
+ <hibernate.url>jdbc:derby:memory:daotest;create=true</hibernate.url>
+ <hibernate.user>sa</hibernate.user>
+ <hibernate.password></hibernate.password>
+ <hibernate.dialect>org.hibernate.dialect.DerbyDialect</hibernate.dialect>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>derby.stream.error.file</name>
+ <value>${project.build.directory}/derby.log</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.9.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified: trunk/openutils-bshd5/src/test/resources/spring-tests.xml
===================================================================
--- trunk/openutils-bshd5/src/test/resources/spring-tests.xml 2012-07-05 14:42:38 UTC (rev 4091)
+++ trunk/openutils-bshd5/src/test/resources/spring-tests.xml 2012-07-05 14:49:05 UTC (rev 4092)
@@ -11,10 +11,10 @@
<context:annotation-config />
<context:component-scan base-package="it.openutils.hibernate.test" />
<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
- <property name="driverClassName" value="org.hsqldb.jdbcDriver" />
- <property name="url" value="jdbc:hsqldb:mem:daotest" />
- <property name="username" value="sa" />
- <property name="password" value="" />
+ <property name="driverClassName" value="${hibernate.driver}" />
+ <property name="url" value="${hibernate.url}" />
+ <property name="username" value="${hibernate.user}" />
+ <property name="password" value="${hibernate.password}" />
</bean>
<bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
<property name="dataSource" ref="dataSource" />
@@ -22,7 +22,7 @@
<property name="configurationClass" value="org.hibernate.cfg.AnnotationConfiguration" />
<property name="hibernateProperties">
<props>
- <prop key="hibernate.dialect">org.hibernate.dialect.HSQLDialect</prop>
+ <prop key="hibernate.dialect">${hibernate.dialect}</prop>
<prop key="hibernate.show_sql">true</prop>
<prop key="hibernate.hbm2ddl.auto">create-drop</prop>
</props>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2012-07-05 14:42:45
|
Revision: 4091
http://openutils.svn.sourceforge.net/openutils/?rev=4091&view=rev
Author: gcatania
Date: 2012-07-05 14:42:38 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
BSHD-17 preliminary: avoid possible sql keywords as field names
Modified Paths:
--------------
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java
trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.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/CarModel.java
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java 2012-07-04 13:22:42 UTC (rev 4090)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java 2012-07-05 14:42:38 UTC (rev 4091)
@@ -115,7 +115,7 @@
CarModel prius = new CarModel();
prius.setName("Prius");
prius.setMake(toyota);
- prius.setYear(Integer.valueOf(2008));
+ prius.setLaunchYear(Integer.valueOf(2008));
List<CarModel> toyotaModels = toyota.getModels();
if (toyotaModels == null)
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java 2012-07-04 13:22:42 UTC (rev 4090)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java 2012-07-05 14:42:38 UTC (rev 4091)
@@ -128,7 +128,7 @@
Assert.assertEquals(rd.getEmployer(), toyota);
Assert.assertEquals(prius.getMake(), toyota);
Assert.assertEquals(rd.getHipsterFactor(), 97);
- Assert.assertEquals(rd.getDesignedModels().iterator().next().getYear(), Integer.valueOf(2008));
+ Assert.assertEquals(rd.getDesignedModels().iterator().next().getLaunchYear(), Integer.valueOf(2008));
}
@Test
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 2012-07-04 13:22:42 UTC (rev 4090)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/Address.java 2012-07-05 14:42:38 UTC (rev 4091)
@@ -47,7 +47,7 @@
private String street;
@Column(nullable = false, scale = 4)
- private Integer no;
+ private Integer streetNumber;
@Column(nullable = false, length = 50)
private String city;
@@ -62,10 +62,10 @@
{
}
- public Address(String street, Integer no, String city, String county, Integer zipCode)
+ public Address(String street, Integer streetNumber, String city, String county, Integer zipCode)
{
this.street = street;
- this.no = no;
+ this.streetNumber = streetNumber;
this.city = city;
this.county = county;
this.zipCode = zipCode;
@@ -104,19 +104,19 @@
}
/**
- * @return the no
+ * @return the streetNumber
*/
- public Integer getNo()
+ public Integer getStreetNumber()
{
- return no;
+ return streetNumber;
}
/**
- * @param no the no to set
+ * @param streetNumber the no to set
*/
- public void setNo(Integer no)
+ public void setStreetNumber(Integer streetNumber)
{
- this.no = no;
+ this.streetNumber = streetNumber;
}
/**
@@ -178,7 +178,7 @@
result = prime * result + ((city == null) ? 0 : city.hashCode());
result = prime * result + ((county == null) ? 0 : county.hashCode());
result = prime * result + ((id == null) ? 0 : id.hashCode());
- result = prime * result + ((no == null) ? 0 : no.hashCode());
+ result = prime * result + ((streetNumber == null) ? 0 : streetNumber.hashCode());
result = prime * result + ((street == null) ? 0 : street.hashCode());
result = prime * result + ((zipCode == null) ? 0 : zipCode.hashCode());
return result;
@@ -236,14 +236,14 @@
{
return false;
}
- if (no == null)
+ if (streetNumber == null)
{
- if (other.no != null)
+ if (other.streetNumber != null)
{
return false;
}
}
- else if (!no.equals(other.no))
+ else if (!streetNumber.equals(other.streetNumber))
{
return false;
}
@@ -284,8 +284,8 @@
+ county
+ ", id="
+ id
- + ", no="
- + no
+ + ", streetNumber="
+ + streetNumber
+ ", street="
+ street
+ ", zipCode="
Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarModel.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarModel.java 2012-07-04 13:22:42 UTC (rev 4090)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/model/CarModel.java 2012-07-05 14:42:38 UTC (rev 4091)
@@ -52,7 +52,7 @@
private String name;
@Column
- private Integer year;
+ private Integer launchYear;
/**
* @return the id
@@ -103,19 +103,19 @@
}
/**
- * @return the year
+ * @return the launchYear
*/
- public Integer getYear()
+ public Integer getLaunchYear()
{
- return year;
+ return launchYear;
}
/**
- * @param year the year to set
+ * @param launchYear the launchYear to set
*/
- public void setYear(Integer year)
+ public void setLaunchYear(Integer launchYear)
{
- this.year = year;
+ this.launchYear = launchYear;
}
/**
@@ -129,7 +129,7 @@
result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((make == null) ? 0 : make.hashCode());
result = prime * result + ((name == null) ? 0 : name.hashCode());
- result = prime * result + ((year == null) ? 0 : year.hashCode());
+ result = prime * result + ((launchYear == null) ? 0 : launchYear.hashCode());
return result;
}
@@ -185,14 +185,14 @@
{
return false;
}
- if (year == null)
+ if (launchYear == null)
{
- if (other.year != null)
+ if (other.launchYear != null)
{
return false;
}
}
- else if (!year.equals(other.year))
+ else if (!launchYear.equals(other.launchYear))
{
return false;
}
@@ -211,8 +211,8 @@
.append(id)
.append(", name=")
.append(name)
- .append(", year=")
- .append(year)
+ .append(", launchYear=")
+ .append(launchYear)
.append("]");
return builder.toString();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2012-07-04 13:22:51
|
Revision: 4090
http://openutils.svn.sourceforge.net/openutils/?rev=4090&view=rev
Author: gcatania
Date: 2012-07-04 13:22:42 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
Merged revisions 4089 via svnmerge from
https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5
........
r4089 | gcatania | 2012-07-04 15:19:09 +0200 (Wed, 04 Jul 2012) | 1 line
BSHD-2 added support for default filtering on example tree
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4089&view=rev
Modified Paths:
--------------
branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
Property Changed:
----------------
branches/openutils-bshd5-backport/
branches/openutils-bshd5-backport/pom.xml
branches/openutils-bshd5-backport/src/
Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
- /trunk/openutils-bshd5:1-4040,4042-4056,4058-4087
+ /trunk/openutils-bshd5:1-4040,4042-4056,4058-4089
Modified: svn:mergeinfo
- /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*,4084-4085*,4087*
+ /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*,4084-4085*,4087*,4089*
Property changes on: branches/openutils-bshd5-backport/pom.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/openutils-bshd5/pom.xml:4045-4047,4059,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087
+ /trunk/openutils-bshd5/pom.xml:4045-4047,4059,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089
Property changes on: branches/openutils-bshd5-backport/src
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087
+ /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087,4089
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 2012-07-04 13:19:09 UTC (rev 4089)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2012-07-04 13:22:42 UTC (rev 4090)
@@ -191,7 +191,7 @@
*/
public List<T> findFiltered(T filter)
{
- return getThis().findFiltered(new ExampleTree(filter), Integer.MAX_VALUE, 0, getDefaultOrder());
+ return getThis().findFiltered(defaultExample(filter), Integer.MAX_VALUE, 0, getDefaultOrder());
}
/**
@@ -207,7 +207,7 @@
*/
public List<T> findFiltered(T filter, Order... orders)
{
- return getThis().findFiltered(new ExampleTree(filter), Integer.MAX_VALUE, 0, orders);
+ return getThis().findFiltered(defaultExample(filter), Integer.MAX_VALUE, 0, orders);
}
/**
@@ -223,7 +223,7 @@
*/
public List<T> findFiltered(T filter, int maxResults, int page)
{
- return getThis().findFiltered(new ExampleTree(filter), maxResults, page, getDefaultOrder());
+ return getThis().findFiltered(defaultExample(filter), maxResults, page, getDefaultOrder());
}
/**
@@ -303,7 +303,7 @@
*/
public T findFilteredFirst(T filter, List<Criterion> criteria)
{
- ExampleTree exampleTree = new ExampleTree(filter);
+ ExampleTree exampleTree = defaultExample(filter);
appendToRoot(exampleTree, criteria);
return getFirstInCollection(getThis().findFiltered(exampleTree, Integer.MAX_VALUE, 0, getDefaultOrder()));
}
@@ -436,7 +436,7 @@
public List<Object> findFilteredProperties(T filter, int maxResults, int page, List<String> properties,
Order... orders)
{
- return getThis().findFilteredProperties(new ExampleTree(filter), maxResults, page, properties, orders);
+ return getThis().findFilteredProperties(defaultExample(filter), maxResults, page, properties, orders);
}
/**
@@ -488,7 +488,7 @@
HibernateCallback callback;
if (MapUtils.isEmpty(metadata) && CollectionUtils.isEmpty(criteria))
{
- callback = new ExampleTreeCallback(new ExampleTree(filter), maxResults, page, orders);
+ callback = new ExampleTreeCallback(defaultExample(filter), maxResults, page, orders);
}
else
{
@@ -519,7 +519,7 @@
HibernateCallback callback;
if (MapUtils.isEmpty(metadata) && CollectionUtils.isEmpty(criteria))
{
- callback = new ExampleTreePropertiesCallback(new ExampleTree(filter), maxResults, page, properties, orders);
+ callback = new ExampleTreePropertiesCallback(defaultExample(filter), maxResults, page, properties, orders);
}
else
{
@@ -675,11 +675,22 @@
}
/**
+ * Returns the default example tree that will be applied to a filtered search by entity. The default implementation
+ * just returns an {@link ExampleTree}, subclasses may override.
+ * @param entity the example (filter) entity
+ * @return an example for the entity
+ */
+ protected ExampleTree defaultExample(T entity)
+ {
+ return new ExampleTree(entity);
+ }
+
+ /**
* Returns the default set of FilterMetadata that will be applied to any query. The default implementation doesn't
* set any default filter, subclasses may override this.
* @return map of property name - filter metadata
- * @deprecated {@link FilterMetadata} has been deprecated in favor of {@link ExampleTree#add(String, Criterion)} and
- * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)}
+ * @deprecated this method uses the deprecated class {@link FilterMetadata}, use {@link #defaultExample(Object)}
+ * instead
*/
@Deprecated
protected Map<String, FilterMetadata> getDefaultFilterMetadata()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2012-07-04 13:19:20
|
Revision: 4089
http://openutils.svn.sourceforge.net/openutils/?rev=4089&view=rev
Author: gcatania
Date: 2012-07-04 13:19:09 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
BSHD-2 added support for default filtering on example tree
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 2012-07-02 12:56:22 UTC (rev 4088)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2012-07-04 13:19:09 UTC (rev 4089)
@@ -190,7 +190,7 @@
*/
public List<T> findFiltered(T filter)
{
- return getThis().findFiltered(new ExampleTree(filter), Integer.MAX_VALUE, 0, getDefaultOrder());
+ return getThis().findFiltered(defaultExample(filter), Integer.MAX_VALUE, 0, getDefaultOrder());
}
/**
@@ -206,7 +206,7 @@
*/
public List<T> findFiltered(T filter, Order... orders)
{
- return getThis().findFiltered(new ExampleTree(filter), Integer.MAX_VALUE, 0, orders);
+ return getThis().findFiltered(defaultExample(filter), Integer.MAX_VALUE, 0, orders);
}
/**
@@ -222,7 +222,7 @@
*/
public List<T> findFiltered(T filter, int maxResults, int page)
{
- return getThis().findFiltered(new ExampleTree(filter), maxResults, page, getDefaultOrder());
+ return getThis().findFiltered(defaultExample(filter), maxResults, page, getDefaultOrder());
}
/**
@@ -302,7 +302,7 @@
*/
public T findFilteredFirst(T filter, List< ? extends Criterion> criteria)
{
- ExampleTree exampleTree = new ExampleTree(filter);
+ ExampleTree exampleTree = defaultExample(filter);
appendToRoot(exampleTree, criteria);
return getFirstInCollection(getThis().findFiltered(exampleTree, Integer.MAX_VALUE, 0, getDefaultOrder()));
}
@@ -434,7 +434,7 @@
public List<Object> findFilteredProperties(T filter, int maxResults, int page, List<String> properties,
Order... orders)
{
- return getThis().findFilteredProperties(new ExampleTree(filter), maxResults, page, properties, orders);
+ return getThis().findFilteredProperties(defaultExample(filter), maxResults, page, properties, orders);
}
/**
@@ -486,7 +486,7 @@
HibernateCallback<List<T>> callback;
if (MapUtils.isEmpty(metadata) && CollectionUtils.isEmpty(criteria))
{
- callback = new ExampleTreeCallback<T>(new ExampleTree(filter), maxResults, page, orders);
+ callback = new ExampleTreeCallback<T>(defaultExample(filter), maxResults, page, orders);
}
else
{
@@ -518,7 +518,7 @@
HibernateCallback<List<Object>> callback;
if (MapUtils.isEmpty(metadata) && CollectionUtils.isEmpty(criteria))
{
- callback = new ExampleTreePropertiesCallback(new ExampleTree(filter), maxResults, page, properties, orders);
+ callback = new ExampleTreePropertiesCallback(defaultExample(filter), maxResults, page, properties, orders);
}
else
{
@@ -674,11 +674,22 @@
}
/**
+ * Returns the default example tree that will be applied to a filtered search by entity. The default implementation
+ * just returns an {@link ExampleTree}, subclasses may override.
+ * @param entity the example (filter) entity
+ * @return an example for the entity
+ */
+ protected ExampleTree defaultExample(T entity)
+ {
+ return new ExampleTree(entity);
+ }
+
+ /**
* Returns the default set of FilterMetadata that will be applied to any query. The default implementation doesn't
* set any default filter, subclasses may override this.
* @return map of property name - filter metadata
- * @deprecated {@link FilterMetadata} has been deprecated in favor of {@link ExampleTree#add(String, Criterion)} and
- * {@link ExampleTree#overridePropertyFilter(String, String, Criterion)}
+ * @deprecated this method uses the deprecated class {@link FilterMetadata}, use {@link #defaultExample(Object)}
+ * instead
*/
@Deprecated
protected Map<String, ? extends FilterMetadata> getDefaultFilterMetadata()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2012-07-02 12:56:33
|
Revision: 4088
http://openutils.svn.sourceforge.net/openutils/?rev=4088&view=rev
Author: gcatania
Date: 2012-07-02 12:56:22 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
Merged revisions 4087 via svnmerge from
https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-bshd5
........
r4087 | gcatania | 2012-07-02 14:44:01 +0200 (Mon, 02 Jul 2012) | 1 line
BSHD-11 also fixed in FilterMetadataSupport
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4087&view=rev
Modified Paths:
--------------
branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java
branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java
branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
Property Changed:
----------------
branches/openutils-bshd5-backport/
branches/openutils-bshd5-backport/pom.xml
branches/openutils-bshd5-backport/src/
Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
- /trunk/openutils-bshd5:1-4040,4042-4056,4058-4085
+ /trunk/openutils-bshd5:1-4040,4042-4056,4058-4087
Modified: svn:mergeinfo
- /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*,4084-4085*
+ /trunk/openutils-bshd5:4045-4047*,4057,4059,4069-4070*,4073*,4075-4078*,4080*,4082*,4084-4085*,4087*
Property changes on: branches/openutils-bshd5-backport/pom.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/openutils-bshd5/pom.xml:4045-4047,4059,4069-4070,4073,4075-4078,4080,4082,4084-4085
+ /trunk/openutils-bshd5/pom.xml:4045-4047,4059,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087
Property changes on: branches/openutils-bshd5-backport/src
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082,4084-4085
+ /trunk/openutils-bshd5/src:4045-4047,4057,4069-4070,4073,4075-4078,4080,4082,4084-4085,4087
Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2012-07-02 12:44:01 UTC (rev 4087)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2012-07-02 12:56:22 UTC (rev 4088)
@@ -45,8 +45,6 @@
import org.hibernate.criterion.Example;
import org.hibernate.criterion.Example.PropertySelector;
import org.hibernate.criterion.MatchMode;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.engine.SessionImplementor;
import org.hibernate.metadata.ClassMetadata;
import org.hibernate.type.Type;
@@ -265,7 +263,7 @@
}
ClassMetadata classMetadata = sessionFactory.getClassMetadata(Hibernate.getClass(entity));
- addIdentifierRestriction(crit, entity, classMetadata); // BSHD-11
+ ExampleTreeUtils.addIdentifierRestriction(crit, entity, classMetadata, sessionFactory.getCurrentSession()); // BSHD-11
Type[] types = classMetadata.getPropertyTypes();
String[] names = classMetadata.getPropertyNames();
@@ -300,26 +298,6 @@
}
}
- /*
- * BSHD-11
- */
- private void addIdentifierRestriction(Criteria crit, Object entity, ClassMetadata classMetadata)
- {
- String identifierName = classMetadata.getIdentifierPropertyName();
- if (identifierName != null)
- {
- // TODO is this cast really necessary? Will it fail in future hibernate versions?
- SessionImplementor si = (SessionImplementor) sessionFactory.getCurrentSession();
-
- // Object idValue = classMetadata.getIdentifier(entity, si);
- Object idValue = classMetadata.getIdentifier(entity, entityMode);
- if (idValue != null) // TODO should we use property selectors instead?
- {
- crit.add(Restrictions.idEq(idValue));
- }
- }
- }
-
private Example example(Object entity, String associationPath)
{
Example ex = Example.create(entity);
@@ -417,4 +395,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java 2012-07-02 12:44:01 UTC (rev 4087)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java 2012-07-02 12:56:22 UTC (rev 4088)
@@ -30,6 +30,11 @@
import java.util.Collection;
import org.apache.commons.lang3.StringUtils;
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.engine.SessionImplementor;
+import org.hibernate.metadata.ClassMetadata;
/**
@@ -144,4 +149,29 @@
return propertyNames.length > 0 ? StringUtils.join(propertyNames, '.') : StringUtils.EMPTY;
}
+ /**
+ * adds the identifier restriction to the input criteria, if required
+ * @param crit the criteria
+ * @param entity the entity to use as example
+ * @param classMetadata the class metadata to use
+ * @param ses the current session
+ * @see BSHD-11
+ */
+ public static void addIdentifierRestriction(Criteria crit, Object entity, ClassMetadata classMetadata, Session ses)
+ {
+ String identifierName = classMetadata.getIdentifierPropertyName();
+ if (identifierName != null)
+ {
+ // TODO is this cast really necessary? Will it fail in future hibernate versions?
+ SessionImplementor si = (SessionImplementor) ses;
+
+ // Object idValue = classMetadata.getIdentifier(entity, si);
+ Object idValue = classMetadata.getIdentifier(entity, ses.getEntityMode());
+ if (idValue != null) // TODO should we use property selectors instead?
+ {
+ crit.add(Restrictions.idEq(idValue));
+ }
+ }
+ }
+
}
Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2012-07-02 12:44:01 UTC (rev 4087)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2012-07-02 12:56:22 UTC (rev 4088)
@@ -116,6 +116,9 @@
Map<String, FilterMetadata> currFilterMetadata = getFilterMetadata(path);
crit.add(example(entity, currFilterMetadata.keySet()));
ClassMetadata classMetadata = sessionFactory.getClassMetadata(Hibernate.getClass(entity));
+
+ ExampleTreeUtils.addIdentifierRestriction(crit, entity, classMetadata, sessionFactory.getCurrentSession()); // BSHD-11
+
Type[] types = classMetadata.getPropertyTypes();
String[] names = classMetadata.getPropertyNames();
for (int i = 0; i < types.length; i++)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2012-07-02 12:44:10
|
Revision: 4087
http://openutils.svn.sourceforge.net/openutils/?rev=4087&view=rev
Author: gcatania
Date: 2012-07-02 12:44:01 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
BSHD-11 also fixed in FilterMetadataSupport
Modified Paths:
--------------
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java
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 2012-06-29 16:59:49 UTC (rev 4086)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTree.java 2012-07-02 12:44:01 UTC (rev 4087)
@@ -45,8 +45,6 @@
import org.hibernate.criterion.Example;
import org.hibernate.criterion.Example.PropertySelector;
import org.hibernate.criterion.MatchMode;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.engine.SessionImplementor;
import org.hibernate.metadata.ClassMetadata;
import org.hibernate.type.Type;
@@ -265,7 +263,7 @@
}
ClassMetadata classMetadata = sessionFactory.getClassMetadata(Hibernate.getClass(entity));
- addIdentifierRestriction(crit, entity, classMetadata); // BSHD-11
+ ExampleTreeUtils.addIdentifierRestriction(crit, entity, classMetadata, sessionFactory.getCurrentSession()); // BSHD-11
Type[] types = classMetadata.getPropertyTypes();
String[] names = classMetadata.getPropertyNames();
@@ -300,25 +298,6 @@
}
}
- /*
- * BSHD-11
- */
- private void addIdentifierRestriction(Criteria crit, Object entity, ClassMetadata classMetadata)
- {
- String identifierName = classMetadata.getIdentifierPropertyName();
- if (identifierName != null)
- {
- // TODO is this cast really necessary? Will it fail in future hibernate versions?
- SessionImplementor si = (SessionImplementor) sessionFactory.getCurrentSession();
-
- Object idValue = classMetadata.getIdentifier(entity, si);
- if (idValue != null) // TODO should we use property selectors instead?
- {
- crit.add(Restrictions.idEq(idValue));
- }
- }
- }
-
private Example example(Object entity, String associationPath)
{
Example ex = Example.create(entity);
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java 2012-06-29 16:59:49 UTC (rev 4086)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/ExampleTreeUtils.java 2012-07-02 12:44:01 UTC (rev 4087)
@@ -30,6 +30,11 @@
import java.util.Collection;
import org.apache.commons.lang3.StringUtils;
+import org.hibernate.Criteria;
+import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.engine.SessionImplementor;
+import org.hibernate.metadata.ClassMetadata;
/**
@@ -144,4 +149,28 @@
return propertyNames.length > 0 ? StringUtils.join(propertyNames, '.') : StringUtils.EMPTY;
}
+ /**
+ * adds the identifier restriction to the input criteria, if required
+ * @param crit the criteria
+ * @param entity the entity to use as example
+ * @param classMetadata the class metadata to use
+ * @param ses the current session
+ * @see BSHD-11
+ */
+ public static void addIdentifierRestriction(Criteria crit, Object entity, ClassMetadata classMetadata, Session ses)
+ {
+ String identifierName = classMetadata.getIdentifierPropertyName();
+ if (identifierName != null)
+ {
+ // TODO is this cast really necessary? Will it fail in future hibernate versions?
+ SessionImplementor si = (SessionImplementor) ses;
+
+ Object idValue = classMetadata.getIdentifier(entity, si);
+ if (idValue != null) // TODO should we use property selectors instead?
+ {
+ crit.add(Restrictions.idEq(idValue));
+ }
+ }
+ }
+
}
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 2012-06-29 16:59:49 UTC (rev 4086)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/FilterMetadataSupport.java 2012-07-02 12:44:01 UTC (rev 4087)
@@ -116,6 +116,9 @@
Map<String, FilterMetadata> currFilterMetadata = getFilterMetadata(path);
crit.add(example(entity, currFilterMetadata.keySet()));
ClassMetadata classMetadata = sessionFactory.getClassMetadata(Hibernate.getClass(entity));
+
+ ExampleTreeUtils.addIdentifierRestriction(crit, entity, classMetadata, sessionFactory.getCurrentSession()); // BSHD-11
+
Type[] types = classMetadata.getPropertyTypes();
String[] names = classMetadata.getPropertyNames();
for (int i = 0; i < types.length; i++)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2012-06-29 17:04:13
|
See <https://hudson.openmindonline.it/job/openutils-bshd5/69/changes> |
