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-02-19 11:05:12
|
Revision: 1027
http://openutils.svn.sourceforge.net/openutils/?rev=1027&view=rev
Author: molaschi
Date: 2009-02-19 11:05:08 +0000 (Thu, 19 Feb 2009)
Log Message:
-----------
add branch conf
Property Changed:
----------------
branches/openutils-mgnlmedia-3.6.x/
Property changes on: branches/openutils-mgnlmedia-3.6.x
___________________________________________________________________
Added: subclipse:tags
+ 1007,openutils-mgnlmedia-3.6.x,/branches/openutils-mgnlmedia-3.6.x,branch
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-02-19 11:02:57
|
Revision: 1026
http://openutils.svn.sourceforge.net/openutils/?rev=1026&view=rev
Author: molaschi
Date: 2009-02-19 11:02:46 +0000 (Thu, 19 Feb 2009)
Log Message:
-----------
add entry for 3.6.1 release
Modified Paths:
--------------
branches/openutils-mgnlmedia-3.6.x/src/site/changes/changes.xml
Modified: branches/openutils-mgnlmedia-3.6.x/src/site/changes/changes.xml
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/site/changes/changes.xml 2009-02-19 11:01:05 UTC (rev 1025)
+++ branches/openutils-mgnlmedia-3.6.x/src/site/changes/changes.xml 2009-02-19 11:02:46 UTC (rev 1026)
@@ -15,5 +15,8 @@
<action type="add" dev="fgiust">Added support for reading CMYK/YCCK jpegs</action>
<action type="update" dev="fgiust">Stable release for Magnolia 3.6.x</action>
</release>
+ <release version="3.6.1" date="2009-02-19" description="">
+ <action type="update" dev="molaschi">Update flv player to v 4.3 (http://www.longtailvideo.com/players/jw-flv-player/)</action>
+ </release>
</body>
</document>
\ 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-02-19 11:01:10
|
Revision: 1025
http://openutils.svn.sourceforge.net/openutils/?rev=1025&view=rev
Author: molaschi
Date: 2009-02-19 11:01:05 +0000 (Thu, 19 Feb 2009)
Log Message:
-----------
update player to v 4.3
Modified Paths:
--------------
branches/openutils-mgnlmedia-3.6.x/src/main/resources/mgnl-resources/media/players/player.swf
branches/openutils-mgnlmedia-3.6.x/src/main/resources/mgnl-resources/media/players/yt.swf
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/resources/mgnl-resources/media/players/player.swf
===================================================================
(Binary files differ)
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/resources/mgnl-resources/media/players/yt.swf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-02-19 10:55:54
|
Revision: 1024
http://openutils.svn.sourceforge.net/openutils/?rev=1024&view=rev
Author: molaschi
Date: 2009-02-19 10:55:49 +0000 (Thu, 19 Feb 2009)
Log Message:
-----------
fix problem on node name editing
Modified Paths:
--------------
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/utils/ImageUtils.java
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-02-17 09:49:37 UTC (rev 1023)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java 2009-02-19 10:55:49 UTC (rev 1024)
@@ -331,10 +331,11 @@
html.append(" />"); //$NON-NLS-1$
}
String dblclick = StringUtils.EMPTY;
- if (permissionWrite && StringUtils.isNotEmpty(this.getColumns(0).getHtmlEdit()) && !this.isBrowseMode())
+ String htmlEdit = this.getColumns(0).getHtmlEdit();
+ if (permissionWrite && StringUtils.isNotEmpty(htmlEdit) && !this.isBrowseMode())
// && this.getRequest().getParameter("selectMedia") == null)
{
- dblclick = " ondblclick=\"" + this.getJavascriptTree() + ".editNodeData(this,'" + handle + "',0);\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ dblclick = " ondblclick=\"" + this.getJavascriptTree() + ".editNodeData(this,'" + handle + "',0,'"+ htmlEdit.replace("\"", """) +"');\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
html.append("<span class=\"mgnlTreeText\" id=\"");
html.append(idPre);
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-02-17 09:49:37 UTC (rev 1023)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-02-19 10:55:49 UTC (rev 1024)
@@ -24,9 +24,11 @@
import info.magnolia.cms.util.ExclusiveWrite;
import info.magnolia.context.MgnlContext;
+import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.RenderingHints;
+import java.awt.geom.RoundRectangle2D;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.io.BufferedOutputStream;
@@ -73,6 +75,8 @@
private static SimpleDateFormat sdf;
+ private static String TRANSPARENT = "transparent";
+
private static final String[] extensions = new String[]{"jpg", "gif", "png" };
static
@@ -194,6 +198,16 @@
*/
public static BufferedImage fitIn(BufferedImage original, int x, int y)
{
+ return resizeInOut(original, x, y, false);
+ }
+
+ public static BufferedImage resizeNoCrop(BufferedImage original, int x, int y)
+ {
+ return resizeInOut(original, x, y, true);
+ }
+
+ private static BufferedImage resizeInOut(BufferedImage original, int x, int y, boolean external)
+ {
if (original == null)
{
throw new IllegalArgumentException("input image is null");
@@ -207,67 +221,13 @@
throw new IllegalArgumentException("Broken input image (width=" + oX + ",height=" + oY + ")");
}
- float oDelta = oX / oY;
- float delta = ((float) x) / ((float) y);
-
- if (oDelta > delta)
- {
- int newY = (int) (x * oY / oX);
- if (newY < 1)
- {
- newY = 1;
- }
- return resizeImage(original, x, newY);
- }
- else if (oDelta < delta)
- {
- int newX = (int) (y * oX / oY);
- if (newX < 1)
- {
- newX = 1;
- }
- return resizeImage(original, newX, y);
- }
- else
- {
- return resizeImage(original, x, y);
- }
- }
-
- public static BufferedImage resizeNoCrop(BufferedImage original, int x, int y)
- {
- float oX = original.getWidth();
- float oY = original.getHeight();
-
double xRatio = (double) x / oX;
double yRatio = (double) y / oY;
- double ratio = Math.min(xRatio, yRatio);
+ double ratio = (external ? Math.min(xRatio, yRatio) : Math.min(xRatio, yRatio));
int newX = (int) Math.round(oX * ratio);
int newY = (int) Math.round(oY * ratio);
- BufferedImage resizedImage = new BufferedImage(x, y, getType(original.getColorModel()));
-
- Graphics2D graphics2D = resizedImage.createGraphics();
- graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
- graphics2D.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-
- if (ratio > 1)
- {
- graphics2D.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
- graphics2D.drawImage(original, (x - newX) / 2, (y - newY) / 2, newX, newY, null);
- }
- else
- {
- graphics2D.drawImage(
- original.getScaledInstance(newX, newY, Image.SCALE_SMOOTH),
- (x - newX) / 2,
- (y - newY) / 2,
- newX,
- newY,
- null);
- }
-
- return resizedImage;
+ return resizeImage(original, newX, newY);
}
/**
@@ -302,6 +262,78 @@
}
}
+ private static int[] convertHexToRGB(String hexColor)
+ {
+ String hex = hexColor.trim();
+ if (hex.startsWith("#"))
+ {
+ hex = hex.substring(1);
+ }
+ if (hex.equals("transparent"))
+ {
+ return new int[]{0, 0, 0, 0 };
+ }
+ if (hex.length() == 3)
+ {
+ // allow three digit codes like for css
+ hex = String.valueOf(hex.charAt(0))
+ + String.valueOf(hex.charAt(0))
+ + String.valueOf(hex.charAt(1))
+ + String.valueOf(hex.charAt(1))
+ + String.valueOf(hex.charAt(2))
+ + String.valueOf(hex.charAt(2));
+ }
+
+ int[] rgb = new int[4];
+ try
+ {
+ // Convert rrggbb string to hex ints
+ rgb[0] = Integer.parseInt(hex.substring(0, 2), 16);
+ rgb[1] = Integer.parseInt(hex.substring(2, 4), 16);
+ rgb[2] = Integer.parseInt(hex.substring(4), 16);
+ rgb[3] = 255;
+ }
+ catch (NumberFormatException e)
+ {
+ log.error("NumberFormatException occured during text-to-image conversion: "
+ + "Attempting to convert Hex ["
+ + hex
+ + "] color to RGB color: "
+ + e.getMessage(), e);
+ rgb = new int[]{255, 0, 0, 255 }; // red
+ }
+ return rgb;
+ }
+
+ public static BufferedImage addRoundedCorners(BufferedImage original, String backgroundColor, int radius)
+ {
+ BufferedImage resizedImage;
+ try
+ {
+ resizedImage = new BufferedImage(original.getWidth(), original.getHeight(), getType(original
+ .getColorModel()));
+ }
+ catch (NegativeArraySizeException e)
+ {
+ throw new RuntimeException("NegativeArraySizeException caught when resizing image]");
+ }
+
+ Graphics2D graphics2D = resizedImage.createGraphics();
+ graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+ graphics2D.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+
+ int[] colorAr = convertHexToRGB(backgroundColor);
+ Color color = new Color(colorAr[0], colorAr[1], colorAr[2], colorAr[3]);
+
+ graphics2D.setBackground(color);
+ graphics2D.clearRect(0, 0, original.getWidth(), original.getHeight());
+ graphics2D
+ .setClip(new RoundRectangle2D.Double(0, 0, original.getWidth(), original.getHeight(), radius, radius));
+ graphics2D.drawImage(original, 0, 0, original.getWidth(), original.getHeight(), null);
+
+ return resizedImage;
+ }
+
/**
* Save a resolution for an image to a node (in resolutions/res-[width]x[height]/data.jpg)
* @param image image to save
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-17 09:49:41
|
Revision: 1023
http://openutils.svn.sourceforge.net/openutils/?rev=1023&view=rev
Author: fgiust
Date: 2009-02-17 09:49:37 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-testing-junit/pom.xml
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2009-02-17 09:49:28 UTC (rev 1022)
+++ trunk/openutils-testing-junit/pom.xml 2009-02-17 09:49:37 UTC (rev 1023)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-testing-junit</artifactId>
<name>openutils test utils (junit)</name>
- <version>2.1.1</version>
+ <version>2.1.2-SNAPSHOT</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
@@ -60,10 +60,4 @@
</exclusions>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-2.1.1</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-2.1.1</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-junit-2.1.1</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-17 09:49:31
|
Revision: 1022
http://openutils.svn.sourceforge.net/openutils/?rev=1022&view=rev
Author: fgiust
Date: 2009-02-17 09:49:28 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-testing-junit-2.1.1
Added Paths:
-----------
tags/openutils-testing-junit-2.1.1/
tags/openutils-testing-junit-2.1.1/pom.xml
Removed Paths:
-------------
tags/openutils-testing-junit-2.1.1/pom.xml
Deleted: tags/openutils-testing-junit-2.1.1/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2009-02-13 17:53:26 UTC (rev 998)
+++ tags/openutils-testing-junit-2.1.1/pom.xml 2009-02-17 09:49:28 UTC (rev 1022)
@@ -1,83 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>10</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-testing-junit</artifactId>
- <name>openutils test utils (junit)</name>
- <version>2.1.1-SNAPSHOT</version>
- <description>openutils test utils</description>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-testing</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.1.ga</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.2.2.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>xerces</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <properties>
- <spring.version>2.5.3</spring.version>
- </properties>
-</project>
\ No newline at end of file
Copied: tags/openutils-testing-junit-2.1.1/pom.xml (from rev 1021, trunk/openutils-testing-junit/pom.xml)
===================================================================
--- tags/openutils-testing-junit-2.1.1/pom.xml (rev 0)
+++ tags/openutils-testing-junit-2.1.1/pom.xml 2009-02-17 09:49:28 UTC (rev 1022)
@@ -0,0 +1,69 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>10</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-testing-junit</artifactId>
+ <name>openutils test utils (junit)</name>
+ <version>2.1.1</version>
+ <description>openutils test utils</description>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-testing</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.2.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>2.5.3</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-2.1.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-2.1.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-junit-2.1.1</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-17 09:49:09
|
Revision: 1021
http://openutils.svn.sourceforge.net/openutils/?rev=1021&view=rev
Author: fgiust
Date: 2009-02-17 09:49:06 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-testing-junit-2.1.1
Modified Paths:
--------------
trunk/openutils-testing-junit/pom.xml
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2009-02-17 09:36:19 UTC (rev 1020)
+++ trunk/openutils-testing-junit/pom.xml 2009-02-17 09:49:06 UTC (rev 1021)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -9,7 +8,7 @@
</parent>
<artifactId>openutils-testing-junit</artifactId>
<name>openutils test utils (junit)</name>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.1</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
@@ -61,4 +60,10 @@
</exclusions>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-2.1.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-2.1.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-junit-2.1.1</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-17 09:36:23
|
Revision: 1020
http://openutils.svn.sourceforge.net/openutils/?rev=1020&view=rev
Author: fgiust
Date: 2009-02-17 09:36:19 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-testing-testng/pom.xml
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2009-02-17 09:36:09 UTC (rev 1019)
+++ trunk/openutils-testing-testng/pom.xml 2009-02-17 09:36:19 UTC (rev 1020)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-testing-testng</artifactId>
<name>openutils test utils (testng)</name>
- <version>2.1.1</version>
+ <version>2.1.2-SNAPSHOT</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
@@ -67,10 +67,4 @@
</exclusions>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-2.1.1</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-2.1.1</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-testng-2.1.1</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-17 09:36:13
|
Revision: 1019
http://openutils.svn.sourceforge.net/openutils/?rev=1019&view=rev
Author: fgiust
Date: 2009-02-17 09:36:09 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-testing-testng-2.1.1
Added Paths:
-----------
tags/openutils-testing-testng-2.1.1/
tags/openutils-testing-testng-2.1.1/pom.xml
Removed Paths:
-------------
tags/openutils-testing-testng-2.1.1/pom.xml
Deleted: tags/openutils-testing-testng-2.1.1/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2009-02-13 17:53:26 UTC (rev 998)
+++ tags/openutils-testing-testng-2.1.1/pom.xml 2009-02-17 09:36:09 UTC (rev 1019)
@@ -1,74 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>10</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-testing-testng</artifactId>
- <name>openutils test utils (testng)</name>
- <version>2.1.1-SNAPSHOT</version>
- <description>openutils test utils</description>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-testing</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.7</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.2.2.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>xerces</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <properties>
- <spring.version>2.5.3</spring.version>
- </properties>
-</project>
\ No newline at end of file
Copied: tags/openutils-testing-testng-2.1.1/pom.xml (from rev 1018, trunk/openutils-testing-testng/pom.xml)
===================================================================
--- tags/openutils-testing-testng-2.1.1/pom.xml (rev 0)
+++ tags/openutils-testing-testng-2.1.1/pom.xml 2009-02-17 09:36:09 UTC (rev 1019)
@@ -0,0 +1,76 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>10</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-testing-testng</artifactId>
+ <name>openutils test utils (testng)</name>
+ <version>2.1.1</version>
+ <description>openutils test utils</description>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-testing</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <version>5.7</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.2.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>2.5.3</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-2.1.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-2.1.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-testng-2.1.1</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-17 09:36:01
|
Revision: 1018
http://openutils.svn.sourceforge.net/openutils/?rev=1018&view=rev
Author: fgiust
Date: 2009-02-17 09:35:53 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-testing-testng-2.1.1
Modified Paths:
--------------
trunk/openutils-testing-testng/pom.xml
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2009-02-17 09:32:24 UTC (rev 1017)
+++ trunk/openutils-testing-testng/pom.xml 2009-02-17 09:35:53 UTC (rev 1018)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -9,7 +8,7 @@
</parent>
<artifactId>openutils-testing-testng</artifactId>
<name>openutils test utils (testng)</name>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.1</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
@@ -68,4 +67,10 @@
</exclusions>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-2.1.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-2.1.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-testng-2.1.1</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-17 09:32:27
|
Revision: 1017
http://openutils.svn.sourceforge.net/openutils/?rev=1017&view=rev
Author: fgiust
Date: 2009-02-17 09:32:24 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
update poms for new releases
Modified Paths:
--------------
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-testng/pom.xml
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2009-02-17 09:13:31 UTC (rev 1016)
+++ trunk/openutils-testing-junit/pom.xml 2009-02-17 09:32:24 UTC (rev 1017)
@@ -15,7 +15,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -23,22 +23,6 @@
<version>4.4</version>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.1.ga</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.2.2.0</version>
@@ -47,7 +31,7 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -67,7 +51,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
+ <version>2.5.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -77,7 +61,4 @@
</exclusions>
</dependency>
</dependencies>
- <properties>
- <spring.version>2.5.3</spring.version>
- </properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2009-02-17 09:13:31 UTC (rev 1016)
+++ trunk/openutils-testing-testng/pom.xml 2009-02-17 09:32:24 UTC (rev 1017)
@@ -15,7 +15,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
@@ -38,7 +38,7 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
+ <version>2.5.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -68,7 +68,4 @@
</exclusions>
</dependency>
</dependencies>
- <properties>
- <spring.version>2.5.3</spring.version>
- </properties>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-17 09:13:36
|
Revision: 1016
http://openutils.svn.sourceforge.net/openutils/?rev=1016&view=rev
Author: fgiust
Date: 2009-02-17 09:13:31 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-testing/pom.xml
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2009-02-17 09:13:22 UTC (rev 1015)
+++ trunk/openutils-testing/pom.xml 2009-02-17 09:13:31 UTC (rev 1016)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-testing</artifactId>
<name>openutils test utils</name>
- <version>2.1.1</version>
+ <version>2.1.2-SNAPSHOT</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
@@ -114,10 +114,4 @@
<properties>
<spring.version>2.5.3</spring.version>
</properties>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.1.1</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.1.1</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-2.1.1</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-17 09:13:26
|
Revision: 1015
http://openutils.svn.sourceforge.net/openutils/?rev=1015&view=rev
Author: fgiust
Date: 2009-02-17 09:13:22 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-testing-2.1.1
Added Paths:
-----------
tags/openutils-testing-2.1.1/
tags/openutils-testing-2.1.1/pom.xml
Removed Paths:
-------------
tags/openutils-testing-2.1.1/pom.xml
Deleted: tags/openutils-testing-2.1.1/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2009-02-17 09:05:26 UTC (rev 1013)
+++ tags/openutils-testing-2.1.1/pom.xml 2009-02-17 09:13:22 UTC (rev 1015)
@@ -1,118 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>10</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-testing</artifactId>
- <name>openutils test utils</name>
- <version>2.1.1-SNAPSHOT</version>
- <description>openutils test utils</description>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.5.0</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.2</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit-addons</groupId>
- <artifactId>junit-addons</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>3.0.2-FINAL</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.7</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <properties>
- <spring.version>2.5.3</spring.version>
- </properties>
-</project>
\ No newline at end of file
Copied: tags/openutils-testing-2.1.1/pom.xml (from rev 1014, trunk/openutils-testing/pom.xml)
===================================================================
--- tags/openutils-testing-2.1.1/pom.xml (rev 0)
+++ tags/openutils-testing-2.1.1/pom.xml 2009-02-17 09:13:22 UTC (rev 1015)
@@ -0,0 +1,123 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>10</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-testing</artifactId>
+ <name>openutils test utils</name>
+ <version>2.1.1</version>
+ <description>openutils test utils</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit-addons</groupId>
+ <artifactId>junit-addons</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.0.2-FINAL</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <version>5.7</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <properties>
+ <spring.version>2.5.3</spring.version>
+ </properties>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.1.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.1.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-2.1.1</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-17 09:13:10
|
Revision: 1014
http://openutils.svn.sourceforge.net/openutils/?rev=1014&view=rev
Author: fgiust
Date: 2009-02-17 09:13:05 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-testing-2.1.1
Modified Paths:
--------------
trunk/openutils-testing/pom.xml
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2009-02-17 09:05:26 UTC (rev 1013)
+++ trunk/openutils-testing/pom.xml 2009-02-17 09:13:05 UTC (rev 1014)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -9,7 +8,7 @@
</parent>
<artifactId>openutils-testing</artifactId>
<name>openutils test utils</name>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.1</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
@@ -115,4 +114,10 @@
<properties>
<spring.version>2.5.3</spring.version>
</properties>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.1.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.1.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-2.1.1</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-17 09:05:31
|
Revision: 1013
http://openutils.svn.sourceforge.net/openutils/?rev=1013&view=rev
Author: fgiust
Date: 2009-02-17 09:05:26 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
fixed POI groupId
Modified Paths:
--------------
trunk/openutils-testing/pom.xml
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2009-02-17 09:02:53 UTC (rev 1012)
+++ trunk/openutils-testing/pom.xml 2009-02-17 09:05:26 UTC (rev 1013)
@@ -88,7 +88,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>poi</groupId>
+ <groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.0.2-FINAL</version>
<exclusions>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-17 09:02:58
|
Revision: 1012
http://openutils.svn.sourceforge.net/openutils/?rev=1012&view=rev
Author: fgiust
Date: 2009-02-17 09:02:53 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
automatic switch to *identity operations for ms sqlserver databases
Modified Paths:
--------------
trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java
trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java
trunk/openutils-testing/src/site/changes/changes.xml
Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java 2009-02-17 08:50:04 UTC (rev 1011)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java 2009-02-17 09:02:53 UTC (rev 1012)
@@ -77,7 +77,9 @@
Class< ? extends DatabaseOperation> truncateOperation() default org.dbunit.operation.DeleteAllOperation.class;
/**
- * The database operation that will be used to load datasets. Defaults to org.dbunit.operation.InsertOperation
+ * The database operation that will be used to load datasets. Defaults to org.dbunit.operation.InsertOperation. For
+ * Sql Server databases the default is automatically set to MsSqlIndentityInsertOperation (allow writing of identity
+ * columns).
*/
Class< ? extends DatabaseOperation> insertOperation() default org.dbunit.operation.InsertOperation.class;
Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java 2009-02-17 08:50:04 UTC (rev 1011)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java 2009-02-17 09:02:53 UTC (rev 1012)
@@ -15,6 +15,10 @@
*/
package it.openutils.testing;
+import it.openutils.testing.dbunit.CleanInsertOperation;
+import it.openutils.testing.dbunit.MsSqlIndentityCleanInsertOperation;
+import it.openutils.testing.dbunit.MsSqlIndentityInsertOperation;
+
import java.io.IOException;
import java.net.URL;
import java.sql.SQLException;
@@ -146,6 +150,23 @@
}
DatabaseOperation dbOperation = getDatabaseOperation(dbUnitExecution.insertOperation());
+ String dbtype = connection.getConnection().getMetaData().getDatabaseProductName();
+
+ // default
+ if (InsertOperation.class.equals(dbOperation.getClass()))
+ {
+ if ("Microsoft SQL Server".equals(dbtype))
+ {
+ dbOperation = new MsSqlIndentityInsertOperation();
+ }
+ }
+ else if (CleanInsertOperation.class.equals(dbOperation.getClass()))
+ {
+ if ("Microsoft SQL Server".equals(dbtype))
+ {
+ dbOperation = new MsSqlIndentityCleanInsertOperation();
+ }
+ }
for (String datasetFile : datasets)
{
importDataSet(createDataset(datasetFile), connection, tableFilter, dataSourceName, dbOperation);
Modified: trunk/openutils-testing/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-testing/src/site/changes/changes.xml 2009-02-17 08:50:04 UTC (rev 1011)
+++ trunk/openutils-testing/src/site/changes/changes.xml 2009-02-17 09:02:53 UTC (rev 1012)
@@ -8,7 +8,10 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
- <release version="2.1" date="2008-04-27" description="2.1">
+ <release version="2.1.1" date="2009-02-17" description="2.1.1">
+ <action type="add" dev="fgiust"> Detection of ms sqlserver databases and automatic disabling of identities
+ (switch from CleanInsertOperation to MsSqlIndentityCleanInsertOperation and from InsertOperation to IndentityCleanInsertOperation).</action>
+ </release> <release version="2.1" date="2008-04-27" description="2.1">
<action type="update" dev="fgiust">Legacy base test classes (DbUnitTestCase, GenericsDbUnitTestCase) have been
dropped. Stick with 2.0.x if you are still use them or upgrade to 2.1 for a forced migration</action>
<action type="update" dev="fgiust">Updated spring, slf4j and commons-lang dependencies</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-17 08:50:08
|
Revision: 1011
http://openutils.svn.sourceforge.net/openutils/?rev=1011&view=rev
Author: fgiust
Date: 2009-02-17 08:50:04 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
ignores
Property Changed:
----------------
trunk/openutils-mgnlmessages/
Property changes on: trunk/openutils-mgnlmessages
___________________________________________________________________
Modified: svn:ignore
- target
.settings
.checkstyle
.classpath
.project
+ target
.settings
.checkstyle
.classpath
.project
pom.xml.releaseBackup
release.properties
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-17 08:49:43
|
Revision: 1010
http://openutils.svn.sourceforge.net/openutils/?rev=1010&view=rev
Author: fgiust
Date: 2009-02-17 08:49:38 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
java 5 compatibility
Modified Paths:
--------------
trunk/openutils-log4j/src/main/java/it/openutils/log4j/AlternateSMTPAppender.java
Modified: trunk/openutils-log4j/src/main/java/it/openutils/log4j/AlternateSMTPAppender.java
===================================================================
--- trunk/openutils-log4j/src/main/java/it/openutils/log4j/AlternateSMTPAppender.java 2009-02-15 23:12:20 UTC (rev 1009)
+++ trunk/openutils-log4j/src/main/java/it/openutils/log4j/AlternateSMTPAppender.java 2009-02-17 08:49:38 UTC (rev 1010)
@@ -81,7 +81,6 @@
* </layout>
* </appender>
* </pre>
- *
* @author Fabrizio Giustina
* @version $Id$
*/
@@ -286,7 +285,6 @@
return true;
}
- @Override
public synchronized void close()
{
this.closed = true;
@@ -329,7 +327,6 @@
/**
* The <code>SMTPAppender</code> requires a {@link org.apache.log4j.Layout layout}.
*/
- @Override
public boolean requiresLayout()
{
return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-15 23:12:24
|
Revision: 1009
http://openutils.svn.sourceforge.net/openutils/?rev=1009&view=rev
Author: fgiust
Date: 2009-02-15 23:12:20 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
merged back from branch
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl
Property Changed:
----------------
trunk/openutils-mgnlmedia/
trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddress.ftl
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/
Property changes on: trunk/openutils-mgnlmedia
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/openutils-mgnlmedia-3.6.x:1-982
+ /branches/openutils-mgnlmedia-3.6.x:1-982,1004
Added: svn:mergeinfo
+ /branches/openutils-mgnlmedia-3.6.x:1004
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-02-15 22:52:12 UTC (rev 1008)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2009-02-15 23:12:20 UTC (rev 1009)
@@ -140,8 +140,8 @@
/**
* {@inheritDoc}
*/
+ @Override
@SuppressWarnings("unchecked")
- @Override
public boolean onPostSave(Content media)
{
Collection<NodeData> nds = media.getNodeDataCollection("tags-*");
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddress.ftl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl 2009-02-15 22:52:12 UTC (rev 1008)
+++ trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl 2009-02-15 23:12:20 UTC (rev 1009)
@@ -1,10 +1,10 @@
<!-- line for moving to the bottom -->
<div id="${lineId}" class="mgnlTreeLineInter mgnlLineEnabled" onmouseover="${tree.javascriptTree}.moveNodeHighlightLine('${lineId}');" onmouseout="${tree.javascriptTree}.moveNodeResetLine('${lineId}');"
onmousedown="${tree.javascriptTree}.pasteNode('${tree.path}',${PASTETYPE_SUB},${permissionWrite?string},'${lineId}');"></div>
-
+
<!-- this is needed for IE else you can't scroll. Do not ask me why! -->
<div style="position:absolute;" > </div>
-
+
<!-- do we have write permission on the root? -->
<input type="hidden" name="${tree.javascriptTree}_${tree.path}_PermissionWrite" id="${tree.javascriptTree}_${tree.path}_PermissionWrite" value="${permissionWrite?string}" />
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang:1004
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-15 22:52:14
|
Revision: 1008
http://openutils.svn.sourceforge.net/openutils/?rev=1008&view=rev
Author: fgiust
Date: 2009-02-15 22:52:12 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
Initialized merge tracking via "svnmerge" with revisions "1-982" from
https://openutils.svn.sourceforge.net/svnroot/openutils/branches/openutils-mgnlmedia-3.6.x
Property Changed:
----------------
trunk/openutils-mgnlmedia/
Property changes on: trunk/openutils-mgnlmedia
___________________________________________________________________
Added: svnmerge-integrated
+ /branches/openutils-mgnlmedia-3.6.x:1-982
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-15 22:36:06
|
Revision: 1007
http://openutils.svn.sourceforge.net/openutils/?rev=1007&view=rev
Author: fgiust
Date: 2009-02-15 22:36:02 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
branches/openutils-mgnlmedia-3.6.x/pom.xml
Modified: branches/openutils-mgnlmedia-3.6.x/pom.xml
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/pom.xml 2009-02-15 22:35:53 UTC (rev 1006)
+++ branches/openutils-mgnlmedia-3.6.x/pom.xml 2009-02-15 22:36:02 UTC (rev 1007)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlmedia</artifactId>
<name>openutils-mgnlmedia</name>
- <version>3.6</version>
+ <version>3.6.1-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -17,9 +17,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-3.6</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-3.6</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-3.6</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/branches/openutils-mgnlmedia-3.6.x/</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/branches/openutils-mgnlmedia-3.6.x/</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/branches/openutils-mgnlmedia-3.6.x/</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-15 22:35:55
|
Revision: 1006
http://openutils.svn.sourceforge.net/openutils/?rev=1006&view=rev
Author: fgiust
Date: 2009-02-15 22:35:53 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmedia-3.6
Added Paths:
-----------
tags/openutils-mgnlmedia-3.6/
Property changes on: tags/openutils-mgnlmedia-3.6
___________________________________________________________________
Added: svn:ignore
+ .settings
.checkstyle
.classpath
.project
target
test-output
temp-testng-customsuite.xml
svnmerge-commit-message.txt
release.properties
pom.xml.releaseBackup
Added: svnmerge-integrated
+ /trunk/openutils-mgnlmedia:1-960,999-1000
Added: svn:mergeinfo
+ /trunk/openutils-mgnlmedia:999-1000
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-15 22:34:42
|
Revision: 1005
http://openutils.svn.sourceforge.net/openutils/?rev=1005&view=rev
Author: fgiust
Date: 2009-02-15 22:34:37 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmedia-3.6
Modified Paths:
--------------
branches/openutils-mgnlmedia-3.6.x/pom.xml
Modified: branches/openutils-mgnlmedia-3.6.x/pom.xml
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/pom.xml 2009-02-15 22:33:26 UTC (rev 1004)
+++ branches/openutils-mgnlmedia-3.6.x/pom.xml 2009-02-15 22:34:37 UTC (rev 1005)
@@ -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">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
@@ -10,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlmedia</artifactId>
<name>openutils-mgnlmedia</name>
- <version>0.2-SNAPSHOT</version>
+ <version>3.6</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -18,9 +17,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/branches/openutils-mgnlmedia-3.6.x/</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/branches/openutils-mgnlmedia-3.6.x/</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/branches/openutils-mgnlmedia-3.6.x/</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-3.6</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-3.6</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-3.6</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-15 22:33:31
|
Revision: 1004
http://openutils.svn.sourceforge.net/openutils/?rev=1004&view=rev
Author: fgiust
Date: 2009-02-15 22:33:26 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
merging recent changes
Modified Paths:
--------------
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
branches/openutils-mgnlmedia-3.6.x/src/main/resources/META-INF/magnolia/media.xml
branches/openutils-mgnlmedia-3.6.x/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl
branches/openutils-mgnlmedia-3.6.x/src/main/resources/mgnl-resources/media/js/mootips.js
branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Added Paths:
-----------
branches/openutils-mgnlmedia-3.6.x/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddress.ftl
Property Changed:
----------------
branches/openutils-mgnlmedia-3.6.x/
Property changes on: branches/openutils-mgnlmedia-3.6.x
___________________________________________________________________
Modified: svn:ignore
- .settings
.checkstyle
.classpath
.project
target
test-output
temp-testng-customsuite.xml
svnmerge-commit-message.txt
+ .settings
.checkstyle
.classpath
.project
target
test-output
temp-testng-customsuite.xml
svnmerge-commit-message.txt
release.properties
pom.xml.releaseBackup
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2009-02-15 22:33:26 UTC (rev 1004)
@@ -50,6 +50,8 @@
import net.sourceforge.openutils.mgnlmedia.media.pages.MediaFolderViewPage;
import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.Predicate;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -236,7 +238,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean accept(Content content)
{
try
@@ -260,7 +261,6 @@
/**
* {@inheritDoc}
*/
- @Override
public int compare(Content o1, Content o2)
{
if (sorting.equals(MediaFolderViewPage.SORT_BY_FILENAME))
@@ -337,6 +337,41 @@
return medias;
}
+ @SuppressWarnings("unchecked")
+ public Collection<Content> search(String text, final String type) throws RepositoryException
+ {
+ QueryManager qm = MgnlContext.getQueryManager(MediaModuleLifecycle.REPO);
+ StringBuilder sb = new StringBuilder();
+ sb.append("//*[jcr:contains(.,'");
+ sb.append(StringUtils.replace(text, "'", "''"));
+ sb.append("')] order by @jcr:score descending");
+ Query q = qm.createQuery(sb.toString(), Query.XPATH);
+ QueryResult qr = q.execute();
+ Collection c = qr.getContent(MediaConfigurationManager.MGNL_MEDIA_TYPE);
+
+ if (!StringUtils.isBlank(type))
+ {
+ CollectionUtils.filter(c, new Predicate()
+ {
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean evaluate(Object object)
+ {
+ if (object instanceof Content)
+ {
+ return NodeDataUtil.getString((Content) object, "type").equals(type);
+ }
+ return false;
+ }
+
+ });
+ }
+
+ return c;
+ }
+
/**
* Get the type configuration for a media
* @param media media
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-02-15 22:33:26 UTC (rev 1004)
@@ -298,7 +298,6 @@
/**
* {@inheritDoc}
*/
- @Override
public Object exec(List arguments) throws TemplateModelException
{
if (arguments != null && arguments.size() == 3 && arguments.get(0) instanceof HttpServletRequest)
@@ -325,7 +324,6 @@
/**
* {@inheritDoc}
*/
- @Override
public Object exec(List arguments) throws TemplateModelException
{
if (arguments != null && arguments.size() == 2 && arguments.get(0) instanceof HttpServletRequest)
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java 2009-02-15 22:33:26 UTC (rev 1004)
@@ -41,7 +41,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void start(ModuleLifecycleContext ctx)
{
log.info("Starting module media");
@@ -51,7 +50,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void stop(ModuleLifecycleContext ctx)
{
log.info("Stopping module media");
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2009-02-15 22:33:26 UTC (rev 1004)
@@ -54,6 +54,7 @@
import org.apache.commons.chain.Command;
import org.apache.commons.lang.StringUtils;
+import org.apache.jackrabbit.util.ISO9075;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -113,6 +114,8 @@
private boolean develop;
+ private String search;
+
/**
* @param name
* @param request
@@ -151,7 +154,10 @@
types = MediaConfigurationManager.getInstance().getTypes().values();
}
- fillNumberOfMediaPerType();
+ if (!StringUtils.isBlank(path))
+ {
+ fillNumberOfMediaPerType();
+ }
if (sorting == null)
{
@@ -167,7 +173,9 @@
QueryManager qm = MgnlContext.getQueryManager(MediaModuleLifecycle.REPO);
try
{
- Query q = qm.createQuery(path.substring(1) + "/*[type='" + mtc.getName() + "']", Query.XPATH);
+ Query q = qm.createQuery(
+ ISO9075.encodePath(path.substring(1)) + "/*[type='" + mtc.getName() + "']",
+ Query.XPATH);
QueryResult qr = q.execute();
numberOfMedia.put(mtc.getName(), qr.getContent(MediaConfigurationManager.MEDIA.getSystemName()).size());
@@ -186,25 +194,48 @@
public String show()
{
HierarchyManager hm = MgnlContext.getInstance().getHierarchyManager(MediaModuleLifecycle.REPO);
+ MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
- try
+ Collection<Content> mediasOfType = null;
+ medias = new ArrayList<MediaBean>();
+
+ develop = SystemProperty.getBooleanProperty("magnolia.develop");
+
+ if (!StringUtils.isBlank(path))
{
- Content folder = hm.getContent(this.getPath());
+ try
+ {
+ Content folder = hm.getContent(this.getPath());
- writable = folder.isGranted(Permission.WRITE);
+ writable = folder.isGranted(Permission.WRITE);
+ canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
- canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
+ mediasOfType = MediaConfigurationManager.getInstance().getMediaNodes(folder, type, sorting);
- develop = SystemProperty.getBooleanProperty("magnolia.develop");
+ }
+ catch (RepositoryException ex)
+ {
+ log.error("Exception caught", ex);
+ }
+ }
+ else if (!StringUtils.isBlank(search))
+ {
+ try
+ {
+ writable = false;
+ canPublish = false;
- medias = new ArrayList<MediaBean>();
+ mediasOfType = MediaConfigurationManager.getInstance().search(search, type);
- MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
- Collection<Content> mediasOfType = MediaConfigurationManager.getInstance().getMediaNodes(
- folder,
- type,
- sorting);
+ }
+ catch (RepositoryException ex)
+ {
+ log.error("Exception caught", ex);
+ }
+ }
+ if (mediasOfType != null)
+ {
for (Content media : mediasOfType)
{
MediaBean mb = new MediaBean();
@@ -218,17 +249,23 @@
mb.setDescription(mtc.getHandler().getDescription(media));
mb.setUuid(media.getUUID());
- mb.getUsedInWebPages().addAll(
- MediaConfigurationManager.getInstance().getUsedInWebPages(media.getUUID()));
+ try
+ {
+ mb.setWritable(media.getParent().isGranted(Permission.WRITE));
+ mb.setCanPublish(mb.isWritable()
+ && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber());
+ mb.getUsedInWebPages().addAll(
+ MediaConfigurationManager.getInstance().getUsedInWebPages(media.getUUID()));
+ }
+ catch (RepositoryException ex)
+ {
+ log.error("Exception caught", ex);
+ }
medias.add(mb);
}
+ }
- }
- catch (RepositoryException ex)
- {
- log.error("Exception caught", ex);
- }
return super.show();
}
@@ -557,6 +594,10 @@
private List<String> usedInWebPages = new ArrayList<String>();
+ private boolean canPublish;
+
+ private boolean writable;
+
/**
* Returns the metaData.
* @return the metaData
@@ -719,6 +760,42 @@
this.usedInWebPages = usedInWebPages;
}
+ /**
+ * Returns the canPublish.
+ * @return the canPublish
+ */
+ public boolean isCanPublish()
+ {
+ return canPublish;
+ }
+
+ /**
+ * Sets the canPublish.
+ * @param canPublish the canPublish to set
+ */
+ public void setCanPublish(boolean canPublish)
+ {
+ this.canPublish = canPublish;
+ }
+
+ /**
+ * Returns the writable.
+ * @return the writable
+ */
+ public boolean isWritable()
+ {
+ return writable;
+ }
+
+ /**
+ * Sets the writable.
+ * @param writable the writable to set
+ */
+ public void setWritable(boolean writable)
+ {
+ this.writable = writable;
+ }
+
}
/**
@@ -883,4 +960,22 @@
this.develop = develop;
}
+ /**
+ * Returns the search.
+ * @return the search
+ */
+ public String getSearch()
+ {
+ return search;
+ }
+
+ /**
+ * Sets the search.
+ * @param search the search to set
+ */
+ public void setSearch(String search)
+ {
+ this.search = search;
+ }
+
}
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2009-02-15 22:33:26 UTC (rev 1004)
@@ -43,7 +43,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void save(Content parentNode, Content configNode, String name, MultipartForm form, int type, int valueType,
int isRichEditValue, int encoding) throws RepositoryException, AccessDeniedException
{
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2009-02-15 22:33:26 UTC (rev 1004)
@@ -54,7 +54,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void execute(InstallContext installContext) throws TaskExecutionException
{
HierarchyManager hm = installContext.getHierarchyManager(MediaModuleLifecycle.REPO);
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2009-02-15 22:33:26 UTC (rev 1004)
@@ -56,7 +56,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void execute(InstallContext installContext) throws TaskExecutionException
{
HierarchyManager hm = installContext.getHierarchyManager(MediaModuleLifecycle.REPO);
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2009-02-15 22:33:26 UTC (rev 1004)
@@ -54,7 +54,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String renderHtml(TreeColumn treeColumn, Content content)
{
try
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-02-15 22:33:26 UTC (rev 1004)
@@ -49,7 +49,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void prepareContextMenu(Tree tree, boolean browseMode, HttpServletRequest request)
{
final Messages msgs = getMessages();
@@ -209,7 +208,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void prepareFunctionBar(Tree tree, boolean browseMode, HttpServletRequest request)
{
tree.addFunctionBarItem(FunctionBarItem.getRefreshFunctionBarItem(tree, getMessages(), request));
@@ -218,7 +216,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void prepareTree(Tree tree, boolean browseMode, HttpServletRequest request)
{
final Messages msgs = getMessages();
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java 2009-02-15 22:33:26 UTC (rev 1004)
@@ -44,7 +44,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void init(Content typeDefinitionNode)
{
@@ -53,7 +52,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getUrl(Content media)
{
NodeData file = media.getNodeData("audio");
@@ -67,7 +65,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getUrl(Content media, Map<String, String> options)
{
return getUrl(media);
@@ -76,7 +73,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getFilename(Content media)
{
NodeData file = media.getNodeData("audio");
@@ -86,7 +82,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getExtension(Content media)
{
NodeData file = media.getNodeData("audio");
@@ -96,7 +91,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getFullFilename(Content media)
{
return getFilename(media) + "." + getExtension(media);
@@ -105,7 +99,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getThumbnailUrl(Content media)
{
return "/.resources/media/icons/audioThumb.jpg";
@@ -114,7 +107,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getPreviewUrl(Content media)
{
return getUrl(media);
@@ -143,7 +135,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getNewNodeName(MultipartForm form)
{
return form.getParameter("audio_" + FileProperties.PROPERTY_FILENAME);
@@ -152,7 +143,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean onSavingPropertyMedia(Content media, Content parentNode, Content configNode, String name,
MultipartForm form, int type, int valueType, int isRichEditValue, int encoding) throws RepositoryException,
AccessDeniedException
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2009-02-15 22:33:26 UTC (rev 1004)
@@ -64,7 +64,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getTitle(Content media)
{
return getPropertyLocalized(media, "title");
@@ -73,7 +72,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getTags(Content media)
{
return getPropertyLocalized(media, "tags");
@@ -82,7 +80,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getDescription(Content media)
{
return getPropertyLocalized(media, "description");
@@ -91,7 +88,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getAbstract(Content media)
{
return getPropertyLocalized(media, "abstract");
@@ -101,7 +97,6 @@
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- @Override
public boolean onPostSave(Content media)
{
try
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java 2009-02-15 22:33:26 UTC (rev 1004)
@@ -55,7 +55,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void init(Content typeDefinitionNode)
{
@@ -64,7 +63,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getFilename(Content media)
{
NodeData file = media.getNodeData("image");
@@ -74,7 +72,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getExtension(Content media)
{
NodeData file = media.getNodeData("image");
@@ -84,7 +81,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getFullFilename(Content media)
{
return getFilename(media) + "." + getExtension(media);
@@ -93,7 +89,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getUrl(Content media)
{
NodeData file = media.getNodeData("image");
@@ -107,7 +102,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getUrl(Content media, Map<String, String> options)
{
return getUrl(media);
@@ -116,7 +110,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getThumbnailUrl(Content media)
{
if (!ImageUtils.checkOrCreateResolution(media, "thumbnail"))
@@ -132,7 +125,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getPreviewUrl(Content media)
{
if (!ImageUtils.checkOrCreateResolution(media, "preview"))
@@ -148,8 +140,8 @@
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
@Override
+ @SuppressWarnings("unchecked")
public boolean onPostSave(Content media)
{
Collection<NodeData> nds = media.getNodeDataCollection("tags-*");
@@ -174,7 +166,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void saveFromZipFile(Content media, File f, String cleanFileName, String extension)
throws AccessDeniedException, RepositoryException
{
@@ -189,7 +180,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getNewNodeName(MultipartForm form)
{
return form.getParameter("image_" + FileProperties.PROPERTY_FILENAME);
@@ -198,7 +188,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean onSavingPropertyMedia(final Content media, final Content parentNode, final Content configNode,
final String name, final MultipartForm form, final int type, final int valueType, final int isRichEditValue,
final int encoding) throws RepositoryException, AccessDeniedException
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2009-02-15 22:33:26 UTC (rev 1004)
@@ -47,7 +47,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void init(Content typeDefinitionNode)
{
@@ -56,7 +55,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getUrl(Content media)
{
NodeData file = media.getNodeData("video");
@@ -70,7 +68,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getUrl(Content media, Map<String, String> options)
{
return getUrl(media);
@@ -79,7 +76,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getFilename(Content media)
{
NodeData file = media.getNodeData("video");
@@ -89,7 +85,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getExtension(Content media)
{
NodeData file = media.getNodeData("video");
@@ -99,7 +94,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getFullFilename(Content media)
{
return getFilename(media) + "." + getExtension(media);
@@ -108,7 +102,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getThumbnailUrl(Content media)
{
if (!ImageUtils.checkOrCreateResolution(media, "thumbnail"))
@@ -124,7 +117,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getPreviewUrl(Content media)
{
return getUrl(media);
@@ -153,7 +145,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getNewNodeName(MultipartForm form)
{
return form.getParameter("video_" + FileProperties.PROPERTY_FILENAME);
@@ -162,7 +153,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean onSavingPropertyMedia(Content media, Content parentNode, Content configNode, String name,
MultipartForm form, int type, int valueType, int isRichEditValue, int encoding) throws RepositoryException,
AccessDeniedException
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java 2009-02-15 22:33:26 UTC (rev 1004)
@@ -54,7 +54,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void init(Content typeDefinitionNode)
{
@@ -63,7 +62,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getUrl(Content media)
{
return media.getNodeData("videoUrl").getString();
@@ -72,7 +70,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getUrl(Content media, Map<String, String> options)
{
return getUrl(media);
@@ -81,7 +78,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getFilename(Content media)
{
return getUrl(media);
@@ -90,7 +86,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getExtension(Content media)
{
return null;
@@ -99,7 +94,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getFullFilename(Content media)
{
return null;
@@ -108,7 +102,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getThumbnailUrl(Content media)
{
if (!ImageUtils.checkOrCreateResolution(media, "thumbnail"))
@@ -124,7 +117,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getPreviewUrl(Content media)
{
return getUrl(media);
@@ -148,7 +140,6 @@
/**
* {@inheritDoc}
*/
- @Override
public String getNewNodeName(MultipartForm form)
{
String videoUrl = form.getParameter("videoUrl");
@@ -176,7 +167,6 @@
/**
* {@inheritDoc}
*/
- @Override
public boolean onSavingPropertyMedia(Content media, Content parentNode, Content configNode, String name,
MultipartForm form, int type, int valueType, int isRichEditValue, int encoding) throws RepositoryException,
AccessDeniedException
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-02-15 22:33:26 UTC (rev 1004)
@@ -450,7 +450,6 @@
/**
* {@inheritDoc}
*/
- @Override
public void exec()
{
HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/resources/META-INF/magnolia/media.xml
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/resources/META-INF/magnolia/media.xml 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/resources/META-INF/magnolia/media.xml 2009-02-15 22:33:26 UTC (rev 1004)
@@ -10,11 +10,11 @@
<dependencies>
<dependency>
<name>adminInterface</name>
- <version>3.1/*</version>
+ <version>3.6/*</version>
</dependency>
<dependency>
<name>cache</name>
- <version>3.1/*</version>
+ <version>3.6/*</version>
</dependency>
</dependencies>
<repositories>
Added: branches/openutils-mgnlmedia-3.6.x/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddress.ftl
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddress.ftl (rev 0)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddress.ftl 2009-02-15 22:33:26 UTC (rev 1004)
@@ -0,0 +1,2 @@
+<img src="${contextPath}/.resources/0.gif" height="3px"/>
+<input id="${tree.javascriptTree}SearchBar" type="text" onkeydown="if (mgnlIsKeyEnter(event)) parent.search(this.value);" class="mgnlDialogControlEdit" style="width:100%;" value="" />
\ No newline at end of file
Property changes on: branches/openutils-mgnlmedia-3.6.x/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddress.ftl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl 2009-02-15 22:33:26 UTC (rev 1004)
@@ -1,10 +1,10 @@
<!-- line for moving to the bottom -->
<div id="${lineId}" class="mgnlTreeLineInter mgnlLineEnabled" onmouseover="${tree.javascriptTree}.moveNodeHighlightLine('${lineId}');" onmouseout="${tree.javascriptTree}.moveNodeResetLine('${lineId}');"
onmousedown="${tree.javascriptTree}.pasteNode('${tree.path}',${PASTETYPE_SUB},${permissionWrite?string},'${lineId}');"></div>
-
+
<!-- this is needed for IE else you can't scroll. Do not ask me why! -->
<div style="position:absolute;" > </div>
-
+
<!-- do we have write permission on the root? -->
<input type="hidden" name="${tree.javascriptTree}_${tree.path}_PermissionWrite" id="${tree.javascriptTree}_${tree.path}_PermissionWrite" value="${permissionWrite?string}" />
@@ -21,7 +21,11 @@
${menu.html}
</#if>
-<#if tree.browseMode && !selectMedia>
+<#if tree.browseMode && selectMedia?exists && selectMedia>
+ <#include "MediaTreeAddress.ftl"/>
+</#if>
+
+<#if tree.browseMode && (!selectMedia?exists || !selectMedia)>
<#include "TreeAddressBar.ftl"/>
</#if>
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/resources/mgnl-resources/media/js/mootips.js
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/resources/mgnl-resources/media/js/mootips.js 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/resources/mgnl-resources/media/js/mootips.js 2009-02-15 22:33:26 UTC (rev 1004)
@@ -1,22 +1,45 @@
var TipsEx = new Class( {
- Extends :Tips,
+ Extends :Tips,
- initialize : function(elements, options) {
- this.parent(elements, options);
- this.tip.addEvents( {
- mouseenter :this.enterTip.bind(this),
- mouseleave :this.leaveTip.bind(this)
- });
- },
+ initialize : function(elements, options) {
+ this.parent(elements, options);
+ this.tip.addEvents( {
+ mouseenter :this.enterTip.bind(this),
+ mouseleave :this.leaveTip.bind(this)
+ });
+ },
- enterTip : function() {
- this.timer = $clear(this.timer);
- },
+ enterTip : function() {
+ this.timer = $clear(this.timer);
+ },
- leaveTip : function() {
- $clear(this.timer);
- this.timer = this.hide.delay(this.options.hideDelay, this);
- }
+ leaveTip : function() {
+ $clear(this.timer);
+ this.timer = this.hide.delay(this.options.hideDelay, this);
+ },
+ position : function(event) {
+ var size = window.getSize(), scroll = window.getScroll();
+ var tip = {
+ x :this.tip.offsetWidth,
+ y :this.tip.offsetHeight
+ };
+ var props = {
+ x :'left',
+ y :'top'
+ };
+ for ( var z in props) {
+ var pos = event.page[z] + this.options.offsets[z];
+ if ((pos + tip[z] - scroll[z]) > size[z]) {
+ pos = pos - ((pos + tip[z] - scroll[z]) - size[z]);
+ if (pos < 0)
+ {
+ pos = 0;
+ }
+ }
+ this.tip.setStyle(props[z], pos);
+ }
+ }
+
});
\ No newline at end of file
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2009-02-15 22:33:26 UTC (rev 1004)
@@ -29,6 +29,21 @@
return url;
}
+function search(textToSearch) {
+ viewport.getComponent('center-panel').setTitle("Search results for : "+ textToSearch);
+
+ var url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html?search="+ textToSearch + "&mgnlCK=" + (new Date()).getTime();
+ if (selectMedia)
+ {
+ url += "&selectMedia=true&actMediaHandle="+ actMediaHandle;
+ }
+ if (mediaType != null && mediaType != 'null')
+ {
+ url += "&mediaType=" + mediaType;
+ }
+ frames['mediaFolderView'].location.href = url;
+}
+
Ext.onReady(function(){
Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2009-02-15 22:01:47 UTC (rev 1003)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2009-02-15 22:33:26 UTC (rev 1004)
@@ -13,59 +13,59 @@
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/multibox/multibox.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/multibox/overlay.js"></script>
<script type="text/javascript"> <#list this.types as type> <#if type.name == this.type> <#assign currentType = type> </#if> </#list>
-
+
function openDialog(path) {
parent.openWindow(".magnolia/dialogs/${currentType.dialog}.html?mgnlPath=" + path
+ "&mgnlRepository=media");
}
-
+
function openMediaTree(action, path) {
parent.openWindow(".magnolia/pages/mediaFolderSelection.html?sourceNode="+ path +"&action="+ action +"&mgnlCK=" + (new Date()).getTime());
}
-
+
function performAction(action, source, dest)
{
- if (action == "move" && dest == "${this.path}")
+ if (action == "move" && dest == "${this.path!""}")
{
alert("Non è possibile spostare all'interno dello stesso nodo.");
return;
- }
+ }
$("actionCmd").value = action;
$("actionNode").value = source;
$("actionDest").value = dest;
$("actionForm").submit();
}
-
+
function deleteMedia(source) {
if (confirm("Sei sicuro di voler eliminare l'immagine?"))
{
performAction("delete", source, "");
}
}
-
+
function selectMedia(uuid, thumb, file)
{
parent.setNewMedia(uuid, thumb, file);
}
-
+
var isTreeCollapsed = false;
-
+
window.addEvent(Browser.Engine.name == 'trident' ? 'load' : 'domready', function(){
var multibox = new MultiBox('multibox', {
path: '${this.request.contextPath}/.resources/media/players/',
- useOverlay: true,
+ useOverlay: true,
onOpen: function(){
isTreeCollapsed = parent.isTreeCollapsed();
if (!isTreeCollapsed)
{
parent.setTreeCollapsed(true);
- }
+ }
},
onClose: function(){
if (!isTreeCollapsed)
{
parent.setTreeCollapsed(false);
- }
+ }
}
});
@@ -80,36 +80,37 @@
showDelay: 100,
hideDelay: 200
});
-
+
});
-
+
</script>
</head>
<body>
<form action="" style="display:none" id="actionForm">
<input type="hidden" id="actionCmd" name="command" value="delete" />
- <input type="hidden" id="actionPath" name="path" value="${this.path}" />
+ <input type="hidden" id="actionPath" name="path" value="${this.path!""}" />
+ <input type="hidden" id="actionSearch" name="search" value="${this.search!""}" />
<input type="hidden" id="actionNode" name="node" />
<input type="hidden" id="actionDest" name="dest" />
<input type="hidden" name="type" value="${this.type}" />
</form>
<div id="navigation">
- <#list this.types as type>
- <#if type.name == this.type>
- <#assign actual = "actual">
- <#else>
+ <#list this.types as type>
+ <#if type.name == this.type>
+ <#assign actual = "actual">
+ <#else>
<#assign actual = "">
</#if>
<div class="voice ${actual}">
- <#if this.request.parameterMap['selectMedia']?exists>
- <a href="?type=${type.name}&path=${this.path}&selectMedia=true">
+ <#if this.request.parameterMap['selectMedia']?exists>
+ <a href="?type=${type.name}&path=${this.path!""}&selectMedia=true&search=${this.search!""}">
<img src="${this.request.contextPath}${type.menuIcon}" border="0" align="absmiddle" />
- ${this.msgs.get('media.types.' + type.name)} (${this.numberOfMedia[type.name]!'0'})
+ ${this.msgs.get('media.types.' + type.name)} <#if this.numberOfMedia?exists>(${this.numberOfMedia[type.name]!'0'})</#if>
</a>
<#else>
- <a href="?type=${type.name}&path=${this.path}">
+ <a href="?type=${type.name}&path=${this.path!""}&search=${this.search!""}">
<img src="${this.request.contextPath}${type.menuIcon}" border="0" align="absmiddle" />
- ${this.msgs.get('media.types.' + type.name)} (${this.numberOfMedia[type.name]!'0'})
+ ${this.msgs.get('media.types.' + type.name)} <#if this.numberOfMedia?exists>(${this.numberOfMedia[type.name]!'0'})</#if>
</a>
</#if>
</div>
@@ -118,17 +119,17 @@
</div>
<ul class="mediaList">
<#assign index = 0>
- <#list this.medias as media>
- <#if media.filename?length gt 18>
+ <#list this.medias as media>
+ <#if media.filename?length gt 18>
<#assign name = media.filename?substring(0,15)>
- <#assign name = name?right_pad(18, ".")>
- <#else>
- <#assign name = media.filename>
+ <#assign name = name?right_pad(18, ".")>
+ <#else>
+ <#assign name = media.filename>
</#if>
<#assign index = index + 1 >
- <#assign mediaStatusClass = "">
+ <#assign mediaStatusClass = "">
<#if this.selectMedia && !this.develop>
- <#assign mediaStatusClass = "mediaStatus${media.metaData.activationStatus}">
+ <#assign mediaStatusClass = "mediaStatus${media.metaData.activationStatus}">
</#if>
<li class="media ${mediaStatusClass}" style="text-align:center">
<div class="imageBorder">
@@ -150,7 +151,7 @@
${this.msgs.get('media.select')}
</a>
<#else>
- <#if this.canPublish && media.metaData.activationStatus < 2>
+ <#if media.canPublish && media.metaData.activationStatus < 2>
<a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="pubblica">
<img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" border="0" align="middle" />
</a>
@@ -159,7 +160,7 @@
</#if>
</#if>
<#else>
- <#if this.writable>
+ <#if media.writable>
<a href="javascript:$empty()" onclick="openDialog('${media.handle}')" title="${this.msgs.get('media.edit')}">
<img src="${this.request.contextPath}/.resources/media/icons/edit.gif" border="0" align="middle" />
</a>
@@ -185,8 +186,8 @@
<a>
<img src="${this.request.contextPath}/.resources/icons/16/copy_inactive.gif" border="0" align="middle" />
</a>
- </#if>
- <#if this.canPublish>
+ </#if>
+ <#if media.canPublish>
<a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="${this.msgs.get('media.activate')}">
<img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" border="0" align="middle" />
</a>
@@ -196,7 +197,7 @@
align="middle" />
</a>
</#if>
- <#if this.canPublish && media.metaData.activationStatus = 2>
+ <#if media.canPublish && media.metaData.activationStatus = 2>
<a href="javascript:$empty()" onclick="performAction('deactivate', '${media.handle}','')" title="${this.msgs.get('media.deactivate')}">
<img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red.gif" border="0" align="middle" />
</a>
@@ -208,13 +209,13 @@
</#if>
</#if>
</div>
- <div class="used">
+ <div class="used">
<#if media.usedInWebPages?size = 0>
<span>${this.msgs.get('media.nopages')}</span>
- <#else>
+ <#else>
<#assign pages = "">
<#list media.usedInWebPages as page>
- <#assign pages = pages + "<a href='${this.request.contextPath}" + page +".html' target='_blank'>"+ page +"</a><br/>">
+ <#assign pages = pages + "<a href='${this.request.contextPath}" + page +".html' target='_blank'>"+ page +"</a><br/>">
</#list>
<span class="tips" rel="${pages}">${this.msgs.get('media.pages')} (${media.usedInWebPages?size})</span>
</#if>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-02-15 22:23:21
|
Revision: 1002
http://openutils.svn.sourceforge.net/openutils/?rev=1002&view=rev
Author: fgiust
Date: 2009-02-15 21:55:30 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
Merged revisions 999-1000 via svnmerge from
https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia
........
r999 | fgiust | 2009-02-15 21:58:20 +0100 (Sun, 15 Feb 2009) | 1 line
adding support for CMYK/YCCK jpegs
........
r1000 | fgiust | 2009-02-15 22:33:35 +0100 (Sun, 15 Feb 2009) | 1 line
changelog
........
Modified Paths:
--------------
branches/openutils-mgnlmedia-3.6.x/pom.xml
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
branches/openutils-mgnlmedia-3.6.x/src/site/changes/changes.xml
Added Paths:
-----------
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java
branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java
branches/openutils-mgnlmedia-3.6.x/src/test/java/net/
branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/
branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/
branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/
branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/
branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/
branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
branches/openutils-mgnlmedia-3.6.x/src/test/resources/images/
branches/openutils-mgnlmedia-3.6.x/src/test/resources/images/badimage.jpg
branches/openutils-mgnlmedia-3.6.x/src/test/resources/images/badimage.txt
branches/openutils-mgnlmedia-3.6.x/src/test/resources/images/ycck.jpg
Removed Paths:
-------------
branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/
branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/
branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/
branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/
branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/
branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
branches/openutils-mgnlmedia-3.6.x/src/test/resources/images/badimage.jpg
branches/openutils-mgnlmedia-3.6.x/src/test/resources/images/badimage.txt
branches/openutils-mgnlmedia-3.6.x/src/test/resources/images/ycck.jpg
Property Changed:
----------------
branches/openutils-mgnlmedia-3.6.x/
branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/
Property changes on: branches/openutils-mgnlmedia-3.6.x
___________________________________________________________________
Modified: svn:ignore
-
.settings
.checkstyle
.classpath
.project
target
+ .settings
.checkstyle
.classpath
.project
target
test-output
temp-testng-customsuite.xml
Modified: svnmerge-integrated
- /trunk/openutils-mgnlmedia:1-960
+ /trunk/openutils-mgnlmedia:1-960,999-1000
Added: svn:mergeinfo
+ /trunk/openutils-mgnlmedia:999-1000
Modified: branches/openutils-mgnlmedia-3.6.x/pom.xml
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/pom.xml 2009-02-15 21:42:05 UTC (rev 1001)
+++ branches/openutils-mgnlmedia-3.6.x/pom.xml 2009-02-15 21:55:30 UTC (rev 1002)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils</artifactId>
@@ -56,6 +57,11 @@
<version>2.1</version>
</dependency>
<dependency>
+ <groupId>com.drewnoakes</groupId>
+ <artifactId>metadata-extractor</artifactId>
+ <version>2.4.0-beta-1</version>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<classifier>jdk15</classifier>
Copied: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java (from rev 1000, trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java)
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java (rev 0)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/BadImageFormatException.java 2009-02-15 21:55:30 UTC (rev 1002)
@@ -0,0 +1,32 @@
+package net.sourceforge.openutils.mgnlmedia.media.utils;
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class BadImageFormatException extends RuntimeException
+{
+
+ /**
+ * Stable serialVersionUID.
+ */
+ private static final long serialVersionUID = 42L;
+
+ /**
+ * @param message
+ */
+ public BadImageFormatException(String message)
+ {
+ super(message);
+ }
+
+ /**
+ * @param message
+ * @param cause
+ */
+ public BadImageFormatException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+}
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-02-15 21:42:05 UTC (rev 1001)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-02-15 21:55:30 UTC (rev 1002)
@@ -52,6 +52,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.ClassUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
@@ -365,7 +366,7 @@
}
}
- private static InputStream getStream(BufferedImage image, String extension) throws IOException
+ public static InputStream getStream(BufferedImage image, String extension) throws IOException
{
ByteArrayOutputStream bos = new ByteArrayOutputStream();
BufferedOutputStream out = new BufferedOutputStream(bos);
@@ -499,16 +500,9 @@
}
extension = "jpg";
}
- BufferedImage original;
- try
- {
- original = ImageIO.read(image.getStream());
- }
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
+ BufferedImage original = createBufferedImage(image);
+
String resolutionName = "res-" + resolution;
BufferedImage img = ImageUtils.getImageForResolution(original, resolution);
@@ -619,4 +613,36 @@
return "jpg";
}
}
+
+ /**
+ * @param image
+ * @return
+ */
+ public static BufferedImage createBufferedImage(NodeData image)
+ {
+ InputStream is = image.getStream();
+ try
+ {
+ return ImageIO.read(is);
+ }
+ catch (IOException e)
+ {
+ // CMYK jpeg can't be read be ImageIO
+ // Caused by: javax.imageio.IIOException: Unsupported Image Type
+ BufferedImage result = JpegUtils.processNonStandardImage(image);
+
+ if (result == null)
+ {
+ // throw the original exception back
+ throw new BadImageFormatException("Unable to handle " + image.getHandle(), e);
+ }
+ return result;
+
+ }
+ finally
+ {
+ IOUtils.closeQuietly(is);
+ }
+ }
+
}
Copied: branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java (from rev 1000, trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java)
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java (rev 0)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/JpegUtils.java 2009-02-15 21:55:30 UTC (rev 1002)
@@ -0,0 +1,198 @@
+package net.sourceforge.openutils.mgnlmedia.media.utils;
+
+import info.magnolia.cms.core.NodeData;
+
+import java.awt.Transparency;
+import java.awt.color.ColorSpace;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.awt.image.ComponentColorModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.DataBufferByte;
+import java.awt.image.Raster;
+import java.awt.image.WritableRaster;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.drew.imaging.jpeg.JpegProcessingException;
+import com.drew.imaging.jpeg.JpegSegmentReader;
+
+
+/**
+ * Utility class for handling of CMYK/YCCK jpegs.
+ * @author fgiust
+ * @version $Id$
+ */
+public class JpegUtils
+{
+
+ /**
+ * Logger.
+ */
+ private static Logger log = LoggerFactory.getLogger(JpegUtils.class);
+
+ /**
+ * Java's ImageIO can't process 4-component images and Java2D can't apply AffineTransformOp either, so convert
+ * raster data to RGB. Technique due to MArk Stephens. Free for any use. See
+ * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4799903 or
+ * http://www.mail-archive.com/jav...@ca.../msg03247.html
+ */
+ public static BufferedImage createJPEG4(Raster raster, boolean ycckProfile)
+ {
+ int w = raster.getWidth();
+ int h = raster.getHeight();
+ byte[] rgb = new byte[w * h * 3];
+
+ // if (Adobe_APP14 and transform==2) then YCCK else CMYK
+ if (ycckProfile)
+ { // YCCK -- Adobe
+
+ float[] Y = raster.getSamples(0, 0, w, h, 0, (float[]) null);
+ float[] Cb = raster.getSamples(0, 0, w, h, 1, (float[]) null);
+ float[] Cr = raster.getSamples(0, 0, w, h, 2, (float[]) null);
+ float[] K = raster.getSamples(0, 0, w, h, 3, (float[]) null);
+
+ for (int i = 0, imax = Y.length, base = 0; i < imax; i++, base += 3)
+ {
+ float k = 220 - K[i], y = 255 - Y[i], cb = 255 - Cb[i], cr = 255 - Cr[i];
+
+ double val = y + 1.402 * (cr - 128) - k;
+ val = (val - 128) * .65f + 128;
+ rgb[base] = val < 0.0 ? (byte) 0 : val > 255.0 ? (byte) 0xff : (byte) (val + 0.5);
+
+ val = y - 0.34414 * (cb - 128) - 0.71414 * (cr - 128) - k;
+ val = (val - 128) * .65f + 128;
+ rgb[base + 1] = val < 0.0 ? (byte) 0 : val > 255.0 ? (byte) 0xff : (byte) (val + 0.5);
+
+ val = y + 1.772 * (cb - 128) - k;
+ val = (val - 128) * .65f + 128;
+ rgb[base + 2] = val < 0.0 ? (byte) 0 : val > 255.0 ? (byte) 0xff : (byte) (val + 0.5);
+ }
+
+ }
+ else
+ {
+ // assert xform==0: xform; // CMYK
+
+ int[] C = raster.getSamples(0, 0, w, h, 0, (int[]) null);
+ int[] M = raster.getSamples(0, 0, w, h, 1, (int[]) null);
+ int[] Y = raster.getSamples(0, 0, w, h, 2, (int[]) null);
+ int[] K = raster.getSamples(0, 0, w, h, 3, (int[]) null);
+
+ for (int i = 0, imax = C.length, base = 0; i < imax; i++, base += 3)
+ {
+ int c = 255 - C[i];
+ int m = 255 - M[i];
+ int y = 255 - Y[i];
+ int k = 255 - K[i];
+ float kk = k / 255f;
+
+ rgb[base] = (byte) (255 - Math.min(255f, c * kk + k));
+ rgb[base + 1] = (byte) (255 - Math.min(255f, m * kk + k));
+ rgb[base + 2] = (byte) (255 - Math.min(255f, y * kk + k));
+ }
+ }
+
+ // from other image types we know InterleavedRaster's can be
+ // manipulated by AffineTransformOp, so create one of those.
+ raster = Raster.createInterleavedRaster(
+ new DataBufferByte(rgb, rgb.length),
+ w,
+ h,
+ w * 3,
+ 3,
+ new int[]{0, 1, 2 },
+ null);
+
+ ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
+ ColorModel cm = new ComponentColorModel(cs, false, true, Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
+ return new BufferedImage(cm, (WritableRaster) raster, true, null);
+ }
+
+ /**
+ * @param image
+ */
+ public static BufferedImage processNonStandardImage(NodeData image)
+ {
+ InputStream is2 = image.getStream();
+ try
+ {
+ // Get an ImageReader.
+ ImageInputStream input = ImageIO.createImageInputStream(is2);
+ Iterator readers = ImageIO.getImageReaders(input);
+ if (readers == null || !readers.hasNext())
+ {
+ throw new RuntimeException("No ImageReaders found");
+ }
+
+ ImageReader reader = (ImageReader) readers.next();
+ reader.setInput(input);
+ String format = reader.getFormatName();
+
+ if ("JPEG".equalsIgnoreCase(format) || "JPG".equalsIgnoreCase(format))
+ {
+ Raster raster = reader.readRaster(0, reader.getDefaultReadParam());
+ boolean ycckProfile = false;
+
+ // yes, we need to read it once again to extract metadatas
+ InputStream is3 = image.getStream();
+ try
+ {
+
+ JpegSegmentReader segmentReader = new JpegSegmentReader(is3);
+ byte[] exifSegment = segmentReader.readSegment(JpegSegmentReader.SEGMENT_APPE);
+
+ switch (exifSegment[11])
+ {
+ case 2 :
+ ycckProfile = true;
+ break;
+ case 1 :
+ // "YCbCr"
+ break;
+ case 0 :
+ default :
+ // Unknown (RGB or CMYK)
+ break;
+ }
+ }
+ catch (JpegProcessingException e1)
+ {
+ log.warn("Unable to read color space");
+ }
+ finally
+ {
+ IOUtils.closeQuietly(is3);
+ }
+
+ if (input != null)
+ {
+ input.close();
+ }
+ reader.dispose();
+
+ return createJPEG4(raster, ycckProfile);
+ }
+ throw new BadImageFormatException("No ImageReaders found for " + image.getHandle());
+
+ }
+ catch (IOException e1)
+ {
+ log.error("Unable to handle " + image.getHandle() + ": " + e1.getMessage(), e1);
+ throw new BadImageFormatException(image.getHandle(), e1);
+ }
+ finally
+ {
+ IOUtils.closeQuietly(is2);
+ }
+ }
+}
Property changes on: branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang:999-1000
Modified: branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2009-02-15 21:42:05 UTC (rev 1001)
+++ branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2009-02-15 21:55:30 UTC (rev 1002)
@@ -9,16 +9,16 @@
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/miframe.js"></script>
<script type="text/javascript">
// <![CDATA[
-var viewport;
-var nodeid = "${this.nodeid!''}";
-var selectMedia = ${this.selectMedia?string("true", "false")};
-var openPath = "${this.openPath!''}";
-var actMediaHandle = "${this.actMediaHandle!''}";
-var mediaType = "${this.mediaType!''}"; // get tree url
-function getTreeUrl() {
- var url = "${this.request.contextPath}/.magnolia/trees/media.html?mgnlCK=" + (new Date()).getTime();
+var viewport;
+var nodeid = "${this.nodeid!''}";
+var selectMedia = ${this.selectMedia?string("true", "false")};
+var openPath = "${this.openPath!''}";
+var actMediaHandle = "${this.actMediaHandle!''}";
+var mediaType = "${this.mediaType!''}"; // get tree url
+function getTreeUrl() {
+ var url = "${this.request.contextPath}/.magnolia/trees/media.html?mgnlCK=" + (new Date()).getTime();
if (selectMedia)
- {
+ {
url += "&selectMedia=true";
}
url += "&pathOpen="+ openPath +"&pathCurrent=" + openPath +"&pathSelected=" + openPath;
@@ -196,12 +196,12 @@
bodyBorder: false,
buttons: [
{
- text: "${this.msgs.get('buttons.ok')}",
+ text: "${this.msgs.get('buttons.ok')}",
handler: function() {
uploadDlg.hide();
var ch = uploadDlg.body.child(".formToSubmit");
ch.dom.submit();
- }
+ }
}, {text: "${this.msgs.get('buttons.cancel')}", handler: function() {uploadDlg.hide();uploadDlg.destroy();} }],
keys: [],//{key: 27, fn: function() {ulDialog.hide();ulDialog.destroy();}, scope: this}]
stateful: false
@@ -217,7 +217,7 @@
<iframe id="mediaFolderView" name="mediaFolderView" class="x-panel-body" src=""
style="width:100%;height:100%;border:none; overflow:auto"></iframe>
<div id="formDiv" style="display:none">
- <form class="formToSubmit" action="" enctype="multipart/form-data" method="POST">
+ <form class="formToSubmit" action="" enctype="multipart/form-data" method="post">
<input type="hidden" name="command" value="saveZip" />
<input id="parentPath" type="hidden" name="parentPath" value="{parentPath}" />
<input type="file" name="zipFile" />
Modified: branches/openutils-mgnlmedia-3.6.x/src/site/changes/changes.xml
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/site/changes/changes.xml 2009-02-15 21:42:05 UTC (rev 1001)
+++ branches/openutils-mgnlmedia-3.6.x/src/site/changes/changes.xml 2009-02-15 21:55:30 UTC (rev 1002)
@@ -11,5 +11,9 @@
<release version="0.1" date="2008-12-04" description="">
<action type="add" dev="fgiust">first alpha release</action>
</release>
+ <release version="3.6" date="2009-02-15" description="">
+ <action type="add" dev="fgiust">Added support for reading CMYK/YCCK jpegs</action>
+ <action type="update" dev="fgiust">Stable release for Magnolia 3.6.x</action>
+ </release>
</body>
</document>
\ No newline at end of file
Deleted: branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
===================================================================
--- trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java 2009-02-15 21:33:35 UTC (rev 1000)
+++ branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java 2009-02-15 21:55:30 UTC (rev 1002)
@@ -1,384 +0,0 @@
-package net.sourceforge.openutils.mgnlmedia.media.utils;
-
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.security.AccessDeniedException;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Calendar;
-import java.util.Collection;
-
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.Property;
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-
-import org.apache.commons.io.IOUtils;
-
-
-/**
- * @author fgiust
- * @version $Id$
- */
-public class FileNodeData implements NodeData
-{
-
- private byte[] content;
-
- public FileNodeData(String classpathLocation) throws IOException
- {
- InputStream is = getClass().getResourceAsStream(classpathLocation);
- if (is == null)
- {
- throw new IllegalArgumentException("Classpath resource " + classpathLocation + " cannot be found");
- }
- try
- {
- content = IOUtils.toByteArray(is);
- }
- finally
- {
- IOUtils.closeQuietly(is);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public void delete() throws RepositoryException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public String getAttribute(String arg0)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection getAttributeNames() throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean getBoolean()
- {
- // TODO Auto-generated method stub
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- public long getContentLength()
- {
- // TODO Auto-generated method stub
- return 0;
- }
-
- /**
- * {@inheritDoc}
- */
- public Calendar getDate()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public double getDouble()
- {
- // TODO Auto-generated method stub
- return 0;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getHandle()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public HierarchyManager getHierarchyManager() throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property getJCRProperty()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public long getLong()
- {
- // TODO Auto-generated method stub
- return 0;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getName()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Content getParent() throws AccessDeniedException, ItemNotFoundException, javax.jcr.AccessDeniedException,
- RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Content getReferencedContent() throws RepositoryException, PathNotFoundException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Content getReferencedContent(String arg0) throws PathNotFoundException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public InputStream getStream()
- {
- return new ByteArrayInputStream(content);
- }
-
- /**
- * {@inheritDoc}
- */
- public String getString()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getString(String arg0)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public int getType()
- {
- // TODO Auto-generated method stub
- return 0;
- }
-
- /**
- * {@inheritDoc}
- */
- public Value getValue()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Value[] getValues()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isExist()
- {
- // TODO Auto-generated method stub
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isGranted(long arg0)
- {
- // TODO Auto-generated method stub
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- public int isMultiValue()
- {
- // TODO Auto-generated method stub
- return 0;
- }
-
- /**
- * {@inheritDoc}
- */
- public void refresh(boolean arg0) throws RepositoryException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public void save() throws RepositoryException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public void setAttribute(String arg0, String arg1) throws RepositoryException, AccessDeniedException,
- UnsupportedOperationException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public void setAttribute(String arg0, Calendar arg1) throws RepositoryException, AccessDeniedException,
- UnsupportedOperationException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public void setValue(String arg0) throws RepositoryException, AccessDeniedException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public void setValue(int arg0) throws RepositoryException, AccessDeniedException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public void setValue(long arg0) throws RepositoryException, AccessDeniedException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public void setValue(InputStream arg0) throws RepositoryException, AccessDeniedException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public void setValue(double arg0) throws RepositoryException, AccessDeniedException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public void setValue(boolean arg0) throws RepositoryException, AccessDeniedException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public void setValue(Calendar arg0) throws RepositoryException, AccessDeniedException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public void setValue(Value arg0) throws RepositoryException, AccessDeniedException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public void setValue(Value[] arg0) throws RepositoryException, AccessDeniedException
- {
- // TODO Auto-generated method stub
-
- }
-
-}
Copied: branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java (from rev 1000, trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java)
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java (rev 0)
+++ branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java 2009-02-15 21:55:30 UTC (rev 1002)
@@ -0,0 +1,384 @@
+package net.sourceforge.openutils.mgnlmedia.media.utils;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.NodeData;
+import info.magnolia.cms.security.AccessDeniedException;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Calendar;
+import java.util.Collection;
+
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.PathNotFoundException;
+import javax.jcr.Property;
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+
+import org.apache.commons.io.IOUtils;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class FileNodeData implements NodeData
+{
+
+ private byte[] content;
+
+ public FileNodeData(String classpathLocation) throws IOException
+ {
+ InputStream is = getClass().getResourceAsStream(classpathLocation);
+ if (is == null)
+ {
+ throw new IllegalArgumentException("Classpath resource " + classpathLocation + " cannot be found");
+ }
+ try
+ {
+ content = IOUtils.toByteArray(is);
+ }
+ finally
+ {
+ IOUtils.closeQuietly(is);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void delete() throws RepositoryException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getAttribute(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Collection getAttributeNames() throws RepositoryException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean getBoolean()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public long getContentLength()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Calendar getDate()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public double getDouble()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getHandle()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public HierarchyManager getHierarchyManager() throws RepositoryException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Property getJCRProperty()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public long getLong()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getName()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Content getParent() throws AccessDeniedException, ItemNotFoundException, javax.jcr.AccessDeniedException,
+ RepositoryException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Content getReferencedContent() throws RepositoryException, PathNotFoundException, RepositoryException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Content getReferencedContent(String arg0) throws PathNotFoundException, RepositoryException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public InputStream getStream()
+ {
+ return new ByteArrayInputStream(content);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getString()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getString(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getType()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Value getValue()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Value[] getValues()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isExist()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isGranted(long arg0)
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int isMultiValue()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void refresh(boolean arg0) throws RepositoryException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void save() throws RepositoryException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setAttribute(String arg0, String arg1) throws RepositoryException, AccessDeniedException,
+ UnsupportedOperationException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setAttribute(String arg0, Calendar arg1) throws RepositoryException, AccessDeniedException,
+ UnsupportedOperationException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(String arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(int arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(long arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(InputStream arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(double arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(boolean arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(Calendar arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(Value arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setValue(Value[] arg0) throws RepositoryException, AccessDeniedException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Deleted: branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
===================================================================
--- trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java 2009-02-15 21:33:35 UTC (rev 1000)
+++ branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java 2009-02-15 21:55:30 UTC (rev 1002)
@@ -1,64 +0,0 @@
-package net.sourceforge.openutils.mgnlmedia.media.utils;
-
-import info.magnolia.cms.core.NodeData;
-
-import java.awt.image.BufferedImage;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.commons.io.IOUtils;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-
-/**
- * @author fgiust
- * @version $Id$
- */
-public class ImageUtilsTest
-{
-
- @Test
- public void testYcck() throws Exception
- {
-
- NodeData cmyk = new FileNodeData("/images/ycck.jpg");
- BufferedImage bufferedImage = ImageUtils.createBufferedImage(cmyk);
- Assert.assertNotNull(bufferedImage);
-
- bufferedImage = ImageUtils.resizeNoCrop(bufferedImage, 100, 100);
-
- InputStream is = ImageUtils.getStream(bufferedImage, "jpg");
-
- File tempFile = File.createTempFile("image", "jpg");
- OutputStream os = new BufferedOutputStream(new FileOutputStream(tempFile));
- IOUtils.copy(is, os);
-
- IOUtils.closeQuietly(is);
- IOUtils.closeQuietly(os);
-
- tempFile.delete();
-
- }
-
- @Test
- public void testBadImageTxt() throws Exception
- {
-
- NodeData cmyk = new FileNodeData("/images/badimage.txt");
- BufferedImage bufferedImage = ImageUtils.createBufferedImage(cmyk);
- Assert.assertNull(bufferedImage);
- }
-
- @Test
- public void testBadImageJpg() throws Exception
- {
-
- NodeData cmyk = new FileNodeData("/images/badimage.jpg");
- BufferedImage bufferedImage = ImageUtils.createBufferedImage(cmyk);
- Assert.assertNull(bufferedImage);
- }
-}
Copied: branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java (from rev 1000, trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java)
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java (rev 0)
+++ branches/openutils-mgnlmedia-3.6.x/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java 2009-02-15 21:55:30 UTC (rev 1002)
@@ -0,0 +1,64 @@
+package net.sourceforge.openutils.mgnlmedia.media.utils;
+
+import info.magnolia.cms.core.NodeData;
+
+import java.awt.image.BufferedImage;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.apache.commons.io.IOUtils;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class ImageUtilsTest
+{
+
+ @Test
+ public void testYcck() throws Exception
+ {
+
+ NodeData cmyk = new FileNodeData("/images/ycck.jpg");
+ BufferedImage bufferedImage = ImageUtils.createBufferedImage(cmyk);
+ Assert.assertNotNull(bufferedImage);
+
+ bufferedImage = ImageUtils.resizeNoCrop(bufferedImage, 100, 100);
+
+ InputStream is = ImageUtils.getStream(bufferedImage, "jpg");
+
+ File tempFile = File.createTempFile("image", "jpg");
+ OutputStream os = new BufferedOutputStream(new FileOutputStream(tempFile));
+ IOUtils.copy(is, os);
+
+ IOUtils.closeQuietly(is);
+ IOUtils.closeQuietly(os);
+
+ tempFile.delete();
+
+ }
+
+ @Test
+ public void testBadImageTxt() throws Exception
+ {
+
+ NodeData cmyk = new FileNodeData("/images/badimage.txt");
+ BufferedImage bufferedImage = ImageUtils.createBufferedImage(cmyk);
+ Assert.assertNull(bufferedImage);
+ }
+
+ @Test
+ public void testBadImageJpg() throws Exception
+ {
+
+ NodeData cmyk = new FileNodeData("/images/badimage.jpg");
+ BufferedImage bufferedImage = ImageUtils.createBufferedImage(cmyk);
+ Assert.assertNull(bufferedImage);
+ }
+}
Deleted: branches/openutils-mgnlmedia-3.6.x/src/test/resources/images/badimage.jpg
===================================================================
(Binary files differ)
Copied: branches/openutils-mgnlmedia-3.6.x/src/test/resources/images/badimage.jpg (from rev 1000, trunk/openutils-mgnlmedia/src/test/resources/images/badimage.jpg)
===================================================================
(Binary files differ)
Deleted: branches/openutils-mgnlmedia-3.6.x/src/test/resources/images/badimage.txt
===================================================================
--- trunk/openutils-mgnlmedia/src/test/resources/images/badimage.txt 2009-02-15 21:33:35 UTC (rev 1000)
+++ branches/openutils-mgnlmedia-3.6.x/src/test/resources/images/badimage.txt 2009-02-15 21:55:30 UTC (rev 1002)
@@ -1 +0,0 @@
-just a sample bad image
\ No newline at end of file
Copied: branches/openutils-mgnlmedia-3.6.x/src/test/resources/images/badimage.txt (from rev 1000, trunk/openutils-mgnlmedia/src/test/resources/images/badimage.txt)
===================================================================
--- branches/openutils-mgnlmedia-3.6.x/src/test/resources/images/badimage.txt (rev 0)
+++ branches/openutils-mgnlmedia-3.6.x/src/test/resources/images/badimage.txt 2009-02-15 21:55:30 UTC (rev 1002)
@@ -0,0 +1 @@
+just a sample bad image
\ No newline at end of file
Deleted: branches/openutils-mgnlmedia-3.6.x/src/test/resources/images/ycck.jpg
===================================================================
(Binary files differ)
Copied: branches/openutils-mgnlmedia-3.6.x/src/test/resources/images/ycck.jpg (from rev 1000, trunk/openutils-mgnlmedia/src/test/resources/images/ycck.jpg)
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
