Menu
▾
▴
openutils-svn — developer list with svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
| 2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
| 2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
| 2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
| 2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
| 2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
| 2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <mol...@us...> - 2009-09-09 09:15:35
|
Revision: 1452
http://openutils.svn.sourceforge.net/openutils/?rev=1452&view=rev
Author: molaschi
Date: 2009-09-09 09:15:27 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmedia-4.0-b8
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-09-09 08:54:40 UTC (rev 1451)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-09-09 09:15:27 UTC (rev 1452)
@@ -10,7 +10,7 @@
<name>Magnolia SimpleMedia Module</name>
<description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
several features.</description>
- <version>4.0-b8-SNAPSHOT</version>
+ <version>4.0-b8</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -151,4 +151,10 @@
</exclusions>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b8</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b8</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.0-b8</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-09 08:54:48
|
Revision: 1451
http://openutils.svn.sourceforge.net/openutils/?rev=1451&view=rev
Author: molaschi
Date: 2009-09-09 08:54:40 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
fix i18n on selectMedia control
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-09-09 08:53:35 UTC (rev 1450)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-09-09 08:54:40 UTC (rev 1451)
@@ -35,6 +35,8 @@
import info.magnolia.cms.core.SystemProperty;
import info.magnolia.cms.gui.control.ControlImpl;
import info.magnolia.cms.gui.control.FreemarkerControl;
+import info.magnolia.cms.i18n.Messages;
+import info.magnolia.cms.i18n.MessagesUtil;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
@@ -214,6 +216,15 @@
/**
* {@inheritDoc}
*/
+ @Override
+ protected Messages getMessages()
+ {
+ return MessagesUtil.chain("net.sourceforge.openutils.mgnlmedia.media.lang", super.getMessages());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
protected String getPath()
{
return "dialog/selectMedia.ftl";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-09 08:53:41
|
Revision: 1450
http://openutils.svn.sourceforge.net/openutils/?rev=1450&view=rev
Author: molaschi
Date: 2009-09-09 08:53:35 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-09-09 08:53:27 UTC (rev 1449)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-09-09 08:53:35 UTC (rev 1450)
@@ -10,7 +10,7 @@
<name>Magnolia SimpleMedia Module</name>
<description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
several features.</description>
- <version>4.0-b7</version>
+ <version>4.0-b8-SNAPSHOT</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -151,10 +151,4 @@
</exclusions>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b7</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b7</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.0-b7</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-09 08:53:34
|
Revision: 1449
http://openutils.svn.sourceforge.net/openutils/?rev=1449&view=rev
Author: molaschi
Date: 2009-09-09 08:53:27 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmedia-4.0-b7
Modified Paths:
--------------
tags/openutils-mgnlmedia-4.0-b7/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
Added Paths:
-----------
tags/openutils-mgnlmedia-4.0-b7/
Property changes on: tags/openutils-mgnlmedia-4.0-b7
___________________________________________________________________
Added: svn:ignore
+ .settings
.checkstyle
.classpath
.project
target
test-output
temp-testng-customsuite.xml
Added: svnmerge-integrated
+ /branches/openutils-mgnlmedia-3.6.x:1-982,1004
Added: svn:mergeinfo
+ /branches/openutils-mgnlmedia-3.6.x:1004
Modified: tags/openutils-mgnlmedia-4.0-b7/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-09-09 08:33:36 UTC (rev 1448)
+++ tags/openutils-mgnlmedia-4.0-b7/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-09-09 08:53:27 UTC (rev 1449)
@@ -35,6 +35,8 @@
import info.magnolia.cms.core.SystemProperty;
import info.magnolia.cms.gui.control.ControlImpl;
import info.magnolia.cms.gui.control.FreemarkerControl;
+import info.magnolia.cms.i18n.Messages;
+import info.magnolia.cms.i18n.MessagesUtil;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
@@ -214,6 +216,15 @@
/**
* {@inheritDoc}
*/
+ @Override
+ protected Messages getMessages()
+ {
+ return MessagesUtil.chain("net.sourceforge.openutils.mgnlmedia.media.lang", super.getMessages());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
protected String getPath()
{
return "dialog/selectMedia.ftl";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-09 08:33:43
|
Revision: 1448
http://openutils.svn.sourceforge.net/openutils/?rev=1448&view=rev
Author: molaschi
Date: 2009-09-09 08:33:36 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmedia-4.0-b7
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-09-09 08:32:22 UTC (rev 1447)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-09-09 08:33:36 UTC (rev 1448)
@@ -10,7 +10,7 @@
<name>Magnolia SimpleMedia Module</name>
<description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
several features.</description>
- <version>4.0-b7-SNAPSHOT</version>
+ <version>4.0-b7</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -151,4 +151,10 @@
</exclusions>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b7</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b7</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.0-b7</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-09 08:32:30
|
Revision: 1447
http://openutils.svn.sourceforge.net/openutils/?rev=1447&view=rev
Author: molaschi
Date: 2009-09-09 08:32:22 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
license
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BlackAndWhitePostProcessor.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BlackAndWhitePostProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BlackAndWhitePostProcessor.java 2009-09-09 08:28:00 UTC (rev 1446)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BlackAndWhitePostProcessor.java 2009-09-09 08:32:22 UTC (rev 1447)
@@ -1,3 +1,28 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
+ * Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
+ * several features.
+ * Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl-2.1.html
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
package net.sourceforge.openutils.mgnlmedia.media.processors;
import java.awt.Graphics;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-09 08:28:21
|
Revision: 1446
http://openutils.svn.sourceforge.net/openutils/?rev=1446&view=rev
Author: molaschi
Date: 2009-09-09 08:28:00 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
grayscale image post processor
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BlackAndWhitePostProcessor.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.bw.xml
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BlackAndWhitePostProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BlackAndWhitePostProcessor.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/BlackAndWhitePostProcessor.java 2009-09-09 08:28:00 UTC (rev 1446)
@@ -0,0 +1,31 @@
+package net.sourceforge.openutils.mgnlmedia.media.processors;
+
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+import java.util.Map;
+
+
+/**
+ * @author molaschi
+ * @version $Id: $
+ */
+public class BlackAndWhitePostProcessor implements ImagePostProcessor
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ public BufferedImage processImage(BufferedImage image, int x, int y, Map<String, String> parameters)
+ {
+ if (parameters.get("bw") != null)
+ {
+ BufferedImage bwImage = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_BYTE_GRAY);
+ Graphics g = bwImage.getGraphics();
+ g.drawImage(image, 0, 0, null);
+ g.dispose();
+ return bwImage;
+ }
+ return image;
+ }
+
+}
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.bw.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.bw.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.processors.image-post.bw.xml 2009-09-09 08:28:00 UTC (rev 1446)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="bw" xmlns:x2="http://schemas.microsoft.com/office/excel/2003/xml"
+ xmlns:fn_old="http://www.w3.org/2004/10/xpath-functions"
+ xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word"
+ xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:html="http://www.w3.org/TR/REC-html40"
+ xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:v="urn:schemas-microsoft-com:vml"
+ xmlns:mgnl="http://www.magnolia.info/jcr/mgnl" xmlns:jcrfn="http://www.jcp.org/jcr/xpath-functions/1.0"
+ xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:rep="internal" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:stringutils="xalan://org.apache.commons.lang.StringUtils"
+ xmlns:_pre="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:jcrutils="xalan://it.openmindonline.urmetdomus.assembler.utils.Path"
+ xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:sv="http://www.jcp.org/jcr/sv/1.0"
+ xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+ xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint"
+ xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" 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:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>fc5d140b-2123-4ebc-b30b-5d4176e9424b</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.processors.BlackAndWhitePostProcessor</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="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</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>2009-09-03T18:28:30.446+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-09-09T10:15:47.224+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-09 08:05:22
|
Revision: 1445
http://openutils.svn.sourceforge.net/openutils/?rev=1445&view=rev
Author: molaschi
Date: 2009-09-09 08:05:12 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
remove license from ftl
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-09-09 08:01:47 UTC (rev 1444)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-09-09 08:05:12 UTC (rev 1445)
@@ -71,6 +71,7 @@
<exclude>target/**</exclude>
<exclude>src/site/**</exclude>
<exclude>src/main/bundle/**</exclude>
+ <exclude>src/main/resources/**/*.ftl</exclude>
<exclude>src/main/assembly/**</exclude>
<exclude>src/main/resources/mgnl-bootstrap/**</exclude>
<exclude>src/main/resources/mgnl-nodetypes/**</exclude>
Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2009-09-09 08:01:47 UTC (rev 1444)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2009-09-09 08:05:12 UTC (rev 1445)
@@ -1,30 +1,3 @@
-<#--
-
-
- Magnolia SimpleMedia Module (http://lab.openmindonline.it/lab/products/media.html)
- Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management of images and videos with
- several features.
- Copyright (C)2008 - 2009, Openmind S.r.l. http://www.openmindonline.it
-
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- You may obtain a copy of the License at
-
- http://www.gnu.org/licenses/lgpl-2.1.html
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
--->
[#if !reqGet(request, "js_media_included")?exists]
<script type="text/javascript">
function selectMedia(name, value, mediaType) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 1444
http://openutils.svn.sourceforge.net/openutils/?rev=1444&view=rev
Author: molaschi
Date: 2009-09-09 08:01:47 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
no bands
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInImageResolutionProcessor.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInImageResolutionProcessor.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInImageResolutionProcessor.java 2009-09-08 14:04:14 UTC (rev 1443)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/processors/FitInImageResolutionProcessor.java 2009-09-09 08:01:47 UTC (rev 1444)
@@ -42,7 +42,7 @@
*/
public BufferedImage getImageForResolution(BufferedImage original, int x, int y, Map<String, String> parameters)
{
- return fitIn(original, x, y, null);
+ return fitIn(original, x, y);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-09-08 14:04:20
|
Revision: 1443
http://openutils.svn.sourceforge.net/openutils/?rev=1443&view=rev
Author: fgiust
Date: 2009-09-08 14:04:14 +0000 (Tue, 08 Sep 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlmessages/pom.xml
Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2009-09-08 14:04:07 UTC (rev 1442)
+++ trunk/openutils-mgnlmessages/pom.xml 2009-09-08 14:04:14 UTC (rev 1443)
@@ -9,7 +9,7 @@
<artifactId>openutils-mgnlmessages</artifactId>
<name>Magnolia Messages Module</name>
<description>Manage your translations from the Magnolia admin interface</description>
- <version>4.0.4</version>
+ <version>4.0.5-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -106,10 +106,4 @@
</snapshots>
</repository>
</repositories>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.4</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.4</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmessages-4.0.4</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-09-08 14:04:15
|
Revision: 1442
http://openutils.svn.sourceforge.net/openutils/?rev=1442&view=rev
Author: fgiust
Date: 2009-09-08 14:04:07 +0000 (Tue, 08 Sep 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmessages-4.0.4
Added Paths:
-----------
tags/openutils-mgnlmessages-4.0.4/
tags/openutils-mgnlmessages-4.0.4/pom.xml
Removed Paths:
-------------
tags/openutils-mgnlmessages-4.0.4/pom.xml
Deleted: tags/openutils-mgnlmessages-4.0.4/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2009-09-08 14:02:07 UTC (rev 1440)
+++ tags/openutils-mgnlmessages-4.0.4/pom.xml 2009-09-08 14:04:07 UTC (rev 1442)
@@ -1,109 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-parent</artifactId>
- <version>1.1</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
- <artifactId>openutils-mgnlmessages</artifactId>
- <name>Magnolia Messages Module</name>
- <description>Manage your translations from the Magnolia admin interface</description>
- <version>4.0.4-SNAPSHOT</version>
- <licenses>
- <license>
- <name>GPLv3</name>
- <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
- </license>
- </licenses>
- <url>http://lab.openmindonline.it/lab/products/groovy.html</url>
- <issueManagement>
- <system>jira</system>
- <url>http://lab.openmindonline.it/jira/browse/GROOVY</url>
- </issueManagement>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>META-INF/magnolia/*</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>${basedir}/src/main/assembly/assembly-bundle.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-core</artifactId>
- <version>4.1</version>
- </dependency>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-admininterface</artifactId>
- <version>4.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
- <version>4.0.2</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlext</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <repositories>
- <repository>
- <id>repository.magnolia.info</id>
- <name>magnolia repository</name>
- <url>http://repository.magnolia-cms.com/m2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-</project>
\ No newline at end of file
Copied: tags/openutils-mgnlmessages-4.0.4/pom.xml (from rev 1441, trunk/openutils-mgnlmessages/pom.xml)
===================================================================
--- tags/openutils-mgnlmessages-4.0.4/pom.xml (rev 0)
+++ tags/openutils-mgnlmessages-4.0.4/pom.xml 2009-09-08 14:04:07 UTC (rev 1442)
@@ -0,0 +1,115 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-parent</artifactId>
+ <version>1.1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+ <artifactId>openutils-mgnlmessages</artifactId>
+ <name>Magnolia Messages Module</name>
+ <description>Manage your translations from the Magnolia admin interface</description>
+ <version>4.0.4</version>
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
+ </license>
+ </licenses>
+ <url>http://lab.openmindonline.it/lab/products/groovy.html</url>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://lab.openmindonline.it/jira/browse/GROOVY</url>
+ </issueManagement>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>META-INF/magnolia/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/assembly-bundle.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-core</artifactId>
+ <version>4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-admininterface</artifactId>
+ <version>4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlext</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <version>5.1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>repository.magnolia.info</id>
+ <name>magnolia repository</name>
+ <url>http://repository.magnolia-cms.com/m2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.4</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.4</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmessages-4.0.4</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-09-08 14:04:04
|
Revision: 1441
http://openutils.svn.sourceforge.net/openutils/?rev=1441&view=rev
Author: fgiust
Date: 2009-09-08 14:03:51 +0000 (Tue, 08 Sep 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmessages-4.0.4
Modified Paths:
--------------
trunk/openutils-mgnlmessages/pom.xml
Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2009-09-08 14:02:07 UTC (rev 1440)
+++ trunk/openutils-mgnlmessages/pom.xml 2009-09-08 14:03:51 UTC (rev 1441)
@@ -9,7 +9,7 @@
<artifactId>openutils-mgnlmessages</artifactId>
<name>Magnolia Messages Module</name>
<description>Manage your translations from the Magnolia admin interface</description>
- <version>4.0.4-SNAPSHOT</version>
+ <version>4.0.4</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -106,4 +106,10 @@
</snapshots>
</repository>
</repositories>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.4</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.4</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmessages-4.0.4</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-09-08 14:02:18
|
Revision: 1440
http://openutils.svn.sourceforge.net/openutils/?rev=1440&view=rev
Author: fgiust
Date: 2009-09-08 14:02:07 +0000 (Tue, 08 Sep 2009)
Log Message:
-----------
MESSAGES-1 fixed package
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
Modified: trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml 2009-09-07 10:54:21 UTC (rev 1439)
+++ trunk/openutils-mgnlmessages/src/main/resources/META-INF/magnolia/messages.xml 2009-09-08 14:02:07 UTC (rev 1440)
@@ -10,7 +10,7 @@
<properties>
<property>
<name>info.magnolia.cms.i18n.MessagesManager</name>
- <value>info.magnolia.cms.i18n.OpenutilsMgnlMessagesManager</value>
+ <value>net.sourceforge.openutils.mgnlmessages.i18n.OpenutilsMgnlMessagesManager</value>
</property>
</properties>
<dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-07 10:54:34
|
Revision: 1439
http://openutils.svn.sourceforge.net/openutils/?rev=1439&view=rev
Author: molaschi
Date: 2009-09-07 10:54:21 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
tld doc
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2009-09-07 09:38:00 UTC (rev 1438)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2009-09-07 10:54:21 UTC (rev 1439)
@@ -111,7 +111,7 @@
<li><b>fit:</b>makes the new image to fit into required res</li>
<li><b>nocrop:</b>makes the new image to contain the required res</li>
<li><b>crop:</b>makes the new image to contain the required res and the crop the simmetric bands that outfit res</li>
- <li><b>fitbands:</b>makes the new image to fit into required res and fills empty areas with background color you pass to in &aquote;parameter&aquote; attribute as hex value of &aquote;background&aquote; parameter (i.e. paramters='background=FF67A5&apos)</li>
+ <li><b>fitbands:</b>makes the new image to fit into required res and fills empty areas with background color you pass to in "parameter" attribute as hex value of "background" parameter (i.e. paramters='background=FF67A5&apos)</li>
</td>
</tr>
<tr>
@@ -315,9 +315,9 @@
<ul>
<li>
<b>o</b>:
- makes the new image to fit into required res and fills empty areas with background color you pass to in &aquote;parameter&aquote;
- attribute as hex value of &aquote;background&aquote;
- parameter (i.e. paramters='background=FF67A5&apos)
+ makes the new image to fit into required res and fills empty areas with background color you pass to in "parameter"
+ attribute as hex value of "background"
+ parameter (i.e. paramters='background=FF67A5')
</li>
<li>
<b>l</b>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2009-09-07 09:38:07
|
Revision: 1438
http://openutils.svn.sourceforge.net/openutils/?rev=1438&view=rev
Author: gcatania
Date: 2009-09-07 09:38:00 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
BSHD-4 - fixed
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 2009-09-07 09:37:23 UTC (rev 1437)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2009-09-07 09:38:00 UTC (rev 1438)
@@ -122,7 +122,7 @@
*/
public List<T> find(String query, Object obj, Type type)
{
- return find(query, new Object[]{obj }, new Type[]{type });
+ return getThis().find(query, new Object[]{obj }, new Type[]{type });
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2009-09-07 09:37:30
|
Revision: 1437
http://openutils.svn.sourceforge.net/openutils/?rev=1437&view=rev
Author: gcatania
Date: 2009-09-07 09:37:23 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
BSHD-3 - minor improvements to code readability
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 2009-09-07 08:27:54 UTC (rev 1436)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2009-09-07 09:37:23 UTC (rev 1437)
@@ -49,17 +49,14 @@
*/
public HibernateDAOImpl()
{
- super();
}
/**
* Sets the class of the persistent bean managed by this DAO
* @param referenceClass the class for the bean managed by this DAO
*/
- @SuppressWarnings({"unchecked" })
- public HibernateDAOImpl(final Class referenceClass)
+ public HibernateDAOImpl(Class<T> referenceClass)
{
- super();
this.referenceClass = referenceClass;
}
@@ -67,7 +64,7 @@
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public List<T> find(final String query)
+ public List<T> find(String query)
{
return getHibernateTemplate().find(query);
}
@@ -83,7 +80,7 @@
/**
* {@inheritDoc}
*/
- public List<T> findAll(final Order[] orderProperties)
+ public List<T> findAll(Order[] orderProperties)
{
return getThis().findAll(orderProperties, Collections.<Criterion> emptyList());
}
@@ -123,7 +120,7 @@
/**
* {@inheritDoc}
*/
- public List<T> find(final String query, final Object obj, final Type type)
+ public List<T> find(String query, Object obj, Type type)
{
return find(query, new Object[]{obj }, new Type[]{type });
}
@@ -148,9 +145,9 @@
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
- public T load(final K key)
+ public T load(K key)
{
+ @SuppressWarnings("unchecked")
T result = (T) getHibernateTemplate().load(getReferenceClass(), key);
Hibernate.initialize(result);
return result;
@@ -159,31 +156,30 @@
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
- public T loadIfAvailable(final K key)
+ public T loadIfAvailable(K key)
{
- T result;
try
{
- result = (T) getHibernateTemplate().get(getReferenceClass(), key);
+ @SuppressWarnings("unchecked")
+ T result = (T) getHibernateTemplate().get(getReferenceClass(), key);
if (result != null)
{
Hibernate.initialize(result);
+ return result;
}
}
catch (ObjectNotFoundException e)
{
- // during lazy initialization
- return null;
+ // thrown by HibernateTemplate#get() if the object does not exist
}
- return result;
+ return null;
}
/**
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public T get(final K key)
+ public T get(K key)
{
return (T) getHibernateTemplate().get(getReferenceClass(), key);
}
@@ -191,7 +187,7 @@
/**
* {@inheritDoc}
*/
- public void saveOrUpdate(final T obj)
+ public void saveOrUpdate(T obj)
{
getHibernateTemplate().saveOrUpdate(obj);
}
@@ -199,7 +195,7 @@
/**
* {@inheritDoc}
*/
- public void update(final T obj)
+ public void update(T obj)
{
getHibernateTemplate().update(obj);
}
@@ -225,7 +221,7 @@
/**
* {@inheritDoc}
*/
- public void refresh(final T obj)
+ public void refresh(T obj)
{
getHibernateTemplate().refresh(obj);
}
@@ -233,7 +229,7 @@
/**
* {@inheritDoc}
*/
- public void evict(final T obj)
+ public void evict(T obj)
{
getHibernateTemplate().evict(obj);
}
@@ -259,7 +255,7 @@
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public K save(final T obj)
+ public K save(T obj)
{
return (K) getHibernateTemplate().save(obj);
}
@@ -267,7 +263,7 @@
/**
* {@inheritDoc}
*/
- public T findFilteredFirst(final T filter)
+ public T findFilteredFirst(T filter)
{
return getFirstInCollection(findFiltered(filter, 1, 0));
}
@@ -275,7 +271,7 @@
/**
* {@inheritDoc}
*/
- public T findFilteredFirst(final T filter, final Order[] order)
+ public T findFilteredFirst(T filter, final Order[] order)
{
return getFirstInCollection(findFiltered(filter, order, getDefaultFilterMetadata(), 1, 0));
}
@@ -283,15 +279,15 @@
/**
* {@inheritDoc}
*/
- public T findFilteredFirst(final T filter, final List< ? extends Criterion> criteria)
+ public T findFilteredFirst(T filter, List< ? extends Criterion> criteria)
{
- return getFirstInCollection(findFiltered(filter, null, getDefaultFilterMetadata(), 1, 0, criteria));
+ return getFirstInCollection(findFiltered(filter, getDefaultOrder(), getDefaultFilterMetadata(), 1, 0, criteria));
}
/**
* {@inheritDoc}
*/
- public List<T> findFiltered(final T filter)
+ public List<T> findFiltered(T filter)
{
return findFiltered(filter, getDefaultFilterMetadata());
}
@@ -299,7 +295,7 @@
/**
* {@inheritDoc}
*/
- public List<T> findFiltered(final T filter, final Order[] orderProperties)
+ public List<T> findFiltered(T filter, Order[] orderProperties)
{
return findFiltered(filter, orderProperties, getDefaultFilterMetadata(), Integer.MAX_VALUE, 0);
}
@@ -307,7 +303,7 @@
/**
* {@inheritDoc}
*/
- public List<T> findFiltered(final T filter, final Map<String, ? extends FilterMetadata> metadata)
+ public List<T> findFiltered(T filter, Map<String, ? extends FilterMetadata> metadata)
{
return findFiltered(filter, metadata, Integer.MAX_VALUE, 0);
}
@@ -315,7 +311,7 @@
/**
* {@inheritDoc}
*/
- public List<T> findFiltered(final T filter, final int maxResults, final int page)
+ public List<T> findFiltered(T filter, int maxResults, int page)
{
return findFiltered(filter, getDefaultFilterMetadata(), maxResults, page);
}
@@ -323,17 +319,16 @@
/**
* {@inheritDoc}
*/
- public List<T> findFiltered(final T filter, final Map<String, ? extends FilterMetadata> metadata,
- final int maxResults, final int page)
+ public List<T> findFiltered(T filter, Map<String, ? extends FilterMetadata> metadata, int maxResults, int page)
{
- return findFiltered(filter, null, metadata, maxResults, page);
+ return findFiltered(filter, getDefaultOrder(), metadata, maxResults, page);
}
/**
* {@inheritDoc}
*/
- public List<T> findFiltered(final T filter, final Order[] customOrder,
- final Map<String, ? extends FilterMetadata> metadata, final int maxResults, final int page)
+ public List<T> findFiltered(T filter, Order[] customOrder, Map<String, ? extends FilterMetadata> metadata,
+ int maxResults, int page)
{
return getThis().findFiltered(
filter,
@@ -348,41 +343,34 @@
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public List<T> findFiltered(final T filter, final Order[] customOrder,
- final Map<String, ? extends FilterMetadata> metadata, final int maxResults, final int page,
- final List< ? extends Criterion> additionalCriteria)
+ public List<T> findFiltered(T filter, Order[] customOrder, Map<String, ? extends FilterMetadata> metadata,
+ int maxResults, int page, List< ? extends Criterion> additionalCriteria)
{
- final Order[] orderProperties = customOrder != null && customOrder.length > 0 ? customOrder : this
- .getDefaultOrder();
-
return (List<T>) getHibernateTemplate().execute(
new HibernateCallbackForExecution(
filter,
page,
maxResults,
metadata,
- orderProperties,
+ customOrder,
additionalCriteria,
- null));
+ Collections.<String> emptyList()));
}
/**
* {@inheritDoc}
*/
- public List< ? > findFilteredProperties(final T filter, final Order[] customOrder,
- final Map<String, ? extends FilterMetadata> metadata, final int maxResults, final int page,
- final List< ? extends Criterion> additionalCriteria, final List<String> properties)
+ public List< ? > findFilteredProperties(T filter, Order[] customOrder,
+ Map<String, ? extends FilterMetadata> metadata, int maxResults, int page,
+ List< ? extends Criterion> additionalCriteria, List<String> properties)
{
- final Order[] orderProperties = customOrder != null && customOrder.length > 0 ? customOrder : this
- .getDefaultOrder();
-
return (List< ? >) getHibernateTemplate().execute(
new HibernateCallbackForExecution(
filter,
page,
maxResults,
metadata,
- orderProperties,
+ customOrder,
additionalCriteria,
properties));
}
@@ -396,7 +384,7 @@
return referenceClass;
}
- public void setReferenceClass(final Class<T> referenceClass)
+ public void setReferenceClass(Class<T> referenceClass)
{
this.referenceClass = referenceClass;
}
@@ -482,7 +470,7 @@
* @deprecated use the better named <code>findByNamedQuery</code> method
*/
@Deprecated
- protected List< ? > getNamedQuery(final String name, final Serializable[] params, final int maxResults)
+ protected List< ? > getNamedQuery(String name, Serializable[] params, int maxResults)
{
return findByNamedQuery(name, params, maxResults > 0 ? maxResults : Integer.MAX_VALUE);
}
@@ -496,7 +484,7 @@
* @deprecated use the better named <code>findByNamedQuery</code> method
*/
@Deprecated
- protected List< ? > getNamedQuery(final String name, final Map<String, ? > params, final int maxResults)
+ protected List< ? > getNamedQuery(String name, Map<String, ? > params, int maxResults)
{
return findByNamedQuery(name, params, maxResults > 0 ? maxResults : Integer.MAX_VALUE);
}
@@ -508,7 +496,7 @@
* @param key the key name
* @param value the object to set as the parameter
*/
- protected void setParameterValue(final Query query, final String key, final Object value)
+ protected void setParameterValue(Query query, String key, Object value)
{
if (null == key || null == value)
{
@@ -532,7 +520,7 @@
* @param list collection
* @return first element in the list
*/
- private T getFirstInCollection(final Collection< ? extends T> list)
+ private T getFirstInCollection(Collection< ? extends T> list)
{
if (list != null && !list.isEmpty())
{
@@ -547,7 +535,7 @@
* Sets the aopenabled.
* @param aopenabled the aopenabled to set
*/
- public void setAopenabled(final boolean aopenabled)
+ public void setAopenabled(boolean aopenabled)
{
this.aopenabled = aopenabled;
}
@@ -584,56 +572,31 @@
* @author carone
* @version $Id$
*/
- private final class HibernateCallbackForExecution implements HibernateCallback
+ private class HibernateCallbackForExecution implements HibernateCallback
{
- /**
- *
- */
- private final T filter;
+ private T filter;
- /**
- *
- */
- private final int page;
+ private int page;
- /**
- *
- */
- private final int maxResults;
+ private int maxResults;
- /**
- *
- */
- private final Map<String, ? extends FilterMetadata> metadata;
+ private Map<String, ? extends FilterMetadata> metadata;
- /**
- *
- */
- private final List<String> properties;
+ private List<String> properties;
- /**
- *
- */
- private final Order[] orderProperties;
+ private Order[] orderProperties;
private List< ? extends Criterion> additionalCriteria;
- /**
- * @param filter
- * @param page
- * @param maxResults
- * @param metadata
- * @param orderProperties
- */
private HibernateCallbackForExecution(
- final T filter,
- final int page,
- final int maxResults,
- final Map<String, ? extends FilterMetadata> metadata,
- final Order[] orderProperties,
- final List< ? extends Criterion> additionalCriteria,
- final List<String> properties)
+ T filter,
+ int page,
+ int maxResults,
+ Map<String, ? extends FilterMetadata> metadata,
+ Order[] orderProperties,
+ List< ? extends Criterion> additionalCriteria,
+ List<String> properties)
{
this.filter = filter;
this.page = page;
@@ -644,14 +607,14 @@
this.properties = properties;
}
- public Object doInHibernate(final Session ses) throws HibernateException
+ public Object doInHibernate(Session ses) throws HibernateException
{
Criteria crit = ses.createCriteria(filter.getClass());
crit.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
crit.setMaxResults(maxResults);
crit.setFirstResult(maxResults * page);
- if (orderProperties != null && orderProperties.length > 0)
+ if (orderProperties != null)
{
for (Order order : orderProperties)
{
@@ -662,7 +625,7 @@
}
}
EnhancedExample.create(crit, filter, metadata);
- if (additionalCriteria != null && !additionalCriteria.isEmpty())
+ if (additionalCriteria != null)
{
for (Criterion criterion : additionalCriteria)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2009-09-07 08:28:04
|
Revision: 1436
http://openutils.svn.sourceforge.net/openutils/?rev=1436&view=rev
Author: gcatania
Date: 2009-09-07 08:27:54 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
BSHD-3 - typos
Modified Paths:
--------------
trunk/openutils-bshd5/src/site/apt/configuration.apt
trunk/openutils-bshd5/src/site/apt/index.apt
Modified: trunk/openutils-bshd5/src/site/apt/configuration.apt
===================================================================
--- trunk/openutils-bshd5/src/site/apt/configuration.apt 2009-09-07 08:18:17 UTC (rev 1435)
+++ trunk/openutils-bshd5/src/site/apt/configuration.apt 2009-09-07 08:27:54 UTC (rev 1436)
@@ -30,11 +30,11 @@
Simple, isn't it? With those few lines you are:
- * Creating youd DAO interface, which allow you to manage <<<Sample>>> objects with a key of type <<<Integer>>>
+ * Creating youd DAO interface, which allows you to manage <<<Sample>>> objects with a key of type <<<Integer>>>
- * Implementing your interface and setup your DAO
+ * Implementing your interface and setting up your DAO
- * Registing you DAO in the Spring context using the <<<@Repository>>> annotation
+ * Registering you DAO in the Spring context using the <<<@Repository>>> annotation
[]
Modified: trunk/openutils-bshd5/src/site/apt/index.apt
===================================================================
--- trunk/openutils-bshd5/src/site/apt/index.apt 2009-09-07 08:18:17 UTC (rev 1435)
+++ trunk/openutils-bshd5/src/site/apt/index.apt 2009-09-07 08:27:54 UTC (rev 1436)
@@ -8,10 +8,10 @@
bshd5 means "base spring-hibernate DAO for java 5".
- It provides a base generic DAO class that can be reused and that offer most of the needed methods (load, find, save, etc)
+ It provides a base generic, reusable DAO class that offers most of the commonly used methods (load, find, save, etc)
already implemented.
- The base class also provides an enhanced version of hibernate "find by example" feature allowing associations in examples.
+ The base class also provides an enhanced version of Hibernate's "find by example" feature, allowing associations in examples.
See {{{configuration.html}configuration}} for how to setup your DAOs and look at {{{apidocs/index.html}javadocs}} for
more details.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-07 08:18:26
|
Revision: 1435
http://openutils.svn.sourceforge.net/openutils/?rev=1435&view=rev
Author: molaschi
Date: 2009-09-07 08:18:17 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
tld docs
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2009-09-07 08:09:15 UTC (rev 1434)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld 2009-09-07 08:18:17 UTC (rev 1435)
@@ -107,7 +107,9 @@
false
</td>
<td>
- valid values are <ul><li><b>fit:</b>makes the new image to fit into required res</li><li><b>nocrop:</b>makes the new image to contain the required res</li>
+ valid values are <ul>
+ <li><b>fit:</b>makes the new image to fit into required res</li>
+ <li><b>nocrop:</b>makes the new image to contain the required res</li>
<li><b>crop:</b>makes the new image to contain the required res and the crop the simmetric bands that outfit res</li>
<li><b>fitbands:</b>makes the new image to fit into required res and fills empty areas with background color you pass to in &aquote;parameter&aquote; attribute as hex value of &aquote;background&aquote; parameter (i.e. paramters='background=FF67A5&apos)</li>
</td>
@@ -307,7 +309,30 @@
</function>
<function>
<name>urlres</name>
- <description>Get the url to the resolution for a given media node (image or flv/youtube preview)</description>
+ <description>Get the url to the resolution for a given media node (image or flv/youtube preview)<br />
+ The resolution string has the following pattern [controlChar][width]x[height][;param_key1=param_value1,param_key2=param_value2,...]<br />
+ The controlChar identifies which resize method will be used:
+ <ul>
+ <li>
+ <b>o</b>:
+ makes the new image to fit into required res and fills empty areas with background color you pass to in &aquote;parameter&aquote;
+ attribute as hex value of &aquote;background&aquote;
+ parameter (i.e. paramters='background=FF67A5&apos)
+ </li>
+ <li>
+ <b>l</b>
+ : makes the new image to fit into required res
+ </li>
+ <li>
+ <b>n</b>
+ : makes the new image to contain the required res
+ </li>
+ <li>
+ <b>no control char</b>
+ : makes the new image to contain the required res and the crop the simmetric bands that outfit res
+ </li>
+ </ul>
+ </description>
<function-class>net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl</function-class>
<function-signature>java.lang.String getResolutionUrl(info.magnolia.cms.core.Content, java.lang.String)</function-signature>
<example>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-07 08:09:25
|
Revision: 1434
http://openutils.svn.sourceforge.net/openutils/?rev=1434&view=rev
Author: molaschi
Date: 2009-09-07 08:09:15 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
javadocs
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2009-09-06 19:40:12 UTC (rev 1433)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2009-09-07 08:09:15 UTC (rev 1434)
@@ -39,6 +39,7 @@
/**
+ * Media Type Handler Interface
* @author molaschi
* @version $Id$
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java 2009-09-06 19:40:12 UTC (rev 1433)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java 2009-09-07 08:09:15 UTC (rev 1434)
@@ -29,6 +29,7 @@
/**
+ * Media Type Handler that manages .mp3 files
* @author molaschi
* @version $Id$
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2009-09-06 19:40:12 UTC (rev 1433)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2009-09-07 08:09:15 UTC (rev 1434)
@@ -53,6 +53,7 @@
/**
+ * Base implementation of MediaTypeHandler for common used method
* @author molaschi
* @version $Id$
*/
@@ -99,6 +100,9 @@
return true;
}
+ /**
+ * {@inheritDoc}
+ */
public void saveFromZipFile(Content media, File f, String cleanFileName, String extension)
throws AccessDeniedException, RepositoryException
{
@@ -158,6 +162,11 @@
return true;
}
+ /**
+ * Get the default "original" nodedata
+ * @param media media
+ * @return default nodedata
+ */
protected NodeData getOriginalFileNodeData(Content media)
{
return media.getNodeData(ORGINAL_NODEDATA_NAME);
@@ -217,6 +226,20 @@
return getUrl(media);
}
+ /**
+ * Get the nodedata value for a given name and current locale searching first for [propertyname]-[lang]_[COUNTRY]
+ * then for [propertyname]-[lang] then for [propertyname]-en then for [propertyname].<br />
+ * i.e for the property title and for a locale it,IT:
+ * <ol>
+ * <li>search for nodedata "title-it_IT"</li>
+ * <li>search for nodedata "title-it"</li>
+ * <li>search for nodedata "title-en"</li>
+ * <li>search for nodedata "title"</li>
+ * </ol>
+ * @param media media
+ * @param property base property name
+ * @return
+ */
protected String getPropertyLocalized(Content media, String property)
{
Locale locale = MgnlContext.getLocale();
@@ -232,7 +255,7 @@
{
return NodeDataUtil.getString(media, property + "-" + language);
}
- else if (LANGUAGES.contains(language) && media.hasNodeData(property + "-en"))
+ else if (media.hasNodeData(property + "-en"))
{
return NodeDataUtil.getString(media, property + "-" + language);
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2009-09-06 19:40:12 UTC (rev 1433)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2009-09-07 08:09:15 UTC (rev 1434)
@@ -35,6 +35,7 @@
/**
+ * Media Type Handler that manages images (jpg, png, gif)
* @author molaschi
* @version $Id$
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java 2009-09-06 19:40:12 UTC (rev 1433)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java 2009-09-07 08:09:15 UTC (rev 1434)
@@ -33,6 +33,7 @@
/**
+ * Base class for medias that has a dynamic image as thumbnail
* @author molaschi
* @version $Id: $
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2009-09-06 19:40:12 UTC (rev 1433)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2009-09-07 08:09:15 UTC (rev 1434)
@@ -26,6 +26,7 @@
package net.sourceforge.openutils.mgnlmedia.media.types.impl;
/**
+ * Type handler for flv videos
* @author molaschi
* @version $Id$
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java 2009-09-06 19:40:12 UTC (rev 1433)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java 2009-09-07 08:09:15 UTC (rev 1434)
@@ -44,6 +44,7 @@
/**
+ * Type handler for youtube videos
* @author molaschi
* @version $Id$
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-09-06 19:40:24
|
Revision: 1433
http://openutils.svn.sourceforge.net/openutils/?rev=1433&view=rev
Author: molaschi
Date: 2009-09-06 19:40:12 +0000 (Sun, 06 Sep 2009)
Log Message:
-----------
javadocs
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2009-09-06 07:54:02 UTC (rev 1432)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2009-09-06 19:40:12 UTC (rev 1433)
@@ -46,6 +46,8 @@
/**
+ * {@link FieldSaveHandler} implementation that calls the onSavingPropertyMedia method on the handler of target media
+ * type when a media is associated to a page
* @author molaschi
* @version $Id$
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2009-09-06 07:54:02 UTC (rev 1432)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2009-09-06 19:40:12 UTC (rev 1433)
@@ -27,16 +27,12 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.core.SystemProperty;
import info.magnolia.cms.core.search.Query;
import info.magnolia.cms.core.search.QueryManager;
import info.magnolia.cms.core.search.QueryResult;
import info.magnolia.module.InstallContext;
-import info.magnolia.module.delta.Delta;
-import info.magnolia.module.delta.DeltaBuilder;
import info.magnolia.module.delta.Task;
import info.magnolia.module.delta.TaskExecutionException;
-import info.magnolia.module.model.Version;
import it.openutils.mgnltasks.NodeSortTask;
import it.openutils.mgnltasks.SimpleModuleVersionHandler;
@@ -51,12 +47,12 @@
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.types.impl.BaseTypeHandler;
-import org.apache.commons.lang.ObjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
+ * Module version handler for media module
* @author manuel
* @version $Id
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-09-06 07:54:02 UTC (rev 1432)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-09-06 19:40:12 UTC (rev 1433)
@@ -33,8 +33,6 @@
import info.magnolia.context.MgnlContext;
import java.awt.Point;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -58,6 +56,7 @@
/**
+ * Class that holds media el functions methods
* @author molaschi
* @version $Id$
*/
@@ -107,7 +106,8 @@
}
/**
- * Get localized description for a media
+ * Get localized description for a media. If the locale is "it", it searches for a nodedata called description-it,
+ * or (if not found) description-en or (if not found) description.
* @param media media
* @param locale language
* @return description
@@ -131,7 +131,7 @@
}
/**
- * Get localized description for a media
+ * Get description for a media
* @param media media
* @return description
*/
@@ -141,7 +141,8 @@
}
/**
- * Get localized title for a media
+ * Get localized title for a media. If the locale is "it", it searches for a nodedata called title-it, or (if not
+ * found) title-en or (if not found) title.
* @param media media
* @param locale language
* @return title
@@ -165,7 +166,7 @@
}
/**
- * Get localized title for a media
+ * Get title for a media
* @param media media
* @return title
*/
@@ -175,7 +176,8 @@
}
/**
- * Get localized tags for a media
+ * Get localized tags for a media. If the locale is "it", it searches for a nodedata called tags-it, or (if not
+ * found) tags-en or (if not found) tags.
* @param media media
* @param locale language
* @return tags
@@ -200,7 +202,7 @@
}
/**
- * Get localized tags for a media
+ * Get tags for a media
* @param media media
* @return tags
*/
@@ -220,8 +222,9 @@
}
/**
- * Get url for a media
+ * Get url for a media, passing some parameters
* @param media media
+ * @param options optional parameters
* @return url
*/
public static String getUrl2(Content media, Map<String, String> options)
@@ -235,8 +238,9 @@
}
/**
- * @param media
- * @return String the thumbnail url for this media, null otherwise
+ * Get url to thumbnail
+ * @param media media to get the url for
+ * @return the thumbnail url for this media, null otherwise
*/
public static String getThumbnail(Content media)
{
@@ -249,8 +253,9 @@
}
/**
- * @param media
- * @return String the type of this media if existing, null otherwise
+ * Get media type
+ * @param media media to get the type
+ * @return the type of this media if existing, null otherwise
*/
public static String getType(Content media)
{
@@ -262,8 +267,9 @@
}
/**
- * @param media
- * @return
+ * Get all resolution strings (i.e. 'o200x350;background=45A97B') that generates cached resolutions
+ * @param media media to get the resolutions
+ * @return all resolution strings
*/
@SuppressWarnings("unchecked")
public static String[] listResolutions(Content media)
@@ -277,7 +283,14 @@
{
if (item.getName().startsWith("res-"))
{
- res.add(StringUtils.substringAfter(item.getName(), "-"));
+ if (item.getAttribute(ImageUtils.RESOLUTION_PROPERTY) != null)
+ {
+ res.add(item.getAttribute(ImageUtils.RESOLUTION_PROPERTY));
+ }
+ else
+ {
+ res.add(StringUtils.substringAfter(item.getName(), "-"));
+ }
}
}
@@ -375,8 +388,9 @@
}
/**
- * @param media
- * @return String the preview url for this media if existing, null otherwise
+ * Get url to media preview
+ * @param media media
+ * @return the preview url for this media if existing, null otherwise
*/
public static String getPreview(Content media)
{
@@ -389,7 +403,8 @@
}
/**
- * @param media
+ * Get an array of String(s) containing a list of web pages where this media is used, an empty array otherwise
+ * @param media media to search in web pages
* @return an array of String(s) containing a list of web pages where this media is used, an empty array otherwise
* @throws IllegalArgumentException if media is null
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2009-09-06 07:54:02 UTC (rev 1432)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2009-09-06 19:40:12 UTC (rev 1433)
@@ -39,6 +39,8 @@
/**
+ * Custom JCR tree browser configuration that adds management of media custom nodetypes (mgnl:media mgnl:resolutions)
+ * and adds a column showing node type
* @author molaschi
* @version $Id$
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java 2009-09-06 07:54:02 UTC (rev 1432)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java 2009-09-06 19:40:12 UTC (rev 1433)
@@ -38,6 +38,7 @@
/**
+ * Tree Configuration that shows folders and media but no resolutions
* @author molaschi
* @version $Id$
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java 2009-09-06 07:54:02 UTC (rev 1432)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java 2009-09-06 19:40:12 UTC (rev 1433)
@@ -43,6 +43,7 @@
/**
+ * The tree for media folders browsing
* @author molaschi
* @version $Id$
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-09-06 07:54:02 UTC (rev 1432)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-09-06 19:40:12 UTC (rev 1433)
@@ -48,6 +48,7 @@
/**
+ * Custom Tree configuration for media folders browsing
* @author molaschi
* @version $Id$
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java 2009-09-06 07:54:02 UTC (rev 1432)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java 2009-09-06 19:40:12 UTC (rev 1433)
@@ -34,6 +34,7 @@
/**
+ * Extends {@link AdminTreeMVCHandler} to include custom js and to route activate command to activateMedia command
* @author molaschi
* @version $Id$
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java 2009-09-06 07:54:02 UTC (rev 1432)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java 2009-09-06 19:40:12 UTC (rev 1433)
@@ -26,6 +26,7 @@
package net.sourceforge.openutils.mgnlmedia.media.utils;
/**
+ * Exception for images with unknown format
* @author fgiust
* @version $Id$
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-09-06 07:54:02 UTC (rev 1432)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-09-06 19:40:12 UTC (rev 1433)
@@ -25,24 +25,6 @@
*/
package net.sourceforge.openutils.mgnlmedia.media.utils;
-/**
- * Copyright Openmind 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/>.
- *
- */
-
import info.magnolia.cms.beans.runtime.FileProperties;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
@@ -94,6 +76,7 @@
/**
+ * Main utility class that works with images and media nodes
* @author molaschi
* @version $Id$
*/
@@ -107,7 +90,7 @@
private static SimpleDateFormat sdf;
- private static String RESOLUTION_PROPERTY = "resolution";
+ public static String RESOLUTION_PROPERTY = "resolution";
private static final String[] extensions = new String[]{"jpg", "gif", "png" };
@@ -386,6 +369,11 @@
}
}
+ /**
+ * Get resolution nodedata name for a given resolution string
+ * @param resolution resolution string
+ * @return resolution nodedata name
+ */
public static String getResolutionPath(String resolution)
{
if (resolution.indexOf(';') > 0)
@@ -397,6 +385,13 @@
return resolution;
}
+ /**
+ * Get an inputstream for an image and the target file extension
+ * @param image image to get the inputstream from
+ * @param extension target file extension
+ * @return inputstream
+ * @throws IOException
+ */
public static InputStream getStream(BufferedImage image, String extension) throws IOException
{
ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -432,11 +427,24 @@
return new ByteArrayInputStream(bos.toByteArray());
}
+ /**
+ * Check if the resolution for a media is already present. Otherwise create it
+ * @param media media to check the resolutoin on
+ * @param resolutionTarget target resolution
+ * @return false if resolution doesn't exist and there is a problem in generate it; true otherwise
+ */
public static boolean checkOrCreateResolution(final Content media, final String resolutionTarget)
{
return checkOrCreateResolution(media, resolutionTarget, BaseTypeHandler.ORGINAL_NODEDATA_NAME);
}
+ /**
+ * Check if the resolution for a media is already present. Otherwise create it
+ * @param media media to check the resolutoin on
+ * @param resolutionTarget target resolution
+ * @param nodeDataName nodedata where the image to resize is stored
+ * @return false if resolution doesn't exist and there is a problem in generate it; true otherwise
+ */
public static boolean checkOrCreateResolution(final Content media, final String resolutionTarget,
final String nodeDataName)
{
@@ -587,10 +595,10 @@
return true;
}
-/**
+ /**
* Get image for a resolution
* @param original original image
- * @param resolution resolution (if it starts with '<' does a fitIn else a fillAndCropCentered
+ * @param resolution resolution
* @return new image
*/
public static BufferedImage getImageForResolution(BufferedImage original, String resolution)
@@ -663,6 +671,12 @@
return img;
}
+ /**
+ * Get file extension for a resolution stored in a media node
+ * @param media media
+ * @param resolution resolution
+ * @return file extension for a resolution stored in a media node
+ */
public static String getExtension(Content media, String resolution)
{
try
@@ -678,8 +692,9 @@
}
/**
- * @param image
- * @return
+ * Create a buffered image from the binary data stored in nodedata
+ * @param image nodedata
+ * @return buffered image from the binary data stored in nodedata
*/
public static BufferedImage createBufferedImage(NodeData image)
{
@@ -708,6 +723,11 @@
}
}
+ /**
+ * Parse resolution string for required size
+ * @param res resolution string
+ * @return required size parsed from given resolution string
+ */
public static java.awt.Point parseForSize(String res)
{
Point size = new Point();
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2009-09-06 07:54:02 UTC (rev 1432)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2009-09-06 19:40:12 UTC (rev 1433)
@@ -52,6 +52,7 @@
/**
+ * Utility Class that manages loading files into media repository
* @author fgiust
* @version $Id$
*/
@@ -63,6 +64,16 @@
*/
private static Logger log = LoggerFactory.getLogger(MediaLoadUtils.class);
+ /**
+ * Load a file in media repository
+ * @param inputStream file input stream
+ * @param parent parent folder node
+ * @param filename filename
+ * @param overwrite overwrite if already exists?
+ * @return create media node
+ * @throws RepositoryException exception working on media repository
+ * @throws IOException exception working with file stream
+ */
public static Content loadEntry(InputStream inputStream, String parent, String filename, boolean overwrite)
throws RepositoryException, IOException
{
@@ -135,6 +146,14 @@
return null;
}
+ /**
+ * Get the content node matching required path using hierarchy manager. If the required path doesn't exist create
+ * it.
+ * @param mgr hierarchy manager
+ * @param path path to get or create
+ * @return content to required path
+ * @throws RepositoryException exception getting or creating path
+ */
public static Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
{
String[] contentNodeNames = path.split("/");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gca...@us...> - 2009-09-06 07:54:09
|
Revision: 1432
http://openutils.svn.sourceforge.net/openutils/?rev=1432&view=rev
Author: gcatania
Date: 2009-09-06 07:54:02 +0000 (Sun, 06 Sep 2009)
Log Message:
-----------
BSHD-1 - improve generics usage
Modified Paths:
--------------
trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java
trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/EnhancedExample.java
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 2009-09-05 19:16:40 UTC (rev 1431)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java 2009-09-06 07:54:02 UTC (rev 1432)
@@ -17,7 +17,7 @@
* @param <T> Persistence class
* @param <K> Object Key
*/
-public interface HibernateDAO<T extends Object, K extends Serializable>
+public interface HibernateDAO<T, K extends Serializable>
{
/**
@@ -46,7 +46,7 @@
* @param criteria Additional Criterion conditions
* @return a list of all instances
*/
- List<T> findAll(final Order[] orderProperties, List<Criterion> criteria);
+ List<T> findAll(final Order[] orderProperties, List< ? extends Criterion> criteria);
/**
* Execute a query.
@@ -115,7 +115,8 @@
* @param page result page (first result is maxResults * page)
* @return list of objects
*/
- List<T> findFiltered(final T filter, Map<String, FilterMetadata> metadata, final int maxResults, final int page);
+ List<T> findFiltered(final T filter, Map<String, ? extends FilterMetadata> metadata, final int maxResults,
+ final int page);
/**
* Return all objects related to the implementation of this DAO filtered using properties of the provided instance.
@@ -126,8 +127,8 @@
* @param page result page (first result is maxResults * page)
* @return list of objects
*/
- List<T> findFiltered(final T filter, final Order[] customOrder, final Map<String, FilterMetadata> metadata,
- final int maxResults, final int page);
+ List<T> findFiltered(final T filter, final Order[] customOrder,
+ final Map<String, ? extends FilterMetadata> metadata, final int maxResults, final int page);
/**
* Return all objects related to the implementation of this DAO filtered using properties of the provided instance.
@@ -139,8 +140,9 @@
* @param additionalCriteria additional criteria
* @return list of objects
*/
- List<T> findFiltered(final T filter, final Order[] customOrder, final Map<String, FilterMetadata> metadata,
- final int maxResults, final int page, List<Criterion> additionalCriteria);
+ List<T> findFiltered(final T filter, final Order[] customOrder,
+ final Map<String, ? extends FilterMetadata> metadata, final int maxResults, final int page,
+ List< ? extends Criterion> additionalCriteria);
/**
* Return properties from all objects related to the implementation of this DAO filtered using properties of the
@@ -155,8 +157,8 @@
* @return list of properties from all objects
*/
List< ? > findFilteredProperties(final T filter, final Order[] customOrder,
- final Map<String, FilterMetadata> metadata, final int maxResults, final int page,
- List<Criterion> additionalCriteria, List<String> properties);
+ final Map<String, ? extends FilterMetadata> metadata, final int maxResults, final int page,
+ List< ? extends Criterion> additionalCriteria, List<String> properties);
/**
* Return all objects related to the implementation of this DAO filtered using properties of the provided instance.
@@ -179,7 +181,7 @@
* @param metadata filter metadata
* @return list of objects
*/
- List<T> findFiltered(final T filter, Map<String, FilterMetadata> metadata);
+ List<T> findFiltered(final T filter, Map<String, ? extends FilterMetadata> metadata);
/**
* Return the first object related to the implementation of this DAO filtered using properties of the provided
@@ -204,7 +206,7 @@
* @param criteria additional criterion
* @return first object in the collection
*/
- T findFilteredFirst(final T filter, final List<Criterion> criteria);
+ T findFilteredFirst(final T filter, final List< ? extends Criterion> criteria);
/**
* Used by the base DAO classes but here for your modification. Remove a persistent instance from the datastore. The
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 2009-09-05 19:16:40 UTC (rev 1431)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java 2009-09-06 07:54:02 UTC (rev 1432)
@@ -4,9 +4,8 @@
import it.openutils.hibernate.example.FilterMetadata;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -36,7 +35,7 @@
* @param <T> Persistence class
* @param <K> Object Key
*/
-public abstract class HibernateDAOImpl<T extends Object, K extends Serializable> extends HibernateDaoSupport
+public abstract class HibernateDAOImpl<T, K extends Serializable> extends HibernateDaoSupport
implements
HibernateDAO<T, K>
{
@@ -58,7 +57,7 @@
* @param referenceClass the class for the bean managed by this DAO
*/
@SuppressWarnings({"unchecked" })
- public HibernateDAOImpl(Class referenceClass)
+ public HibernateDAOImpl(final Class referenceClass)
{
super();
this.referenceClass = referenceClass;
@@ -68,7 +67,7 @@
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public List<T> find(String query)
+ public List<T> find(final String query)
{
return getHibernateTemplate().find(query);
}
@@ -86,19 +85,19 @@
*/
public List<T> findAll(final Order[] orderProperties)
{
- return getThis().findAll(orderProperties, new ArrayList<Criterion>());
+ return getThis().findAll(orderProperties, Collections.<Criterion> emptyList());
}
/**
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public List<T> findAll(final Order[] orderProperties, final List<Criterion> criteria)
+ public List<T> findAll(final Order[] orderProperties, final List< ? extends Criterion> criteria)
{
return (List<T>) getHibernateTemplate().execute(new HibernateCallback()
{
- public Object doInHibernate(Session ses) throws HibernateException
+ public Object doInHibernate(final Session ses) throws HibernateException
{
Criteria crit = ses.createCriteria(getReferenceClass());
if (null != orderProperties)
@@ -124,7 +123,7 @@
/**
* {@inheritDoc}
*/
- public List<T> find(String query, Object obj, Type type)
+ public List<T> find(final String query, final Object obj, final Type type)
{
return find(query, new Object[]{obj }, new Type[]{type });
}
@@ -138,7 +137,7 @@
return (List<T>) getHibernateTemplate().execute(new HibernateCallback()
{
- public Object doInHibernate(Session ses) throws HibernateException
+ public Object doInHibernate(final Session ses) throws HibernateException
{
// hibernate 3
return ses.createQuery(query).setParameters(obj, type).list();
@@ -150,7 +149,7 @@
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public T load(K key)
+ public T load(final K key)
{
T result = (T) getHibernateTemplate().load(getReferenceClass(), key);
Hibernate.initialize(result);
@@ -161,7 +160,7 @@
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public T loadIfAvailable(K key)
+ public T loadIfAvailable(final K key)
{
T result;
try
@@ -184,7 +183,7 @@
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public T get(K key)
+ public T get(final K key)
{
return (T) getHibernateTemplate().get(getReferenceClass(), key);
}
@@ -200,7 +199,7 @@
/**
* {@inheritDoc}
*/
- public void update(T obj)
+ public void update(final T obj)
{
getHibernateTemplate().update(obj);
}
@@ -214,7 +213,7 @@
return (Boolean) getHibernateTemplate().execute(new HibernateCallback()
{
- public Object doInHibernate(Session ses) throws HibernateException
+ public Object doInHibernate(final Session ses) throws HibernateException
{
ses.delete(ses.load(getReferenceClass(), key));
return true;
@@ -226,7 +225,7 @@
/**
* {@inheritDoc}
*/
- public void refresh(T obj)
+ public void refresh(final T obj)
{
getHibernateTemplate().refresh(obj);
}
@@ -234,7 +233,7 @@
/**
* {@inheritDoc}
*/
- public void evict(T obj)
+ public void evict(final T obj)
{
getHibernateTemplate().evict(obj);
}
@@ -248,7 +247,7 @@
return (T) getHibernateTemplate().execute(new HibernateCallback()
{
- public Object doInHibernate(Session ses) throws HibernateException
+ public Object doInHibernate(final Session ses) throws HibernateException
{
return ses.merge(obj);
}
@@ -260,7 +259,7 @@
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public K save(T obj)
+ public K save(final T obj)
{
return (K) getHibernateTemplate().save(obj);
}
@@ -281,11 +280,10 @@
return getFirstInCollection(findFiltered(filter, order, getDefaultFilterMetadata(), 1, 0));
}
-
/**
* {@inheritDoc}
*/
- public T findFilteredFirst(final T filter, List<Criterion> criteria)
+ public T findFilteredFirst(final T filter, final List< ? extends Criterion> criteria)
{
return getFirstInCollection(findFiltered(filter, null, getDefaultFilterMetadata(), 1, 0, criteria));
}
@@ -301,7 +299,7 @@
/**
* {@inheritDoc}
*/
- public List<T> findFiltered(T filter, Order[] orderProperties)
+ public List<T> findFiltered(final T filter, final Order[] orderProperties)
{
return findFiltered(filter, orderProperties, getDefaultFilterMetadata(), Integer.MAX_VALUE, 0);
}
@@ -309,7 +307,7 @@
/**
* {@inheritDoc}
*/
- public List<T> findFiltered(final T filter, final Map<String, FilterMetadata> metadata)
+ public List<T> findFiltered(final T filter, final Map<String, ? extends FilterMetadata> metadata)
{
return findFiltered(filter, metadata, Integer.MAX_VALUE, 0);
}
@@ -325,8 +323,8 @@
/**
* {@inheritDoc}
*/
- public List<T> findFiltered(final T filter, final Map<String, FilterMetadata> metadata, final int maxResults,
- final int page)
+ public List<T> findFiltered(final T filter, final Map<String, ? extends FilterMetadata> metadata,
+ final int maxResults, final int page)
{
return findFiltered(filter, null, metadata, maxResults, page);
}
@@ -334,18 +332,25 @@
/**
* {@inheritDoc}
*/
- public List<T> findFiltered(final T filter, final Order[] customOrder, final Map<String, FilterMetadata> metadata,
- final int maxResults, final int page)
+ public List<T> findFiltered(final T filter, final Order[] customOrder,
+ final Map<String, ? extends FilterMetadata> metadata, final int maxResults, final int page)
{
- return getThis().findFiltered(filter, customOrder, metadata, maxResults, page, new ArrayList<Criterion>());
+ return getThis().findFiltered(
+ filter,
+ customOrder,
+ metadata,
+ maxResults,
+ page,
+ Collections.<Criterion> emptyList());
}
/**
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public List<T> findFiltered(T filter, Order[] customOrder, Map<String, FilterMetadata> metadata, int maxResults,
- int page, List<Criterion> additionalCriteria)
+ public List<T> findFiltered(final T filter, final Order[] customOrder,
+ final Map<String, ? extends FilterMetadata> metadata, final int maxResults, final int page,
+ final List< ? extends Criterion> additionalCriteria)
{
final Order[] orderProperties = customOrder != null && customOrder.length > 0 ? customOrder : this
.getDefaultOrder();
@@ -365,8 +370,8 @@
* {@inheritDoc}
*/
public List< ? > findFilteredProperties(final T filter, final Order[] customOrder,
- final Map<String, FilterMetadata> metadata, final int maxResults, final int page,
- List<Criterion> additionalCriteria, List<String> properties)
+ final Map<String, ? extends FilterMetadata> metadata, final int maxResults, final int page,
+ final List< ? extends Criterion> additionalCriteria, final List<String> properties)
{
final Order[] orderProperties = customOrder != null && customOrder.length > 0 ? customOrder : this
.getDefaultOrder();
@@ -391,7 +396,7 @@
return referenceClass;
}
- public void setReferenceClass(Class<T> referenceClass)
+ public void setReferenceClass(final Class<T> referenceClass)
{
this.referenceClass = referenceClass;
}
@@ -417,7 +422,7 @@
return (List< ? >) getHibernateTemplate().execute(new HibernateCallback()
{
- public Object doInHibernate(Session ses) throws HibernateException
+ public Object doInHibernate(final Session ses) throws HibernateException
{
Query q = ses.getNamedQuery(name);
if (maxResults != null)
@@ -443,12 +448,12 @@
* @param maxResults max number of results
* @return Query
*/
- protected List< ? > findByNamedQuery(final String name, final Map<String, Object> params, final Integer maxResults)
+ protected List< ? > findByNamedQuery(final String name, final Map<String, ? > params, final Integer maxResults)
{
return (List< ? >) getHibernateTemplate().execute(new HibernateCallback()
{
- public Object doInHibernate(Session ses) throws HibernateException
+ public Object doInHibernate(final Session ses) throws HibernateException
{
Query q = ses.getNamedQuery(name);
if (maxResults != null)
@@ -458,7 +463,7 @@
if (params != null)
{
- for (Map.Entry<String, Object> entry : params.entrySet())
+ for (Map.Entry<String, ? > entry : params.entrySet())
{
setParameterValue(q, entry.getKey(), entry.getValue());
}
@@ -477,7 +482,7 @@
* @deprecated use the better named <code>findByNamedQuery</code> method
*/
@Deprecated
- protected List< ? > getNamedQuery(final String name, final Serializable[] params, int maxResults)
+ protected List< ? > getNamedQuery(final String name, final Serializable[] params, final int maxResults)
{
return findByNamedQuery(name, params, maxResults > 0 ? maxResults : Integer.MAX_VALUE);
}
@@ -491,7 +496,7 @@
* @deprecated use the better named <code>findByNamedQuery</code> method
*/
@Deprecated
- protected List< ? > getNamedQuery(final String name, final Map<String, Object> params, int maxResults)
+ protected List< ? > getNamedQuery(final String name, final Map<String, ? > params, final int maxResults)
{
return findByNamedQuery(name, params, maxResults > 0 ? maxResults : Integer.MAX_VALUE);
}
@@ -503,7 +508,7 @@
* @param key the key name
* @param value the object to set as the parameter
*/
- protected void setParameterValue(Query query, String key, Object value)
+ protected void setParameterValue(final Query query, final String key, final Object value)
{
if (null == key || null == value)
{
@@ -517,9 +522,9 @@
* set any default filter, subclasses may override this.
* @return map of property name - filter metadata
*/
- protected Map<String, FilterMetadata> getDefaultFilterMetadata()
+ protected Map<String, ? extends FilterMetadata> getDefaultFilterMetadata()
{
- return new HashMap<String, FilterMetadata>(0);
+ return Collections.emptyMap();
}
/**
@@ -527,14 +532,13 @@
* @param list collection
* @return first element in the list
*/
- @SuppressWarnings("unchecked")
- private T getFirstInCollection(Collection<T> list)
+ private T getFirstInCollection(final Collection< ? extends T> list)
{
if (list != null && !list.isEmpty())
{
- Object result = list.iterator().next();
+ T result = list.iterator().next();
Hibernate.initialize(result);
- return (T) result;
+ return result;
}
return null;
}
@@ -543,7 +547,7 @@
* Sets the aopenabled.
* @param aopenabled the aopenabled to set
*/
- public void setAopenabled(boolean aopenabled)
+ public void setAopenabled(final boolean aopenabled)
{
this.aopenabled = aopenabled;
}
@@ -601,7 +605,7 @@
/**
*
*/
- private final Map<String, FilterMetadata> metadata;
+ private final Map<String, ? extends FilterMetadata> metadata;
/**
*
@@ -613,7 +617,7 @@
*/
private final Order[] orderProperties;
- private List<Criterion> additionalCriteria;
+ private List< ? extends Criterion> additionalCriteria;
/**
* @param filter
@@ -623,13 +627,13 @@
* @param orderProperties
*/
private HibernateCallbackForExecution(
- T filter,
- int page,
- int maxResults,
- Map<String, FilterMetadata> metadata,
- Order[] orderProperties,
- List<Criterion> additionalCriteria,
- List<String> properties)
+ final T filter,
+ final int page,
+ final int maxResults,
+ final Map<String, ? extends FilterMetadata> metadata,
+ final Order[] orderProperties,
+ final List< ? extends Criterion> additionalCriteria,
+ final List<String> properties)
{
this.filter = filter;
this.page = page;
@@ -640,7 +644,7 @@
this.properties = properties;
}
- public Object doInHibernate(Session ses) throws HibernateException
+ public Object doInHibernate(final Session ses) throws HibernateException
{
Criteria crit = ses.createCriteria(filter.getClass());
crit.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
Modified: trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/EnhancedExample.java
===================================================================
--- trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/EnhancedExample.java 2009-09-05 19:16:40 UTC (rev 1431)
+++ trunk/openutils-bshd5/src/main/java/it/openutils/hibernate/example/EnhancedExample.java 2009-09-06 07:54:02 UTC (rev 1432)
@@ -5,8 +5,8 @@
import java.sql.Timestamp;
import java.util.Calendar;
import java.util.Collection;
+import java.util.Collections;
import java.util.Date;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -34,11 +34,14 @@
*/
private static Logger log = LoggerFactory.getLogger(EnhancedExample.class);
- private Map<String, FilterMetadata> metadata;
+ private Map<String, ? extends FilterMetadata> metadata;
- private EnhancedExample(Criteria crit, Object filter, Map<String, FilterMetadata> metadata)
+ private EnhancedExample(
+ final Criteria crit,
+ final Object filter,
+ final Map<String, ? extends FilterMetadata> metadata)
{
- this.metadata = metadata == null ? new HashMap<String, FilterMetadata>(0) : metadata;
+ this.metadata = metadata == null ? Collections.<String, FilterMetadata> emptyMap() : metadata;
fillCriteria(null, crit, filter);
}
@@ -49,8 +52,8 @@
* @param metadata Map of property names - filter metadata
* @throws HibernateException exception while building the criteria
*/
- public static void create(Criteria crit, Object filter, Map<String, FilterMetadata> metadata)
- throws HibernateException
+ public static void create(final Criteria crit, final Object filter,
+ final Map<String, ? extends FilterMetadata> metadata) throws HibernateException
{
new EnhancedExample(crit, filter, metadata);
}
@@ -62,8 +65,8 @@
* @param value property value
* @throws HibernateException exception while building the criteria
*/
- private void addCondition(Criteria crit, String propertyName, Object value, Object parentObject)
- throws HibernateException
+ private void addCondition(final Criteria crit, final String propertyName, final Object value,
+ final Object parentObject) throws HibernateException
{
String simplePropertyName = StringUtils.contains(propertyName, ".") ? StringUtils.substringAfterLast(
@@ -95,9 +98,9 @@
{
// @todo handle multiple associations in lists?
// see http://opensource2.atlassian.com/projects/hibernate/browse/HHH-879
- if ((value instanceof Set || value instanceof List) && !((Collection< ? >) value).isEmpty())
+ if ((value instanceof Set< ? > || value instanceof List< ? >) && !((Collection< ? >) value).isEmpty())
{
- // collection: the new criteria has already been created, now we only nee to analize content
+ // collection: the new criteria has already been created, now we only need to analize content
for (Object element : ((Collection< ? >) value))
{
@@ -107,7 +110,7 @@
fillCriteria(propertyName, childrenCriteria, element);
}
}
- else if ((value instanceof Map) && !((Map< ? , ? >) value).isEmpty())
+ else if ((value instanceof Map< ? , ? >) && !((Map< ? , ? >) value).isEmpty())
{
FilterMetadata fmd = metadata.get(propertyName);
@@ -139,7 +142,7 @@
* @return <code>true</code> if the bean contains at least a valid property
*/
@SuppressWarnings("unchecked")
- private boolean containsSomething(Object bean)
+ private boolean containsSomething(final Object bean)
{
if (bean == null)
@@ -151,7 +154,7 @@
return true;
}
- if (bean instanceof Collection)
+ if (bean instanceof Collection< ? >)
{
Collection< ? > coll = ((Collection< ? >) bean);
@@ -165,7 +168,7 @@
return true;
}
}
- else if (bean instanceof Map)
+ else if (bean instanceof Map< ? , ? >)
{
Map< ? , ? > coll = ((Map< ? , ? >) bean);
if (coll.isEmpty())
@@ -227,9 +230,10 @@
* @throws HibernateException exception while building the criteria
*/
@SuppressWarnings("unchecked")
- private void fillCriteria(String parentPropertyName, Criteria crit, Object filter) throws HibernateException
+ private void fillCriteria(final String parentPropertyName, final Criteria crit, final Object filter)
+ throws HibernateException
{
- if ((filter instanceof Set || filter instanceof List) && !((Collection< ? >) filter).isEmpty())
+ if ((filter instanceof Set< ? > || filter instanceof List< ? >) && !((Collection< ? >) filter).isEmpty())
{
// collection: the new criteria has already been created, now we only need to analize content
for (Object element : ((Collection< ? >) filter))
@@ -281,7 +285,7 @@
* @param object object to check
* @return <code>true</code>if the given object is a simple type
*/
- private boolean isSimpleType(Object object)
+ private boolean isSimpleType(final Object object)
{
Class< ? extends Object> objClass = object.getClass();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-09-05 19:16:46
|
Revision: 1431
http://openutils.svn.sourceforge.net/openutils/?rev=1431&view=rev
Author: fgiust
Date: 2009-09-05 19:16:40 +0000 (Sat, 05 Sep 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2009-09-05 19:16:31 UTC (rev 1430)
+++ trunk/openutils-bshd5/pom.xml 2009-09-05 19:16:40 UTC (rev 1431)
@@ -7,7 +7,7 @@
</parent>
<artifactId>openutils-bshd5</artifactId>
<name>openutils base Spring-Hibernate DAO for java 5.0</name>
- <version>2.0.6</version>
+ <version>2.0.7-SNAPSHOT</version>
<description>Openutils base Spring-Hibernate DAO for java 5.0</description>
<licenses>
<license>
@@ -135,10 +135,4 @@
<properties>
<spring.version>2.5.6</spring.version>
</properties>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.0.6</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.0.6</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-2.0.6</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-09-05 19:16:38
|
Revision: 1430
http://openutils.svn.sourceforge.net/openutils/?rev=1430&view=rev
Author: fgiust
Date: 2009-09-05 19:16:31 +0000 (Sat, 05 Sep 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-bshd5-2.0.6
Added Paths:
-----------
tags/openutils-bshd5-2.0.6/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-09-05 19:15:16
|
Revision: 1429
http://openutils.svn.sourceforge.net/openutils/?rev=1429&view=rev
Author: fgiust
Date: 2009-09-05 19:15:08 +0000 (Sat, 05 Sep 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-bshd5-2.0.6
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2009-09-05 19:14:16 UTC (rev 1428)
+++ trunk/openutils-bshd5/pom.xml 2009-09-05 19:15:08 UTC (rev 1429)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -8,7 +7,7 @@
</parent>
<artifactId>openutils-bshd5</artifactId>
<name>openutils base Spring-Hibernate DAO for java 5.0</name>
- <version>2.0.6-SNAPSHOT</version>
+ <version>2.0.6</version>
<description>Openutils base Spring-Hibernate DAO for java 5.0</description>
<licenses>
<license>
@@ -136,4 +135,10 @@
<properties>
<spring.version>2.5.6</spring.version>
</properties>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.0.6</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.0.6</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-2.0.6</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-09-05 19:14:23
|
Revision: 1428
http://openutils.svn.sourceforge.net/openutils/?rev=1428&view=rev
Author: fgiust
Date: 2009-09-05 19:14:16 +0000 (Sat, 05 Sep 2009)
Log Message:
-----------
cleaned up
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
Added Paths:
-----------
trunk/openutils-bshd5/src/main/assembly/
trunk/openutils-bshd5/src/main/assembly/assembly-bundle.xml
trunk/openutils-bshd5/src/main/bundle/
trunk/openutils-bshd5/src/main/bundle/LICENSE.txt
trunk/openutils-bshd5/src/main/bundle/README.txt
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2009-09-05 19:07:37 UTC (rev 1427)
+++ trunk/openutils-bshd5/pom.xml 2009-09-05 19:14:16 UTC (rev 1428)
@@ -9,7 +9,39 @@
<artifactId>openutils-bshd5</artifactId>
<name>openutils base Spring-Hibernate DAO for java 5.0</name>
<version>2.0.6-SNAPSHOT</version>
- <description>openutils base Spring-Hibernate DAO for java 5.0</description>
+ <description>Openutils base Spring-Hibernate DAO for java 5.0</description>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+ <url>http://lab.openmindonline.it/lab/products/bshd5.html</url>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://lab.openmindonline.it/jira/browse/BSHD</url>
+ </issueManagement>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/assembly-bundle.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
Added: trunk/openutils-bshd5/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-bshd5/src/main/assembly/assembly-bundle.xml (rev 0)
+++ trunk/openutils-bshd5/src/main/assembly/assembly-bundle.xml 2009-09-05 19:14:16 UTC (rev 1428)
@@ -0,0 +1,33 @@
+<assembly>
+ <id>bundle</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <filtered>true</filtered>
+ <outputDirectory>/</outputDirectory>
+ <lineEnding>crlf</lineEnding>
+ <directory>${basedir}/src/main/bundle</directory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/java/</directory>
+ <outputDirectory>/sources/</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>net.sourceforge.openutils:*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Property changes on: trunk/openutils-bshd5/src/main/assembly/assembly-bundle.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-bshd5/src/main/bundle/LICENSE.txt
===================================================================
--- trunk/openutils-bshd5/src/main/bundle/LICENSE.txt (rev 0)
+++ trunk/openutils-bshd5/src/main/bundle/LICENSE.txt 2009-09-05 19:14:16 UTC (rev 1428)
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Property changes on: trunk/openutils-bshd5/src/main/bundle/LICENSE.txt
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-bshd5/src/main/bundle/README.txt
===================================================================
--- trunk/openutils-bshd5/src/main/bundle/README.txt (rev 0)
+++ trunk/openutils-bshd5/src/main/bundle/README.txt 2009-09-05 19:14:16 UTC (rev 1428)
@@ -0,0 +1,53 @@
+===========================================================
+
+${pom.name} ${pom.version}
+by ${pom.organization.name}
+
+===========================================================
+
+${pom.description}
+
+More information about this project can be found at:
+${pom.url}
+
+Change log and known issues can be found at:
+${pom.issueManagement.url}
+
+Source is available from the subversion repository at:
+${pom.scm.url}
+
+=========================================
+ USAGE
+=========================================
+
+The preferred way to add ${pom.name} to your project is using maven.
+You can declare the following dependency in your pom.xml:
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>${pom.artifactId}</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+Alternatively, you can add the ${pom.artifactId} plus the required dependencies
+manually to the classpath of your application.
+
+
+=========================================
+ LICENSE
+=========================================
+
+Copyright Openmind http://www.openmindonline.it
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
Property changes on: trunk/openutils-bshd5/src/main/bundle/README.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
