Menu
▾
▴
openutils-svn — developer list with svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
| 2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
| 2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
| 2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
| 2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
| 2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
| 2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <fg...@us...> - 2009-05-02 12:27:10
|
Revision: 1177
http://openutils.svn.sourceforge.net/openutils/?rev=1177&view=rev
Author: fgiust
Date: 2009-05-02 12:27:05 +0000 (Sat, 02 May 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnltasks/pom.xml
Modified: trunk/openutils-mgnltasks/pom.xml
===================================================================
--- trunk/openutils-mgnltasks/pom.xml 2009-05-02 12:26:51 UTC (rev 1176)
+++ trunk/openutils-mgnltasks/pom.xml 2009-05-02 12:27:05 UTC (rev 1177)
@@ -10,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnltasks</artifactId>
<name>openutils-mgnltasks</name>
- <version>4.0.1</version>
+ <version>4.0.2-SNAPSHOT</version>
<description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
<licenses>
<license>
@@ -98,10 +98,4 @@
</snapshots>
</repository>
</repositories>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.0.1</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.0.1</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnltasks-4.0.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-05-02 12:26:53
|
Revision: 1176
http://openutils.svn.sourceforge.net/openutils/?rev=1176&view=rev
Author: fgiust
Date: 2009-05-02 12:26:51 +0000 (Sat, 02 May 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnltasks-4.0.1
Added Paths:
-----------
tags/openutils-mgnltasks-4.0.1/
tags/openutils-mgnltasks-4.0.1/pom.xml
Removed Paths:
-------------
tags/openutils-mgnltasks-4.0.1/pom.xml
Deleted: tags/openutils-mgnltasks-4.0.1/pom.xml
===================================================================
--- trunk/openutils-mgnltasks/pom.xml 2009-05-02 12:25:07 UTC (rev 1174)
+++ tags/openutils-mgnltasks-4.0.1/pom.xml 2009-05-02 12:26:51 UTC (rev 1176)
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>11</version>
- <relativePath>..</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
- <artifactId>openutils-mgnltasks</artifactId>
- <name>openutils-mgnltasks</name>
- <version>4.0.1-SNAPSHOT</version>
- <description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
- <licenses>
- <license>
- <name>GPLv3</name>
- <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
- </license>
- </licenses>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>META-INF/magnolia/*</include>
- </includes>
- </resource>
- </resources>
- </build>
- <dependencies>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-core</artifactId>
- <version>4.0</version>
- <exclusions>
- <exclusion>
- <groupId>servlets.com</groupId>
- <artifactId>cos</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0</version>
- <exclusions>
- <exclusion>
- <groupId>servlets.com</groupId>
- <artifactId>cos</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </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>
- <repositories>
- <repository>
- <id>repository.magnolia-cms.com</id>
- <name>magnolia repository</name>
- <url>http://repository.magnolia-cms.com/m2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-</project>
\ No newline at end of file
Copied: tags/openutils-mgnltasks-4.0.1/pom.xml (from rev 1175, trunk/openutils-mgnltasks/pom.xml)
===================================================================
--- tags/openutils-mgnltasks-4.0.1/pom.xml (rev 0)
+++ tags/openutils-mgnltasks-4.0.1/pom.xml 2009-05-02 12:26:51 UTC (rev 1176)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>11</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <name>openutils-mgnltasks</name>
+ <version>4.0.1</version>
+ <description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
+ </license>
+ </licenses>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>META-INF/magnolia/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-core</artifactId>
+ <version>4.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>servlets.com</groupId>
+ <artifactId>cos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-admininterface</artifactId>
+ <version>4.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>servlets.com</groupId>
+ <artifactId>cos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </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>
+ <repositories>
+ <repository>
+ <id>repository.magnolia-cms.com</id>
+ <name>magnolia repository</name>
+ <url>http://repository.magnolia-cms.com/m2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.0.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.0.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnltasks-4.0.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-05-02 12:26:17
|
Revision: 1175
http://openutils.svn.sourceforge.net/openutils/?rev=1175&view=rev
Author: fgiust
Date: 2009-05-02 12:26:16 +0000 (Sat, 02 May 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnltasks-4.0.1
Modified Paths:
--------------
trunk/openutils-mgnltasks/pom.xml
Modified: trunk/openutils-mgnltasks/pom.xml
===================================================================
--- trunk/openutils-mgnltasks/pom.xml 2009-05-02 12:25:07 UTC (rev 1174)
+++ trunk/openutils-mgnltasks/pom.xml 2009-05-02 12:26:16 UTC (rev 1175)
@@ -10,7 +10,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnltasks</artifactId>
<name>openutils-mgnltasks</name>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.1</version>
<description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
<licenses>
<license>
@@ -98,4 +98,10 @@
</snapshots>
</repository>
</repositories>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.0.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-4.0.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnltasks-4.0.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-05-02 12:25:24
|
Revision: 1174
http://openutils.svn.sourceforge.net/openutils/?rev=1174&view=rev
Author: fgiust
Date: 2009-05-02 12:25:07 +0000 (Sat, 02 May 2009)
Log Message:
-----------
new tasks
Modified Paths:
--------------
trunk/openutils-mgnltasks/src/site/changes/changes.xml
Added Paths:
-----------
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java
trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DirectoryBootstrapTask.java
Added: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java (rev 0)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java 2009-05-02 12:25:07 UTC (rev 1174)
@@ -0,0 +1,80 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package it.openutils.mgnltasks;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.NodeData;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractRepositoryTask;
+import info.magnolia.module.delta.TaskExecutionException;
+
+import javax.jcr.RepositoryException;
+
+
+/**
+ * Set a nodedata if not existing. Also creates the full path if missing.
+ * @author fgiust
+ * @version $Id$
+ */
+public class CreateMissingPropertyTask extends AbstractRepositoryTask
+{
+
+ private final String workspaceName;
+
+ private final String nodePath;
+
+ private final String propertyName;
+
+ private final String propertyValue;
+
+ public CreateMissingPropertyTask(
+ String name,
+ String description,
+ String workspaceName,
+ String nodePath,
+ String propertyName,
+ String propertyValue)
+ {
+ super(name, description);
+ this.workspaceName = workspaceName;
+ this.nodePath = nodePath;
+ this.propertyName = propertyName;
+ this.propertyValue = propertyValue;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
+ {
+ final HierarchyManager hm = ctx.getHierarchyManager(workspaceName);
+
+ final Content node = ContentUtil.createPath(hm, nodePath, false);
+ if (!node.hasNodeData(propertyName))
+ {
+ NodeData property = NodeDataUtil.getOrCreate(node, propertyName);
+ property.setValue(propertyValue);
+ }
+
+ }
+
+}
Property changes on: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DirectoryBootstrapTask.java
===================================================================
--- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DirectoryBootstrapTask.java (rev 0)
+++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DirectoryBootstrapTask.java 2009-05-02 12:25:07 UTC (rev 1174)
@@ -0,0 +1,51 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package it.openutils.mgnltasks;
+
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.BootstrapResourcesTask;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * Bootstrap al the files in a given directory.
+ * @author fgiust
+ * @version $Id$
+ */
+public class DirectoryBootstrapTask extends BootstrapResourcesTask
+{
+
+ private final String directory;
+
+ public DirectoryBootstrapTask(String directory)
+ {
+ super("Bootstrap", "Bootstraps all the file in the mgnl-bootstrap/" + directory + " directory");
+ this.directory = directory;
+ }
+
+ /**
+ * Accepts any resource directly under "/mgnl-bootstrap/directory" but not recursive into sub-directories.
+ */
+ @Override
+ protected boolean acceptResource(InstallContext ctx, String resourceName)
+ {
+ final String resourceFilename = StringUtils.substringAfter(resourceName, "/mgnl-bootstrap/" + directory + "/");
+ return !StringUtils.contains(resourceFilename, "/") && resourceFilename.endsWith(".xml");
+ }
+}
Property changes on: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DirectoryBootstrapTask.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnltasks/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnltasks/src/site/changes/changes.xml 2009-04-29 20:42:27 UTC (rev 1173)
+++ trunk/openutils-mgnltasks/src/site/changes/changes.xml 2009-05-02 12:25:07 UTC (rev 1174)
@@ -8,6 +8,9 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
+ <release version="4.0.1" date="2009-05-02" description="">
+ <action type="add" dev="fgiust">new tasks: CreateMissingPropertyTask, DirectoryBootstrapTask</action>
+ </release>
<release version="4.0" date="2009-03-12" description="">
<action type="update" dev="fgiust">Updated to magnolia 4.0. This release will not work correctly with previous
versions. Please note that previous 3.x releases don't fully work with magnolia 4.0 either.</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-04-29 20:42:28
|
Revision: 1173
http://openutils.svn.sourceforge.net/openutils/?rev=1173&view=rev
Author: fgiust
Date: 2009-04-29 20:42:27 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-04-29 20:42:20 UTC (rev 1172)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-04-29 20:42:27 UTC (rev 1173)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlmedia</artifactId>
<name>openutils-mgnlmedia</name>
- <version>4.0-b4</version>
+ <version>4.0-b5-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -74,10 +74,4 @@
</exclusions>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b4</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b4</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.0-b4</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-04-29 20:42:24
|
Revision: 1171
http://openutils.svn.sourceforge.net/openutils/?rev=1171&view=rev
Author: fgiust
Date: 2009-04-29 20:42:06 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmedia-4.0-b4
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-04-29 20:40:37 UTC (rev 1170)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-04-29 20:42:06 UTC (rev 1171)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlmedia</artifactId>
<name>openutils-mgnlmedia</name>
- <version>4.0-b4-SNAPSHOT</version>
+ <version>4.0-b4</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -74,4 +74,10 @@
</exclusions>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b4</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b4</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.0-b4</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-04-29 20:42:22
|
Revision: 1172
http://openutils.svn.sourceforge.net/openutils/?rev=1172&view=rev
Author: fgiust
Date: 2009-04-29 20:42:20 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmedia-4.0-b4
Added Paths:
-----------
tags/openutils-mgnlmedia-4.0-b4/
tags/openutils-mgnlmedia-4.0-b4/pom.xml
Removed Paths:
-------------
tags/openutils-mgnlmedia-4.0-b4/pom.xml
Property changes on: tags/openutils-mgnlmedia-4.0-b4
___________________________________________________________________
Added: svn:ignore
+ .settings
.checkstyle
.classpath
.project
target
test-output
temp-testng-customsuite.xml
Added: svnmerge-integrated
+ /branches/openutils-mgnlmedia-3.6.x:1-982,1004
Added: svn:mergeinfo
+ /branches/openutils-mgnlmedia-3.6.x:1004
Deleted: tags/openutils-mgnlmedia-4.0-b4/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-04-29 20:40:37 UTC (rev 1170)
+++ tags/openutils-mgnlmedia-4.0-b4/pom.xml 2009-04-29 20:42:20 UTC (rev 1172)
@@ -1,77 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>11</version>
- <relativePath>..</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
- <artifactId>openutils-mgnlmedia</artifactId>
- <name>openutils-mgnlmedia</name>
- <version>4.0-b4-SNAPSHOT</version>
- <licenses>
- <license>
- <name>GPLv3</name>
- <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
- </license>
- </licenses>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>META-INF/magnolia/*</include>
- </includes>
- </resource>
- </resources>
- </build>
- <dependencies>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-core</artifactId>
- <version>4.0.1</version>
- </dependency>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlext</artifactId>
- <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>
- <version>5.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-mgnlmedia-4.0-b4/pom.xml (from rev 1171, trunk/openutils-mgnlmedia/pom.xml)
===================================================================
--- tags/openutils-mgnlmedia-4.0-b4/pom.xml (rev 0)
+++ tags/openutils-mgnlmedia-4.0-b4/pom.xml 2009-04-29 20:42:20 UTC (rev 1172)
@@ -0,0 +1,83 @@
+<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>
+ <version>11</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+ <artifactId>openutils-mgnlmedia</artifactId>
+ <name>openutils-mgnlmedia</name>
+ <version>4.0-b4</version>
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
+ </license>
+ </licenses>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>META-INF/magnolia/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-core</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-admininterface</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlext</artifactId>
+ <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>
+ <version>5.1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b4</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b4</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.0-b4</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-04-29 20:40:43
|
Revision: 1170
http://openutils.svn.sourceforge.net/openutils/?rev=1170&view=rev
Author: fgiust
Date: 2009-04-29 20:40:37 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
ready to release b4
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/site/changes/changes.xml
Modified: trunk/openutils-mgnlmedia/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-29 20:39:50 UTC (rev 1169)
+++ trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-29 20:40:37 UTC (rev 1170)
@@ -8,7 +8,7 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
- <release version="4.0-b4" date="in svn" description="">
+ <release version="4.0-b4" date="2009-04-29" description="">
<action type="update" dev="fgiust">YouTubeVideoTypeHandler modified in order to work with generic external urls (not
only youtube)</action>
<action type="add" dev="fgiust">new utility class net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-04-29 20:40:02
|
Revision: 1169
http://openutils.svn.sourceforge.net/openutils/?rev=1169&view=rev
Author: fgiust
Date: 2009-04-29 20:39:50 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
basic support for autoactivate
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
trunk/openutils-mgnlmedia/src/site/changes/changes.xml
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -46,7 +46,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.query.InvalidQueryException;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.pages.MediaFolderViewPage;
import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
@@ -340,7 +340,7 @@
@SuppressWarnings("unchecked")
public Collection<Content> search(String text, final String type) throws RepositoryException
{
- QueryManager qm = MgnlContext.getQueryManager(MediaModuleLifecycle.REPO);
+ QueryManager qm = MgnlContext.getQueryManager(MediaModule.REPO);
StringBuilder sb = new StringBuilder();
sb.append("//*[jcr:contains(.,'");
sb.append(StringUtils.replace(text, "'", "''"));
@@ -406,7 +406,7 @@
.getInstance()
.getMappings())
{
- if (mapping.getRepository().equals(MediaModuleLifecycle.REPO))
+ if (mapping.getRepository().equals(MediaModule.REPO))
{
return mapping.getURIPrefix();
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -49,7 +49,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.lang.exception.NestableRuntimeException;
import org.slf4j.Logger;
@@ -220,7 +220,7 @@
{
if (this.media == null && this.getValue() != null && this.getValue().length() > 0)
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
this.media = hm.getContentByUUID(this.getValue());
}
return this.media;
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -35,7 +35,7 @@
import javax.servlet.http.HttpServletResponse;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@@ -160,7 +160,7 @@
if (control.getNodeName().equals("mgnlNew"))
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
Content c = null;
try
{
Copied: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java (from rev 1163, trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java)
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -0,0 +1,90 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package net.sourceforge.openutils.mgnlmedia.media.lifecycle;
+
+import info.magnolia.module.ModuleLifecycle;
+import info.magnolia.module.ModuleLifecycleContext;
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author molaschi
+ */
+public class MediaModule implements ModuleLifecycle
+{
+
+ /**
+ *
+ */
+ public static final String REPO = "media";
+
+ private Logger log = LoggerFactory.getLogger(MediaModule.class);
+
+ private boolean autoactivate;
+
+ private static MediaModule instance;
+
+ public MediaModule()
+ {
+ instance = this;
+ }
+
+ public static MediaModule getInstance()
+ {
+ return instance;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void start(ModuleLifecycleContext ctx)
+ {
+ log.info("Starting module media");
+ ctx.registerModuleObservingComponent("mediatypes", MediaConfigurationManager.getInstance());
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void stop(ModuleLifecycleContext ctx)
+ {
+ log.info("Stopping module media");
+ }
+
+ /**
+ * Returns the autoactivate.
+ * @return the autoactivate
+ */
+ public boolean isAutoactivate()
+ {
+ return autoactivate;
+ }
+
+ /**
+ * Sets the autoactivate.
+ * @param autoactivate the autoactivate to set
+ */
+ public void setAutoactivate(boolean autoactivate)
+ {
+ this.autoactivate = autoactivate;
+ }
+
+}
Deleted: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -1,59 +0,0 @@
-/**
- * Copyright Openmind http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package net.sourceforge.openutils.mgnlmedia.media.lifecycle;
-
-import info.magnolia.module.ModuleLifecycle;
-import info.magnolia.module.ModuleLifecycleContext;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * @author molaschi
- */
-public class MediaModuleLifecycle implements ModuleLifecycle
-{
- /**
- *
- */
- public static final String REPO = "media";
-
- private Logger log = LoggerFactory.getLogger(MediaModuleLifecycle.class);
-
- /**
- *
- * {@inheritDoc}
- */
- public void start(ModuleLifecycleContext ctx)
- {
- log.info("Starting module media");
- ctx.registerModuleObservingComponent("mediatypes", MediaConfigurationManager.getInstance());
- }
-
- /**
- *
- * {@inheritDoc}
- */
- public void stop(ModuleLifecycleContext ctx)
- {
- log.info("Stopping module media");
- }
-
-}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -20,17 +20,14 @@
import info.magnolia.cms.beans.runtime.Document;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.core.Path;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Date;
import java.util.Enumeration;
import java.util.zip.ZipEntry;
@@ -40,9 +37,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
@@ -92,7 +88,7 @@
if (actMedia != null)
{
- HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModule.REPO);
try
{
Content media = mgr.getContentByUUID(actMedia);
@@ -110,7 +106,7 @@
{
try
{
- HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModule.REPO);
File temp = File.createTempFile("zipmedia", ".zip");
FileOutputStream fos = new FileOutputStream(temp);
IOUtils.copy(zipFile.getStream(), fos);
@@ -132,48 +128,18 @@
path = path.substring(0, path.length() - 1);
}
- if (entry.isDirectory())
+ if (!entry.isDirectory())
{
- getOrCreateFullPath(mgr, parentPath + path);
- }
- else
- {
+ InputStream inputStream = zip.getInputStream(entry);
+
String parent = StringUtils.substringBeforeLast(path, "/");
String filename = StringUtils.substringAfterLast(path, "/");
- if (StringUtils.isEmpty(parent))
- {
- parent = "/";
- }
- String extension = StringUtils.substringAfterLast(filename, ".");
- String cleanFilename = StringUtils.substringBeforeLast(filename, ".");
- MediaTypeConfiguration mtc = MediaConfigurationManager.getMediaHandlerFromExtension(extension);
- if (mtc != null)
- {
- Content parentNode = getOrCreateFullPath(mgr, parentPath + parent);
+ MediaLoadUtils.loadEntry(inputStream, StringUtils.defaultIfEmpty(parent, "/"), filename, false);
- Content media = mgr.createContent(parentPath + parent, Path.getUniqueLabel(
- parentNode,
- cleanFilename), MediaConfigurationManager.MEDIA.getSystemName());
-
- NodeData nd = NodeDataUtil.getOrCreate(media, "type");
- nd.setValue(mtc.getName());
-
- mgr.save();
-
- File f = File.createTempFile("entry", extension);
- FileOutputStream fTemp = new FileOutputStream(f);
-
- IOUtils.copy(zip.getInputStream(entry), fTemp);
-
- fTemp.close();
-
- mtc.getHandler().saveFromZipFile(media, f, cleanFilename, extension);
-
- mgr.save();
- }
}
+
}
}
catch (IOException e)
@@ -194,31 +160,6 @@
return this.show();
}
- public static Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
- {
- try
- {
- return mgr.getContent(path);
- }
- catch (RepositoryException ex)
- {
- String parent = StringUtils.substringBeforeLast(path, "/");
- String label = StringUtils.substringAfterLast(path, "/");
- if (!StringUtils.isEmpty(parent))
- {
- getOrCreateFullPath(mgr, parent);
- }
- else
- {
- parent = "/";
- }
-
- Content c = mgr.createContent(parent, label, ItemType.CONTENT.getSystemName());
- mgr.save();
- return c;
- }
- }
-
/**
* Returns the cacheKiller.
* @return the cacheKiller
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -50,7 +50,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.chain.Command;
import org.apache.commons.lang.StringUtils;
@@ -170,7 +170,7 @@
numberOfMedia = new HashMap<String, Integer>();
for (MediaTypeConfiguration mtc : types)
{
- QueryManager qm = MgnlContext.getQueryManager(MediaModuleLifecycle.REPO);
+ QueryManager qm = MgnlContext.getQueryManager(MediaModule.REPO);
try
{
Query q = qm.createQuery(
@@ -193,7 +193,7 @@
@Override
public String show()
{
- HierarchyManager hm = MgnlContext.getInstance().getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getInstance().getHierarchyManager(MediaModule.REPO);
MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
Collection<Content> mediasOfType = null;
@@ -252,7 +252,8 @@
try
{
mb.setWritable(media.getParent().isGranted(Permission.WRITE));
- mb.setCanPublish(mb.isWritable()
+ mb.setCanPublish(!MediaModule.getInstance().isAutoactivate()
+ && mb.isWritable()
&& ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber());
mb.getUsedInWebPages().addAll(
@@ -275,7 +276,7 @@
*/
public String delete()
{
- HierarchyManager hm = MgnlContext.getInstance().getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getInstance().getHierarchyManager(MediaModule.REPO);
try
{
@@ -355,7 +356,7 @@
public Content copyMoveNode(String source, String destination, boolean move) throws ExchangeException,
RepositoryException
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
String goTo = destination;
@@ -422,7 +423,7 @@
actCmd.setItemTypes(sb.toString());
Context context = MgnlContext.getInstance();
- context.put(Context.ATTRIBUTE_REPOSITORY, MediaModuleLifecycle.REPO);
+ context.put(Context.ATTRIBUTE_REPOSITORY, MediaModule.REPO);
context.put(Context.ATTRIBUTE_PATH, this.node);
context.put(Context.ATTRIBUTE_RECURSIVE, false);
@@ -444,7 +445,7 @@
Command cmd = CommandsManager.getInstance().getCommand(CommandsManager.DEFAULT_CATALOG, "deactivate");
Context context = MgnlContext.getInstance();
- context.put(Context.ATTRIBUTE_REPOSITORY, MediaModuleLifecycle.REPO);
+ context.put(Context.ATTRIBUTE_REPOSITORY, MediaModule.REPO);
context.put(Context.ATTRIBUTE_PATH, this.node);
try
@@ -462,7 +463,7 @@
public String download()
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
Content media;
try
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -34,7 +34,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
import org.apache.commons.io.IOUtils;
@@ -67,7 +67,7 @@
InputStream zipStream = null;
try
{
- HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModule.REPO);
File temp = File.createTempFile("zipmedia", ".zip");
FileOutputStream fos = new FileOutputStream(temp);
@@ -83,7 +83,7 @@
String path = entry.getName();
path = StringUtils.replace(path, "\\", "/");
- if (path.startsWith("/"))
+ if (!path.startsWith("/"))
{
path = "/" + path;
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -39,7 +39,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@@ -99,7 +99,7 @@
mtc.add(entry.getValue());
}
- HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager mgr = MgnlContext.getHierarchyManager(MediaModule.REPO);
try
{
Collection<Content> contents = mgr.getRoot().getChildren(MediaConfigurationManager.FOLDER);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -28,7 +28,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.lang.StringUtils;
@@ -59,7 +59,7 @@
return;
}
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
Content media = hm.getContentByUUID(value);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RemoveResolutionsNodeTask.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -31,7 +31,7 @@
import info.magnolia.module.delta.AbstractTask;
import info.magnolia.module.delta.TaskExecutionException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
/**
@@ -55,7 +55,7 @@
*/
public void execute(InstallContext installContext) throws TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = installContext.getHierarchyManager(MediaModule.REPO);
QueryManager mgr = hm.getQueryManager();
try
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -34,7 +34,7 @@
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
/**
@@ -58,7 +58,7 @@
*/
public void execute(InstallContext installContext) throws TaskExecutionException
{
- HierarchyManager hm = installContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = installContext.getHierarchyManager(MediaModule.REPO);
QueryManager mgr = hm.getQueryManager();
try
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -36,7 +36,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.utils.ImageUtils;
import org.apache.commons.collections.CollectionUtils;
@@ -78,7 +78,7 @@
if (obj instanceof String)
{
String uuid = (String) obj;
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
try
{
return hm.getContentByUUID(uuid);
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -35,6 +35,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.lang.StringUtils;
@@ -191,12 +192,15 @@
tree.addMenuItem(menuCut);
tree.addMenuItem(menuCopy);
- if (MgnlContext.getUser().hasRole("media-publish") || MgnlContext.getUser().hasRole("superuser"))
+ if (!MediaModule.getInstance().isAutoactivate())
{
- tree.addSeparator();
- tree.addMenuItem(menuActivateExcl);
- tree.addMenuItem(menuActivate);
- tree.addMenuItem(menuDeactivate);
+ if (MgnlContext.getUser().hasRole("media-publish") || MgnlContext.getUser().hasRole("superuser"))
+ {
+ tree.addSeparator();
+ tree.addMenuItem(menuActivateExcl);
+ tree.addMenuItem(menuActivate);
+ tree.addMenuItem(menuDeactivate);
+ }
}
}
else
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -27,6 +27,7 @@
import javax.jcr.RepositoryException;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
import org.slf4j.Logger;
@@ -110,6 +111,12 @@
}
media.save();
}
+
+ if (MediaModule.getInstance().isAutoactivate())
+ {
+ media.getMetaData().setActivated();
+ media.save();
+ }
}
catch (RepositoryException ex)
{
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-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -51,7 +51,7 @@
import javax.jcr.RepositoryException;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.ClassUtils;
@@ -514,7 +514,7 @@
*/
public void exec()
{
- HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
String resolution = resolutionTarget;
if ("thumbnail".equals(resolution))
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2009-04-29 20:39:50 UTC (rev 1169)
@@ -35,7 +35,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
@@ -61,7 +61,7 @@
log.debug("loading image {} {}", parent, filename);
- HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModuleLifecycle.REPO);
+ HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModule.REPO);
String extension = StringUtils.substringAfterLast(filename, ".");
String cleanFilename = StringUtils.substringBeforeLast(filename, ".");
@@ -105,6 +105,11 @@
nd = NodeDataUtil.getOrCreate(media, "modificationDate");
nd.setValue(Calendar.getInstance());
+ if (MediaModule.getInstance().isAutoactivate())
+ {
+ media.getMetaData().setActivated();
+ }
+
mgr.save();
File f = File.createTempFile("entry", extension);
@@ -122,7 +127,7 @@
return null;
}
- private static Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
+ public static Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
{
String[] contentNodeNames = path.split("/");
Content currContent = mgr.getRoot();
@@ -134,6 +139,11 @@
currContent,
contentNodeName,
MediaConfigurationManager.FOLDER);
+
+ if (MediaModule.getInstance().isAutoactivate() && !currContent.getMetaData().getIsActivated())
+ {
+ currContent.getMetaData().setActivated();
+ }
}
}
return currContent;
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2009-04-29 20:39:50 UTC (rev 1169)
@@ -4,7 +4,7 @@
<name>media</name>
<displayName>magnolia media module</displayName>
<description>magnolia media module</description>
- <class>net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle</class>
+ <class>net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule</class>
<versionHandler>net.sourceforge.openutils.mgnlmedia.media.setup.MediaModuleVersionHandler</versionHandler>
<version>${project.version}</version>
<dependencies>
Modified: trunk/openutils-mgnlmedia/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-29 15:17:11 UTC (rev 1168)
+++ trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-29 20:39:50 UTC (rev 1169)
@@ -11,8 +11,10 @@
<release version="4.0-b4" date="in svn" description="">
<action type="update" dev="fgiust">YouTubeVideoTypeHandler modified in order to work with generic external urls (not
only youtube)</action>
- <action type="update" dev="fgiust">new utility class net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils
+ <action type="add" dev="fgiust">new utility class net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils
</action>
+ <action type="add" dev="fgiust">new property "autoactivate" that can be set in module configuration
+ (/modules/media/config/autoactivate) to have imported media activated by default.</action>
</release>
<release version="4.0-b3" date="2009-04-23" description="">
<action type="update" dev="fgiust">Update openutils-mgnltasks dependency to 4.0</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-04-29 15:17:15
|
Revision: 1168
http://openutils.svn.sourceforge.net/openutils/?rev=1168&view=rev
Author: fgiust
Date: 2009-04-29 15:17:11 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
new MediaLoadUtils
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java
trunk/openutils-mgnlmedia/src/site/changes/changes.xml
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java 2009-04-29 14:51:15 UTC (rev 1167)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java 2009-04-29 15:17:11 UTC (rev 1168)
@@ -18,34 +18,24 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
import info.magnolia.cms.beans.runtime.Document;
-import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.core.Path;
-import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
-import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
-import info.magnolia.module.admininterface.TemplatedMVCHandler;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Enumeration;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
import javax.jcr.RepositoryException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
-import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
+import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
@@ -73,13 +63,18 @@
public String loadZip()
{
+
+ InputStream zipStream = null;
try
{
HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModuleLifecycle.REPO);
File temp = File.createTempFile("zipmedia", ".zip");
FileOutputStream fos = new FileOutputStream(temp);
- IOUtils.copy(zipFile.getStream(), fos);
- fos.close();
+
+ zipStream = zipFile.getStream();
+ IOUtils.copy(zipStream, fos);
+
+ IOUtils.closeQuietly(fos);
ZipFile zip = new ZipFile(temp);
Enumeration< ? extends ZipEntry> entries = zip.entries();
while (entries.hasMoreElements())
@@ -93,48 +88,16 @@
path = "/" + path;
}
- if (entry.isDirectory())
+ if (!entry.isDirectory())
{
- getOrCreateFullPath(mgr, path);
- }
- else
- {
+ InputStream inputStream = zip.getInputStream(entry);
+
String parent = StringUtils.substringBeforeLast(path, "/");
String filename = StringUtils.substringAfterLast(path, "/");
- if (StringUtils.isEmpty(parent))
- {
- parent = "/";
- }
- String extension = StringUtils.substringAfterLast(filename, ".");
- String cleanFilename = StringUtils.substringBeforeLast(filename, ".");
- MediaTypeConfiguration mtc = MediaConfigurationManager.getMediaHandlerFromExtension(extension);
- if (mtc != null)
- {
- Content parentNode = mgr.getContent(parent);
+ MediaLoadUtils.loadEntry(inputStream, StringUtils.defaultIfEmpty(parent, "/"), filename, false);
- Content media = mgr.createContent(
- parent,
- Path.getUniqueLabel(parentNode, cleanFilename),
- MediaConfigurationManager.MEDIA.getSystemName());
-
- NodeData nd = NodeDataUtil.getOrCreate(media, "type");
- nd.setValue(mtc.getName());
-
- mgr.save();
-
- File f = File.createTempFile("entry", extension);
- FileOutputStream fTemp = new FileOutputStream(f);
-
- IOUtils.copy(zip.getInputStream(entry), fTemp);
-
- fTemp.close();
-
- mtc.getHandler().saveFromZipFile(media, f, cleanFilename, extension);
-
- mgr.save();
- }
}
}
}
@@ -150,6 +113,10 @@
{
}
+ finally
+ {
+ IOUtils.closeQuietly(zipStream);
+ }
return this.show();
}
@@ -172,27 +139,4 @@
this.zipFile = zipFile;
}
- private Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
- {
- try
- {
- return mgr.getContent(path);
- }
- catch (RepositoryException ex)
- {
- String parent = StringUtils.substringBeforeLast(path, "/");
- String label = StringUtils.substringAfterLast(path, "/");
- if (!StringUtils.isEmpty(parent))
- {
- getOrCreateFullPath(mgr, parent);
- }
- else
- {
- parent = "/";
- }
-
- return mgr.createContent(parent, label, ItemType.CONTENT.getSystemName());
- }
- }
-
}
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2009-04-29 15:17:11 UTC (rev 1168)
@@ -0,0 +1,142 @@
+/**
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+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.core.Path;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.context.MgnlContext;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Calendar;
+
+import javax.jcr.RepositoryException;
+
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
+import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class MediaLoadUtils
+{
+
+ /**
+ * Logger.
+ */
+ private static Logger log = LoggerFactory.getLogger(MediaLoadUtils.class);
+
+ public static Content loadEntry(InputStream inputStream, String parent, String filename, boolean overwrite)
+ throws RepositoryException, IOException
+ {
+
+ log.debug("loading image {} {}", parent, filename);
+
+ HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModuleLifecycle.REPO);
+
+ String extension = StringUtils.substringAfterLast(filename, ".");
+ String cleanFilename = StringUtils.substringBeforeLast(filename, ".");
+ MediaTypeConfiguration mtc = MediaConfigurationManager.getMediaHandlerFromExtension(extension);
+
+ if (mtc != null)
+ {
+ Content parentNode = getOrCreateFullPath(mgr, parent);
+
+ if (overwrite)
+ {
+ Content existing = parentNode.getChildByName(cleanFilename);
+ if (existing != null)
+ {
+ existing.delete();
+ mgr.save();
+ }
+ }
+
+ Content media = mgr.createContent(
+ parent,
+ Path.getUniqueLabel(parentNode, cleanFilename),
+ MediaConfigurationManager.MEDIA.getSystemName());
+
+ NodeData nd = NodeDataUtil.getOrCreate(media, "type");
+ nd.setValue(mtc.getName());
+
+ nd = NodeDataUtil.getOrCreate(media, "creator");
+ if (StringUtils.isEmpty(nd.getString()))
+ {
+ nd.setValue(MgnlContext.getUser().getName());
+ }
+
+ nd = NodeDataUtil.getOrCreate(media, "creationDate");
+ if (nd.getDate() == null)
+ {
+ nd.setValue(Calendar.getInstance());
+ }
+ nd.setValue(MgnlContext.getUser().getName());
+
+ nd = NodeDataUtil.getOrCreate(media, "modificationDate");
+ nd.setValue(Calendar.getInstance());
+
+ mgr.save();
+
+ File f = File.createTempFile("entry", extension);
+ FileOutputStream fTemp = new FileOutputStream(f);
+
+ IOUtils.copy(inputStream, fTemp);
+
+ IOUtils.closeQuietly(fTemp);
+
+ mtc.getHandler().saveFromZipFile(media, f, cleanFilename, extension);
+
+ mgr.save();
+ return media;
+ }
+ return null;
+ }
+
+ private static Content getOrCreateFullPath(HierarchyManager mgr, String path) throws RepositoryException
+ {
+ String[] contentNodeNames = path.split("/");
+ Content currContent = mgr.getRoot();
+ for (String contentNodeName : contentNodeNames)
+ {
+ if (StringUtils.isNotEmpty(contentNodeName))
+ {
+ currContent = ContentUtil.getOrCreateContent(
+ currContent,
+ contentNodeName,
+ MediaConfigurationManager.FOLDER);
+ }
+ }
+ return currContent;
+
+ }
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-29 14:51:15 UTC (rev 1167)
+++ trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-29 15:17:11 UTC (rev 1168)
@@ -11,6 +11,8 @@
<release version="4.0-b4" date="in svn" description="">
<action type="update" dev="fgiust">YouTubeVideoTypeHandler modified in order to work with generic external urls (not
only youtube)</action>
+ <action type="update" dev="fgiust">new utility class net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils
+ </action>
</release>
<release version="4.0-b3" date="2009-04-23" description="">
<action type="update" dev="fgiust">Update openutils-mgnltasks dependency to 4.0</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-04-29 14:51:17
|
Revision: 1167
http://openutils.svn.sourceforge.net/openutils/?rev=1167&view=rev
Author: fgiust
Date: 2009-04-29 14:51:15 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
fix NPE
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-04-23 17:13:28 UTC (rev 1166)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-04-29 14:51:15 UTC (rev 1167)
@@ -147,7 +147,11 @@
}
MgnlContext.setLocale(locale);
MediaTypeConfiguration mtc = mcm.getMediaTypeConfigurationFromMedia(media);
- return mtc.getHandler().getTitle(media);
+ if (mtc != null)
+ {
+ return mtc.getHandler().getTitle(media);
+ }
+ return null;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-04-23 17:13:43
|
Revision: 1166
http://openutils.svn.sourceforge.net/openutils/?rev=1166&view=rev
Author: fgiust
Date: 2009-04-23 17:13:28 +0000 (Thu, 23 Apr 2009)
Log Message:
-----------
handle non-youtube external urls
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java
trunk/openutils-mgnlmedia/src/site/changes/changes.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java 2009-04-23 08:12:57 UTC (rev 1165)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java 2009-04-23 17:13:28 UTC (rev 1166)
@@ -145,16 +145,25 @@
String videoUrl = form.getParameter("videoUrl");
String id = UUID.randomUUID().toString();
URL url;
+
try
{
url = new URL(videoUrl);
- for (String att : StringUtils.split(url.getQuery(), "&"))
+ String query = url.getQuery();
+ if (query != null)
{
- if (att.startsWith("v="))
+ for (String att : StringUtils.split(url.getQuery(), "&"))
{
- id = StringUtils.substringAfter(att, "v=");
+ if (att.startsWith("v="))
+ {
+ id = StringUtils.substringAfter(att, "v=");
+ }
}
}
+ else
+ {
+ id = StringUtils.substringAfterLast(videoUrl, "/");
+ }
}
catch (MalformedURLException e)
{
Modified: trunk/openutils-mgnlmedia/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-23 08:12:57 UTC (rev 1165)
+++ trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-23 17:13:28 UTC (rev 1166)
@@ -8,6 +8,10 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
+ <release version="4.0-b4" date="in svn" description="">
+ <action type="update" dev="fgiust">YouTubeVideoTypeHandler modified in order to work with generic external urls (not
+ only youtube)</action>
+ </release>
<release version="4.0-b3" date="2009-04-23" description="">
<action type="update" dev="fgiust">Update openutils-mgnltasks dependency to 4.0</action>
<action type="add" dev="fgiust">Support for resize without crop to a fixed size with borders. Background color can
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-04-23 08:13:06
|
Revision: 1165
http://openutils.svn.sourceforge.net/openutils/?rev=1165&view=rev
Author: fgiust
Date: 2009-04-23 08:12:57 +0000 (Thu, 23 Apr 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-04-23 08:12:48 UTC (rev 1164)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-04-23 08:12:57 UTC (rev 1165)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlmedia</artifactId>
<name>openutils-mgnlmedia</name>
- <version>4.0-b3</version>
+ <version>4.0-b4-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -74,10 +74,4 @@
</exclusions>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b3</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b3</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.0-b3</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-04-23 08:12:55
|
Revision: 1164
http://openutils.svn.sourceforge.net/openutils/?rev=1164&view=rev
Author: fgiust
Date: 2009-04-23 08:12:48 +0000 (Thu, 23 Apr 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmedia-4.0-b3
Added Paths:
-----------
tags/openutils-mgnlmedia-4.0-b3/
Property changes on: tags/openutils-mgnlmedia-4.0-b3
___________________________________________________________________
Added: svn:ignore
+ .settings
.checkstyle
.classpath
.project
target
test-output
temp-testng-customsuite.xml
Added: svnmerge-integrated
+ /branches/openutils-mgnlmedia-3.6.x:1-982,1004
Added: svn:mergeinfo
+ /branches/openutils-mgnlmedia-3.6.x:1004
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-04-23 08:09:23
|
Revision: 1163
http://openutils.svn.sourceforge.net/openutils/?rev=1163&view=rev
Author: fgiust
Date: 2009-04-23 08:09:20 +0000 (Thu, 23 Apr 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmedia-4.0-b3
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-04-23 08:08:32 UTC (rev 1162)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-04-23 08:09:20 UTC (rev 1163)
@@ -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>4.0-b3-SNAPSHOT</version>
+ <version>4.0-b3</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -75,4 +74,10 @@
</exclusions>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b3</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b3</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.0-b3</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-04-23 08:08:42
|
Revision: 1162
http://openutils.svn.sourceforge.net/openutils/?rev=1162&view=rev
Author: fgiust
Date: 2009-04-23 08:08:32 +0000 (Thu, 23 Apr 2009)
Log Message:
-----------
fix version numbers
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/site/changes/changes.xml
Modified: trunk/openutils-mgnlmedia/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-23 08:06:11 UTC (rev 1161)
+++ trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-23 08:08:32 UTC (rev 1162)
@@ -8,13 +8,13 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
- <release version="4.0-b4" date="2009-04-23" description="">
+ <release version="4.0-b3" date="2009-04-23" description="">
<action type="update" dev="fgiust">Update openutils-mgnltasks dependency to 4.0</action>
<action type="add" dev="fgiust">Support for resize without crop to a fixed size with borders. Background color can
be specified with the syntax: "o100x100;background=FF0096"</action>
<action type="add" dev="fgiust">Alternative prefix for "fit in" resize. In previous versions you had to use < (not very handy in html), now you can use "L" (lower, case insensitive), e.g. "L100x100"</action>
</release>
- <release version="4.0-b3" date="2009-04-16" description="">
+ <release version="4.0-b2" date="2009-04-16" description="">
<action type="update" dev="fgiust">Stable release for Magnolia 4.x</action>
</release>
<release version="3.6" date="2009-02-15" description="">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-04-23 08:06:25
|
Revision: 1161
http://openutils.svn.sourceforge.net/openutils/?rev=1161&view=rev
Author: fgiust
Date: 2009-04-23 08:06:11 +0000 (Thu, 23 Apr 2009)
Log Message:
-----------
update openutils-mgnltasks dependency
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/site/changes/changes.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-04-23 08:03:25 UTC (rev 1160)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-04-23 08:06:11 UTC (rev 1161)
@@ -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>
@@ -38,17 +39,17 @@
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-core</artifactId>
- <version>4.0</version>
+ <version>4.0.1</version>
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
- <version>4.0</version>
+ <version>4.0.1</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>3.5.5</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
Modified: trunk/openutils-mgnlmedia/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-23 08:03:25 UTC (rev 1160)
+++ trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-23 08:06:11 UTC (rev 1161)
@@ -9,6 +9,7 @@
</properties>
<body>
<release version="4.0-b4" date="2009-04-23" description="">
+ <action type="update" dev="fgiust">Update openutils-mgnltasks dependency to 4.0</action>
<action type="add" dev="fgiust">Support for resize without crop to a fixed size with borders. Background color can
be specified with the syntax: "o100x100;background=FF0096"</action>
<action type="add" dev="fgiust">Alternative prefix for "fit in" resize. In previous versions you had to use < (not very handy in html), now you can use "L" (lower, case insensitive), e.g. "L100x100"</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-04-23 08:03:33
|
Revision: 1160
http://openutils.svn.sourceforge.net/openutils/?rev=1160&view=rev
Author: fgiust
Date: 2009-04-23 08:03:25 +0000 (Thu, 23 Apr 2009)
Log Message:
-----------
minor improvements - see changelog
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
trunk/openutils-mgnlmedia/src/site/changes/changes.xml
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/test/resources/images/openmind.png
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-04-18 08:59:21 UTC (rev 1159)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-04-23 08:03:25 UTC (rev 1160)
@@ -130,31 +130,57 @@
*/
public static BufferedImage resizeImage(BufferedImage original, int x, int y)
{
+ return resizeImage(original, x, y, x, y, null);
+ }
+
+ /**
+ * Resize an image to x,y
+ * @param original original image
+ * @param x new width
+ * @param y new height
+ * @param canvasX canvas width
+ * @param canvasY canvas height
+ * @return resized image
+ */
+ public static BufferedImage resizeImage(BufferedImage original, int x, int y, int canvasX, int canvasY,
+ Color background)
+ {
BufferedImage resizedImage;
try
{
- resizedImage = new BufferedImage(x, y, getType(original.getColorModel()));
+ resizedImage = new BufferedImage(canvasX, canvasY, getType(original.getColorModel()));
}
catch (NegativeArraySizeException e)
{
throw new RuntimeException("NegativeArraySizeException caught when resizing image to ["
- + x
+ + canvasX
+ ", "
- + y
+ + canvasY
+ "]");
}
Graphics2D graphics2D = resizedImage.createGraphics();
+
+ // background color
+ if (background != null)
+ {
+ graphics2D.setBackground(background);
+ }
graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
graphics2D.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+ if (canvasX > x || canvasY > y)
+ {
+ graphics2D.clearRect(0, 0, canvasX, canvasY);
+ }
if (x > original.getWidth())
{
graphics2D.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
- graphics2D.drawImage(original, 0, 0, x, y, null);
+ graphics2D.drawImage(original, (canvasX - x) / 2, (canvasY - y) / 2, x, y, background, null);
}
else
{
- graphics2D.drawImage(original.getScaledInstance(x, y, Image.SCALE_SMOOTH), 0, 0, x, y, null);
+ Image scaledInstance = original.getScaledInstance(x, y, Image.SCALE_SMOOTH);
+ graphics2D.drawImage(scaledInstance, (canvasX - x) / 2, (canvasY - y) / 2, x, y, background, null);
}
return resizedImage;
@@ -198,16 +224,21 @@
*/
public static BufferedImage fitIn(BufferedImage original, int x, int y)
{
- return resizeInOut(original, x, y, false);
+ return resizeInOut(original, x, y, false, null);
}
public static BufferedImage resizeNoCrop(BufferedImage original, int x, int y)
{
- return resizeInOut(original, x, y, true);
+ return resizeInOut(original, x, y, true, null);
}
- private static BufferedImage resizeInOut(BufferedImage original, int x, int y, boolean external)
+ public static BufferedImage resizeNoCrop(BufferedImage original, int x, int y, Color background)
{
+ return resizeInOut(original, x, y, true, background);
+ }
+
+ private static BufferedImage resizeInOut(BufferedImage original, int x, int y, boolean external, Color background)
+ {
if (original == null)
{
throw new IllegalArgumentException("input image is null");
@@ -223,11 +254,11 @@
double xRatio = (double) x / oX;
double yRatio = (double) y / oY;
- double ratio = (external ? Math.min(xRatio, yRatio) : Math.min(xRatio, yRatio));
+ double ratio = Math.min(xRatio, yRatio);
int newX = (int) Math.round(oX * ratio);
int newY = (int) Math.round(oY * ratio);
- return resizeImage(original, newX, newY);
+ return resizeImage(original, newX, newY, external ? x : newX, external ? y : newY, background);
}
/**
@@ -596,12 +627,29 @@
{
throw new IllegalArgumentException("input image is null");
}
+ if (resolution == null || resolution.length() < 1)
+ {
+ throw new IllegalArgumentException("Invalid resolution: " + resolution);
+ }
BufferedImage img = null;
+ String params = null;
- if (resolution.startsWith("<"))
+ resolution = StringUtils.lowerCase(resolution);
+
+ if (StringUtils.contains(resolution, ";"))
{
- String resx = StringUtils.substringBefore(StringUtils.substringAfter(resolution, "<"), "x");
+ params = StringUtils.substringAfter(resolution, ";");
+ resolution = StringUtils.substringBefore(resolution, ";");
+ }
+
+ String controlChar = StringUtils.substring(resolution, 0, 1);
+
+ if ("<".equals(controlChar) || "l".equals(controlChar))
+ {
+ String resx = resolution.startsWith("<") ? StringUtils.substringBefore(StringUtils.substringAfter(
+ resolution,
+ "<"), "x") : StringUtils.substringBefore(StringUtils.substringAfter(resolution, "l"), "x");
String resy = StringUtils.substringAfter(resolution, "x");
img = fitIn(original, NumberUtils.toInt(resx), NumberUtils.toInt(resy));
@@ -611,7 +659,22 @@
String resx = StringUtils.substringBefore(StringUtils.substringAfter(resolution, "o"), "x");
String resy = StringUtils.substringAfter(resolution, "x");
- img = resizeNoCrop(original, NumberUtils.toInt(resx), NumberUtils.toInt(resy));
+ Color background = null;
+
+ if (StringUtils.contains(params, "background="))
+ {
+ String colorHex = "0x" + StringUtils.trim(StringUtils.substringAfter(params, "background="));
+ try
+ {
+ background = Color.decode(colorHex);
+ }
+ catch (NumberFormatException e)
+ {
+ log.error("Invalid color code: " + colorHex, e);
+ }
+ }
+
+ img = resizeNoCrop(original, NumberUtils.toInt(resx), NumberUtils.toInt(resy), background);
}
else
{
Modified: trunk/openutils-mgnlmedia/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-18 08:59:21 UTC (rev 1159)
+++ trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-04-23 08:03:25 UTC (rev 1160)
@@ -8,6 +8,11 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
+ <release version="4.0-b4" date="2009-04-23" description="">
+ <action type="add" dev="fgiust">Support for resize without crop to a fixed size with borders. Background color can
+ be specified with the syntax: "o100x100;background=FF0096"</action>
+ <action type="add" dev="fgiust">Alternative prefix for "fit in" resize. In previous versions you had to use < (not very handy in html), now you can use "L" (lower, case insensitive), e.g. "L100x100"</action>
+ </release>
<release version="4.0-b3" date="2009-04-16" description="">
<action type="update" dev="fgiust">Stable release for Magnolia 4.x</action>
</release>
Modified: trunk/openutils-mgnlmedia/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-04-18 08:59:21 UTC (rev 1159)
+++ trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java 2009-04-23 08:03:25 UTC (rev 1160)
@@ -45,6 +45,29 @@
}
@Test
+ public void testBorders() throws Exception
+ {
+
+ NodeData cmyk = new FileNodeData("/images/openmind.png");
+ BufferedImage bufferedImage = ImageUtils.createBufferedImage(cmyk);
+ Assert.assertNotNull(bufferedImage);
+
+ bufferedImage = ImageUtils.getImageForResolution(bufferedImage, "O300x300;background=FF0096");
+
+ InputStream is = ImageUtils.getStream(bufferedImage, "png");
+
+ File tempFile = File.createTempFile("image", ".png");
+ 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
{
Added: trunk/openutils-mgnlmedia/src/test/resources/images/openmind.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlmedia/src/test/resources/images/openmind.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-04-18 09:10:18
|
Revision: 1158
http://openutils.svn.sourceforge.net/openutils/?rev=1158&view=rev
Author: fgiust
Date: 2009-04-18 08:51:31 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2009-04-18 08:51:22 UTC (rev 1157)
+++ trunk/openutils-bshd5/pom.xml 2009-04-18 08:51:31 UTC (rev 1158)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-bshd5</artifactId>
<name>openutils base Spring-Hibernate DAO for java 5.0</name>
- <version>2.0.5</version>
+ <version>2.0.6-SNAPSHOT</version>
<description>openutils base Spring-Hibernate DAO for java 5.0</description>
<dependencies>
<dependency>
@@ -104,10 +104,4 @@
<properties>
<spring.version>2.5.6</spring.version>
</properties>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.0.5</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.0.5</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-2.0.5</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-04-18 08:59:23
|
Revision: 1159
http://openutils.svn.sourceforge.net/openutils/?rev=1159&view=rev
Author: fgiust
Date: 2009-04-18 08:59:21 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
update openutils-mgnltasks dependency
Modified Paths:
--------------
trunk/openutils-mgnlmessages/pom.xml
Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2009-04-18 08:51:31 UTC (rev 1158)
+++ trunk/openutils-mgnlmessages/pom.xml 2009-04-18 08:59:21 UTC (rev 1159)
@@ -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>
@@ -48,7 +49,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
- <version>3.5.5</version>
+ <version>4.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-04-18 08:51:27
|
Revision: 1157
http://openutils.svn.sourceforge.net/openutils/?rev=1157&view=rev
Author: fgiust
Date: 2009-04-18 08:51:22 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-bshd5-2.0.5
Added Paths:
-----------
tags/openutils-bshd5-2.0.5/
tags/openutils-bshd5-2.0.5/pom.xml
Removed Paths:
-------------
tags/openutils-bshd5-2.0.5/pom.xml
Deleted: tags/openutils-bshd5-2.0.5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2009-04-18 08:48:33 UTC (rev 1154)
+++ tags/openutils-bshd5-2.0.5/pom.xml 2009-04-18 08:51:22 UTC (rev 1157)
@@ -1,113 +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>11</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-bshd5</artifactId>
- <name>openutils base Spring-Hibernate DAO for java 5.0</name>
- <version>2.0.5-SNAPSHOT</version>
- <description>openutils base Spring-Hibernate DAO for java 5.0</description>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</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-beans</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-orm</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-aop</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>3.3.1.GA</version>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- </dependencies>
- <properties>
- <spring.version>2.5.6</spring.version>
- </properties>
-</project>
\ No newline at end of file
Copied: tags/openutils-bshd5-2.0.5/pom.xml (from rev 1156, trunk/openutils-bshd5/pom.xml)
===================================================================
--- tags/openutils-bshd5-2.0.5/pom.xml (rev 0)
+++ tags/openutils-bshd5-2.0.5/pom.xml 2009-04-18 08:51:22 UTC (rev 1157)
@@ -0,0 +1,113 @@
+<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>11</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-bshd5</artifactId>
+ <name>openutils base Spring-Hibernate DAO for java 5.0</name>
+ <version>2.0.5</version>
+ <description>openutils base Spring-Hibernate DAO for java 5.0</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</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-beans</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-orm</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-aop</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.1.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <spring.version>2.5.6</spring.version>
+ </properties>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.0.5</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.0.5</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-2.0.5</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-04-18 08:50:58
|
Revision: 1156
http://openutils.svn.sourceforge.net/openutils/?rev=1156&view=rev
Author: fgiust
Date: 2009-04-18 08:50:56 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-bshd5-2.0.5
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2009-04-18 08:50:22 UTC (rev 1155)
+++ trunk/openutils-bshd5/pom.xml 2009-04-18 08:50:56 UTC (rev 1156)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -9,7 +8,7 @@
</parent>
<artifactId>openutils-bshd5</artifactId>
<name>openutils base Spring-Hibernate DAO for java 5.0</name>
- <version>2.0.5-SNAPSHOT</version>
+ <version>2.0.5</version>
<description>openutils base Spring-Hibernate DAO for java 5.0</description>
<dependencies>
<dependency>
@@ -105,4 +104,10 @@
<properties>
<spring.version>2.5.6</spring.version>
</properties>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.0.5</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-bshd5-2.0.5</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-bshd5-2.0.5</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-04-18 08:50:25
|
Revision: 1155
http://openutils.svn.sourceforge.net/openutils/?rev=1155&view=rev
Author: fgiust
Date: 2009-04-18 08:50:22 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
removed cglib dependency
Modified Paths:
--------------
trunk/openutils-bshd5/pom.xml
Modified: trunk/openutils-bshd5/pom.xml
===================================================================
--- trunk/openutils-bshd5/pom.xml 2009-04-18 08:48:33 UTC (rev 1154)
+++ trunk/openutils-bshd5/pom.xml 2009-04-18 08:50:22 UTC (rev 1155)
@@ -86,11 +86,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
- </dependency>
- <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-04-18 08:48:35
|
Revision: 1154
http://openutils.svn.sourceforge.net/openutils/?rev=1154&view=rev
Author: fgiust
Date: 2009-04-18 08:48:33 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
changes
Modified Paths:
--------------
trunk/openutils-bshd5/src/site/changes/changes.xml
Modified: trunk/openutils-bshd5/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-bshd5/src/site/changes/changes.xml 2009-04-16 15:42:17 UTC (rev 1153)
+++ trunk/openutils-bshd5/src/site/changes/changes.xml 2009-04-18 08:48:33 UTC (rev 1154)
@@ -8,7 +8,10 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
- <release version="2.0.3" date="in svn" description="2.0.3">
+ <release version="2.0.5" date="2009-02-18">
+ <action type="update" dev="fgiust">Updated spring and slf4j dependency versions</action>
+ </release>
+ <release version="2.0.3" date="" description="2.0.3">
<action type="update" dev="fgiust">Updated spring and slf4j versions</action>
<action type="update" dev="fgiust">getNamedQuery() methods deprecated and replaced by better named
findByNamedQuery()</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-04-16 15:42:20
|
Revision: 1153
http://openutils.svn.sourceforge.net/openutils/?rev=1153&view=rev
Author: fgiust
Date: 2009-04-16 15:42:17 +0000 (Thu, 16 Apr 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-04-16 15:42:03 UTC (rev 1152)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-04-16 15:42:17 UTC (rev 1153)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlmedia</artifactId>
<name>openutils-mgnlmedia</name>
- <version>4.0-b2</version>
+ <version>4.0-b3-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -74,10 +74,4 @@
</exclusions>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b2</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b2</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.0-b2</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.
|
