From: <fg...@us...> - 2010-03-19 23:27:29
|
Revision: 2187 http://openutils.svn.sourceforge.net/openutils/?rev=2187&view=rev Author: fgiust Date: 2010-03-19 23:27:20 +0000 (Fri, 19 Mar 2010) Log Message: ----------- [maven-release-plugin] copy for tag openutils-mgnlmedia-4.2-b3 Added Paths: ----------- tags/openutils-mgnlmedia-4.2-b3/ tags/openutils-mgnlmedia-4.2-b3/pom.xml tags/openutils-mgnlmedia-4.2-b3/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java tags/openutils-mgnlmedia-4.2-b3/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties tags/openutils-mgnlmedia-4.2-b3/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java Removed Paths: ------------- tags/openutils-mgnlmedia-4.2-b3/pom.xml tags/openutils-mgnlmedia-4.2-b3/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java tags/openutils-mgnlmedia-4.2-b3/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties tags/openutils-mgnlmedia-4.2-b3/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java Property changes on: tags/openutils-mgnlmedia-4.2-b3 ___________________________________________________________________ Added: svn:ignore + .settings .checkstyle .classpath .project target test-output temp-testng-customsuite.xml pom.xml.releaseBackup release.properties 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.2-b3/pom.xml =================================================================== --- trunk/openutils-mgnlmedia/pom.xml 2010-03-19 09:34:10 UTC (rev 2159) +++ tags/openutils-mgnlmedia-4.2-b3/pom.xml 2010-03-19 23:27:20 UTC (rev 2187) @@ -1,161 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils-parent</artifactId> - <version>1.2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - <artifactId>openutils-mgnlmedia</artifactId> - <name>Magnolia SimpleMedia Module</name> - <description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management multimedia assets.</description> - <version>4.2-b3-SNAPSHOT</version> - <inceptionYear>2008</inceptionYear> - <licenses> - <license> - <name>GPLv3</name> - <url>http://www.gnu.org/licenses/gpl-3.0.txt</url> - </license> - </licenses> - <url>http://www.openmindlab.com/lab/products/media.html</url> - <issueManagement> - <system>jira</system> - <url>http://jira.openmindlab.com/browse/MEDIA</url> - </issueManagement> - <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url> - </scm> - <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> - <reporting> - <plugins> - <plugin> - <groupId>net.sourceforge.maven-taglib</groupId> - <artifactId>maven-taglib-plugin</artifactId> - <version>2.4</version> - <configuration> - <parseHtml>true</parseHtml> - <dontRecurseIntoSubdirs>true</dontRecurseIntoSubdirs> - </configuration> - </plugin> - <plugin> - <artifactId>maven-changes-plugin</artifactId> - <version>2.3</version> - <reportSets> - <reportSet> - <reports> - <report>jira-report</report> - </reports> - </reportSet> - </reportSets> - </plugin> - </plugins> - </reporting> - <dependencies> - <dependency> - <groupId>info.magnolia</groupId> - <artifactId>magnolia-core</artifactId> - <version>${magnolia.version}</version> - </dependency> - <dependency> - <groupId>info.magnolia</groupId> - <artifactId>magnolia-module-admininterface</artifactId> - <version>${magnolia.version}</version> - </dependency> - <dependency> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils-mgnltasks</artifactId> - <version>4.0.4</version> - </dependency> - <dependency> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils-mgnlext</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils-elfunctions</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>info.magnolia</groupId> - <artifactId>magnolia-module-standard-templating-kit</artifactId> - <version>1.2</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>com.drewnoakes</groupId> - <artifactId>metadata-extractor</artifactId> - <version>2.4.0-beta-1</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.pdfbox</groupId> - <artifactId>pdfbox</artifactId> - <version>1.0.0</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - <version>5.1</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> - <properties> - <magnolia.version>4.2.3</magnolia.version> - </properties> -</project> \ No newline at end of file Copied: tags/openutils-mgnlmedia-4.2-b3/pom.xml (from rev 2186, trunk/openutils-mgnlmedia/pom.xml) =================================================================== --- tags/openutils-mgnlmedia-4.2-b3/pom.xml (rev 0) +++ tags/openutils-mgnlmedia-4.2-b3/pom.xml 2010-03-19 23:27:20 UTC (rev 2187) @@ -0,0 +1,179 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils-parent</artifactId> + <version>1.2</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <packaging>jar</packaging> + <artifactId>openutils-mgnlmedia</artifactId> + <name>Magnolia SimpleMedia Module</name> + <description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management multimedia assets.</description> + <version>4.2-b3</version> + <inceptionYear>2008</inceptionYear> + <licenses> + <license> + <name>GPLv3</name> + <url>http://www.gnu.org/licenses/gpl-3.0.txt</url> + </license> + </licenses> + <url>http://www.openmindlab.com/lab/products/media.html</url> + <issueManagement> + <system>jira</system> + <url>http://jira.openmindlab.com/browse/MEDIA</url> + </issueManagement> + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.2-b3</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.2-b3</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.2-b3</url> + </scm> + <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> + <reporting> + <plugins> + <plugin> + <groupId>net.sourceforge.maven-taglib</groupId> + <artifactId>maven-taglib-plugin</artifactId> + <version>2.4</version> + <configuration> + <parseHtml>true</parseHtml> + <dontRecurseIntoSubdirs>true</dontRecurseIntoSubdirs> + </configuration> + </plugin> + <plugin> + <artifactId>maven-changes-plugin</artifactId> + <version>2.3</version> + <reportSets> + <reportSet> + <reports> + <report>jira-report</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + <dependencies> + <dependency> + <groupId>info.magnolia</groupId> + <artifactId>magnolia-core</artifactId> + <version>${magnolia.version}</version> + <exclusions> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + <exclusion> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jdmk</groupId> + <artifactId>jmxtools</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>info.magnolia</groupId> + <artifactId>magnolia-module-admininterface</artifactId> + <version>${magnolia.version}</version> + </dependency> + <dependency> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils-mgnltasks</artifactId> + <version>4.0.4</version> + </dependency> + <dependency> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils-mgnlext</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils-elfunctions</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>info.magnolia</groupId> + <artifactId>magnolia-module-standard-templating-kit</artifactId> + <version>1.2</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.drewnoakes</groupId> + <artifactId>metadata-extractor</artifactId> + <version>2.4.0-beta-1</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox</artifactId> + <version>1.0.0</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + <version>5.1</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> + <properties> + <magnolia.version>4.3</magnolia.version> + </properties> +</project> \ No newline at end of file Deleted: tags/openutils-mgnlmedia-4.2-b3/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-03-19 09:34:10 UTC (rev 2159) +++ tags/openutils-mgnlmedia-4.2-b3/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-03-19 23:27:20 UTC (rev 2187) @@ -1,177 +0,0 @@ -/** - * - * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html) - * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -package net.sourceforge.openutils.mgnlmedia.playlist.pages; - -import info.magnolia.cms.core.Content; -import info.magnolia.cms.util.ContentUtil; -import info.magnolia.cms.util.NodeDataUtil; - -import java.util.ArrayList; -import java.util.List; - -import javax.jcr.RepositoryException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule; -import net.sourceforge.openutils.mgnlmedia.media.pages.MessagesTemplatedMVCHandler; -import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl; -import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants; - -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -/** - * @author dschivo - */ -public class PlaylistView extends MessagesTemplatedMVCHandler -{ - - /** - * Logger. - */ - private Logger log = LoggerFactory.getLogger(PlaylistView.class); - - private String path; - - private PlaylistBean playlist; - - private String title; - - private String description; - - /** - * - */ - public PlaylistView(String name, HttpServletRequest request, HttpServletResponse response) - { - super(name, request, response); - } - - /** - * Sets the path. - * @param path the path to set - */ - public void setPath(String path) - { - this.path = path; - } - - /** - * Returns the playlist. - * @return the playlist - */ - public PlaylistBean getPlaylist() - { - return playlist; - } - - /** - * Sets the title. - * @param title the title to set - */ - public void setTitle(String title) - { - this.title = title; - } - - /** - * Sets the description. - * @param description the description to set - */ - public void setDescription(String description) - { - this.description = description; - } - - /** - * {@inheritDoc} - */ - @Override - public String show() - { - if (StringUtils.isNotBlank(path)) - { - Content node = ContentUtil.getContent(PlaylistConstants.REPO, path); - if (node != null) - { - playlist = new PlaylistBean(); - playlist.setUuid(node.getUUID()); - playlist.setHandle(node.getHandle()); - playlist.setTitle(NodeDataUtil.getString(node, "title")); - playlist.setDescription(NodeDataUtil.getString(node, "description")); - List<PlaylistEntryBean> entries = new ArrayList<PlaylistEntryBean>(); - for (Content subNode : node.getChildren(PlaylistConstants.PLAYLIST_ENTRY)) - { - PlaylistEntryBean entry = new PlaylistEntryBean(); - entry.setHandle(subNode.getHandle()); - String mediaUUID = NodeDataUtil.getString(subNode, "media"); - Content media = ContentUtil.getContentByUUID(MediaModule.REPO, mediaUUID); - if (media != null) - { - entry.setMedia(media.getUUID()); - entry.setThumbnail(MediaEl.thumbnail(media)); - entry.setType(NodeDataUtil.getString(media, "type")); - entry.setTitle(MediaEl.title(media)); - entry.setDescription(MediaEl.desc(media)); - entry.setTags(StringUtils.join(MediaEl.tags(media), ", ")); - } - else - { - log.warn( - "Node {} referenced by entry {} of playlist {} does not exist in media repository", - new Object[]{mediaUUID, subNode.getName(), playlist.getHandle() }); - } - entries.add(entry); - } - playlist.setEntries(entries); - } - else - { - log.warn("Node {} does not exist in playlist repository", path); - } - } - return super.show(); - } - - public String save() - { - Content node = ContentUtil.getContent(PlaylistConstants.REPO, path); - if (node != null) - { - try - { - NodeDataUtil.getOrCreateAndSet(node, "title", title); - NodeDataUtil.getOrCreateAndSet(node, "description", description); - if (MediaEl.module().isSingleinstance()) - { - node.getMetaData().setActivated(); - } - node.save(); - } - catch (RepositoryException e) - { - } - } - return null; - } -} Copied: tags/openutils-mgnlmedia-4.2-b3/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java (from rev 2181, trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java) =================================================================== --- tags/openutils-mgnlmedia-4.2-b3/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java (rev 0) +++ tags/openutils-mgnlmedia-4.2-b3/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2010-03-19 23:27:20 UTC (rev 2187) @@ -0,0 +1,177 @@ +/** + * + * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html) + * Copyright(C) 2008-2010, Openmind S.r.l. http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +package net.sourceforge.openutils.mgnlmedia.playlist.pages; + +import info.magnolia.cms.core.Content; +import info.magnolia.cms.util.ContentUtil; +import info.magnolia.cms.util.NodeDataUtil; + +import java.util.ArrayList; +import java.util.List; + +import javax.jcr.RepositoryException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule; +import net.sourceforge.openutils.mgnlmedia.media.pages.MessagesTemplatedMVCHandler; +import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl; +import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants; + +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * @author dschivo + */ +public class PlaylistView extends MessagesTemplatedMVCHandler +{ + + /** + * Logger. + */ + private Logger log = LoggerFactory.getLogger(PlaylistView.class); + + private String path; + + private PlaylistBean playlist; + + private String title; + + private String description; + + /** + * + */ + public PlaylistView(String name, HttpServletRequest request, HttpServletResponse response) + { + super(name, request, response); + } + + /** + * Sets the path. + * @param path the path to set + */ + public void setPath(String path) + { + this.path = path; + } + + /** + * Returns the playlist. + * @return the playlist + */ + public PlaylistBean getPlaylist() + { + return playlist; + } + + /** + * Sets the title. + * @param title the title to set + */ + public void setTitle(String title) + { + this.title = title; + } + + /** + * Sets the description. + * @param description the description to set + */ + public void setDescription(String description) + { + this.description = description; + } + + /** + * {@inheritDoc} + */ + @Override + public String show() + { + if (StringUtils.isNotBlank(path)) + { + Content node = ContentUtil.getContent(PlaylistConstants.REPO, path); + if (node != null) + { + playlist = new PlaylistBean(); + playlist.setUuid(node.getUUID()); + playlist.setHandle(node.getHandle()); + playlist.setTitle(NodeDataUtil.getString(node, "title")); + playlist.setDescription(NodeDataUtil.getString(node, "description")); + List<PlaylistEntryBean> entries = new ArrayList<PlaylistEntryBean>(); + for (Content subNode : node.getChildren(PlaylistConstants.PLAYLIST_ENTRY)) + { + String mediaUUID = NodeDataUtil.getString(subNode, "media"); + Content media = ContentUtil.getContentByUUID(MediaModule.REPO, mediaUUID); + if (media != null) + { + PlaylistEntryBean entry = new PlaylistEntryBean(); + entry.setHandle(subNode.getHandle()); + entry.setMedia(media.getUUID()); + entry.setThumbnail(MediaEl.thumbnail(media)); + entry.setType(NodeDataUtil.getString(media, "type")); + entry.setTitle(MediaEl.title(media)); + entry.setDescription(MediaEl.desc(media)); + entry.setTags(StringUtils.join(MediaEl.tags(media), ", ")); + entries.add(entry); + } + else + { + log.warn( + "Node {} referenced by entry {} of playlist {} does not exist in media repository", + new Object[]{mediaUUID, subNode.getName(), playlist.getHandle() }); + } + } + playlist.setEntries(entries); + } + else + { + log.warn("Node {} does not exist in playlist repository", path); + } + } + return super.show(); + } + + public String save() + { + Content node = ContentUtil.getContent(PlaylistConstants.REPO, path); + if (node != null) + { + try + { + NodeDataUtil.getOrCreateAndSet(node, "title", title); + NodeDataUtil.getOrCreateAndSet(node, "description", description); + if (MediaEl.module().isSingleinstance()) + { + node.getMetaData().setActivated(); + } + node.save(); + } + catch (RepositoryException e) + { + } + } + return null; + } +} Copied: tags/openutils-mgnlmedia-4.2-b3/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties (from rev 2182, trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties) =================================================================== --- tags/openutils-mgnlmedia-4.2-b3/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties (rev 0) +++ tags/openutils-mgnlmedia-4.2-b3/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2010-03-19 23:27:20 UTC (rev 2187) @@ -0,0 +1,110 @@ +media.dialogs.tabDescription.description.label=Description + +media.dialogs.tabAbstract.abstract.label=Abstract + +media.dialogs.tabTags.tags.label=Tags + +media.dialogs.mediaImageDlg.label= Image +media.dialogs.mediaAudioDlg.label= Audio +media.dialogs.mediaVideoDlg.label=Video +media.dialogs.mediaYoutubeDlg.label= External Video +media.dialogs.mediaDocumentDlg.label= Document + +media.dialogs.mediaVideoDlg.tabVideo.image.description=Preview image + + +media.dialogs.tabImage.label=Image +media.dialogs.tabImage.image.label=Image + +media.dialogs.tabAudio.label=Audio +media.dialogs.tabAudio.audio.label=Audio + +media.dialogs.tabVideo.label=Video +media.dialogs.tabVideo.video.label=Video +media.dialogs.tabVideo.image.label=Preview image + +media.dialogs.tabDocument.label=Document +media.dialogs.tabDocument.document.label=File + +media.dialogs.tabVideo.videoUrl.label=External video url +media.dialogs.tabVideo.videoUrl.description=flv absolute url or youtube url + + +media.dialogs.tabTitle.label=Title +media.dialogs.tabTitle.title.label=Title +media.dialogs.tabAbstract.label=Abstract +media.dialogs.tabDescription.label=Description +media.dialogs.tabTags.label=Tags +media.dialogs.tabAttributes.label=Attributes +media.dialogs.tabAttributes.copyright.label=Copyright +media.dialogs.tabAttributes.source.label=Source +media.dialogs.tabAttributes.creator.label=Created by +media.dialogs.tabAttributes.creationDate.label=Created on +media.dialogs.tabAttributes.modificationDate.label=Modified on + +tree.media.folders=Media folders tree +media.loadzip=Load zip archive +media.select=Select media... +media.remove=Remove media + +media.types.image=Images +media.types.audio=Mp3s +media.types.youtube=External videos +media.types.video=Flvs +media.types.document=Documents + + +media.types.image.load=Upload new image +media.types.audio.load=Upload new mp3 +media.types.youtube.load=Link external video +media.types.video.load=Upload new flv +media.types.document.load=Upload new document + +media.download=Download +media.edit=Edit +media.delete=Delete +media.copy=Copy +media.move=Move +media.activate=Activate +media.deactivate=Deactivate +media.pages=Pages +media.nopages=Not used +media.notpublished=Not activated +media.select=Select + +media.menu.title=Media +media.menu.browse=Browse +media.menu.search=Search + +buttons.ok=Ok +buttons.cancel=Cancel + +dialog.filenopreview.extensions=Valid file extensions: +dialog.filenopreview.error.extension=File extension for field {0} not valid + +media.footer.text=SimpleMedia module version {0} by Openmind. <a href="http://www.openmindlab.com/lab/products/media/getsupport.html" target="blank">Need support?</a> <a href="http://www.openmindlab.com/lab/products/media/getsupport.html" target="blank">Want more?</a> + +media.move.error.selectnode=Select a node +media.move.error.samenode=It is not allowed to move a node inside itself. + +media.info.media_extension=Extension: {0} +media.info.media_size=Size: {0} +media.info.media_width=Width: {0}px +media.info.media_height=Height: {0}px +media.info.media_bitdepth=Bit depth: {0} +media.info.media_duration=Duration: {0} +media.info.media_framerate=Frame rate: {0} fps +media.info.media_pages= Number of pages: {0} + +media.bgselector.white=White +media.bgselector.transparent=Transparent +media.bgselector.black=Black + +stk.dam.mediauuid.description=Select or create a new media +stk.dam.mediauuid.label=Select media + +tree.playlists=Playlists tree +tree.playlists.new=New playlist +tree.playlists.column=Playlists +playlist.entries.add=Add entry +playlist.entries.remove=Remove entry Deleted: tags/openutils-mgnlmedia-4.2-b3/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-03-19 09:34:10 UTC (rev 2159) +++ tags/openutils-mgnlmedia-4.2-b3/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2010-03-19 23:27:20 UTC (rev 2187) @@ -1,110 +0,0 @@ -media.dialogs.tabDescription.description.label=Description - -media.dialogs.tabAbstract.abstract.label=Abstract - -media.dialogs.tabTags.tags.label=Tags - -media.dialogs.mediaImageDlg.label= Image -media.dialogs.mediaAudioDlg.label= Audio -media.dialogs.mediaVideoDlg.label=Video -media.dialogs.mediaYoutubeDlg.label= External Video -media.dialogs.mediaDocumentDlg.label= Document - -media.dialogs.mediaVideoDlg.tabVideo.image.description=Preview image - - -media.dialogs.tabImage.label=Image -media.dialogs.tabImage.image.label=Image - -media.dialogs.tabAudio.label=Audio -media.dialogs.tabAudio.audio.label=Audio - -media.dialogs.tabVideo.label=Video -media.dialogs.tabVideo.video.label=Video -media.dialogs.tabVideo.image.label=Preview image - -media.dialogs.tabDocument.label=Document -media.dialogs.tabDocument.document.label=File - -media.dialogs.tabVideo.videoUrl.label=External video url -media.dialogs.tabVideo.videoUrl.description=flv absolute url or youtube url - - -media.dialogs.tabTitle.label=Title -media.dialogs.tabTitle.title.label=Title -media.dialogs.tabAbstract.label=Abstract -media.dialogs.tabDescription.label=Description -media.dialogs.tabTags.label=Tags -media.dialogs.tabAttributes.label=Attributes -media.dialogs.tabAttributes.copyright.label=Copyright -media.dialogs.tabAttributes.source.label=Source -media.dialogs.tabAttributes.creator.label=Created by -media.dialogs.tabAttributes.creationDate.label=Created on -media.dialogs.tabAttributes.modificationDate.label=Modified on - -tree.media.folders=Media folders tree -media.loadzip=Load zip archive -media.select=Select media... -media.remove=Remove media - -media.types.image=Images -media.types.audio=Mp3s -media.types.youtube=External videos -media.types.video=Flvs -media.types.document=Documents - - -media.types.image.load=Upload new image -media.types.audio.load=Upload new mp3 -media.types.youtube.load=Link external video -media.types.video.load=Upload new flv -media.types.document.load=Upload new document - -media.download=Download -media.edit=Edit -media.delete=Delete -media.copy=Copy -media.move=Move -media.activate=Activate -media.deactivate=Deactivate -media.pages=Pages -media.nopages=Not used -media.notpublished=Not activated -media.select=Select - -media.menu.title=Media -media.menu.browse=Browse -media.menu.search=Search - -buttons.ok=Ok -buttons.cancel=Cancel - -dialog.filenopreview.extensions=Valid file extensions: -dialog.filenopreview.error.extension=File extension for field {0} not valid - -media.footer.text=SimpleMedia module version {0} by Openmind. <a href="http://www.openmindlab.com/lab/products/media/getsupport.html" target="blank">Need support?</a> <a href="http://www.openmindlab.com/lab/products/media/getsupport.html" target="blank">Want more?</a> - -media.move.error.selectnode=Select a node -media.move.error.samenode=It is not allowed to move a node inside itself. - -media.info.media_extension=Extension: {0} -media.info.media_size=Size: {0} -media.info.media_width=Width: {0}px -media.info.media_height=Height: {0}px -media.info.media_bitdepth=Bit depth: {0} -media.info.media_duration=Duration: {0} -media.info.media_framerate=Frame rate: {0} fps -media.info.media_pages= Number of pages: {0} - -media.bgselector.white=White -media.bgselector.transparent=Transparent -media.bgselector.black=Black - -stk.dam.mediauuid.description=Select or create a new media -stk.dam.mediauuid.label=Select media - -tree.playlists=Playlists tree -tree.playlists.new=New playlist -tree.playlists.column=Playlists -playlist.entries.add=Add entry -playlist.entries.remove=Remove entry Deleted: tags/openutils-mgnlmedia-4.2-b3/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java =================================================================== --- trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java 2010-03-19 09:34:10 UTC (rev 2159) +++ tags/openutils-mgnlmedia-4.2-b3/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java 2010-03-19 23:27:20 UTC (rev 2187) @@ -1,408 +0,0 @@ -/** - * - * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html) - * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -package net.sourceforge.openutils.mgnlmedia.media.utils; - -import info.magnolia.cms.core.Content; -import info.magnolia.cms.core.HierarchyManager; -import info.magnolia.cms.core.NodeData; -import info.magnolia.cms.security.AccessDeniedException; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Calendar; -import java.util.Collection; - -import javax.jcr.ItemNotFoundException; -import javax.jcr.PathNotFoundException; -import javax.jcr.Property; -import javax.jcr.RepositoryException; -import javax.jcr.Value; - -import org.apache.commons.io.IOUtils; - - -/** - * @author fgiust - * @version $Id$ - */ -public class FileNodeData implements NodeData -{ - - private byte[] content; - - /** - * @param classpathLocation - * @throws IOException - */ - public FileNodeData(String classpathLocation) throws IOException - { - InputStream is = getClass().getResourceAsStream(classpathLocation); - if (is == null) - { - throw new IllegalArgumentException("Classpath resource " + classpathLocation + " cannot be found"); - } - try - { - content = IOUtils.toByteArray(is); - } - finally - { - IOUtils.closeQuietly(is); - } - } - - /** - * {@inheritDoc} - */ - public void delete() throws RepositoryException - { - // TODO Auto-generated method stub - - } - - /** - * {@inheritDoc} - */ - public String getAttribute(String arg0) - { - // TODO Auto-generated method stub - return null; - } - - /** - * {@inheritDoc} - */ - @SuppressWarnings("unchecked") - public Collection getAttributeNames() throws RepositoryException - { - // TODO Auto-generated method stub - return null; - } - - /** - * {@inheritDoc} - */ - public boolean getBoolean() - { - // TODO Auto-generated method stub - return false; - } - - /** - * {@inheritDoc} - */ - public long getContentLength() - { - // TODO Auto-generated method stub - return 0; - } - - /** - * {@inheritDoc} - */ - public Calendar getDate() - { - // TODO Auto-generated method stub - return null; - } - - /** - * {@inheritDoc} - */ - public double getDouble() - { - // TODO Auto-generated method stub - return 0; - } - - /** - * {@inheritDoc} - */ - public String getHandle() - { - // TODO Auto-generated method stub - return null; - } - - /** - * {@inheritDoc} - */ - public HierarchyManager getHierarchyManager() - { - // TODO Auto-generated method stub - return null; - } - - /** - * {@inheritDoc} - */ - public Property getJCRProperty() - { - // TODO Auto-generated method stub - return null; - } - - /** - * {@inheritDoc} - */ - public long getLong() - { - // TODO Auto-generated method stub - return 0; - } - - /** - * {@inheritDoc} - */ - public String getName() - { - // TODO Auto-generated method stub - return null; - } - - /** - * {@inheritDoc} - */ - public Content getParent() throws AccessDeniedException, ItemNotFoundException, javax.jcr.AccessDeniedException, - RepositoryException - { - // TODO Auto-generated method stub - return null; - } - - /** - * {@inheritDoc} - */ - public Content getReferencedContent() throws RepositoryException, PathNotFoundException, RepositoryException - { - // TODO Auto-generated method stub - return null; - } - - /** - * {@inheritDoc} - */ - public Content getReferencedContent(String arg0) throws PathNotFoundException, RepositoryException - { - // TODO Auto-generated method stub - return null; - } - - /** - * {@inheritDoc} - */ - public InputStream getStream() - { - return new ByteArrayInputStream(content); - } - - /** - * {@inheritDoc} - */ - public String getString() - { - // TODO Auto-generated method stub - return null; - } - - /** - * {@inheritDoc} - */ - public String getString(String arg0) - { - // TODO Auto-generated method stub - return null; - } - - /** - * {@inheritDoc} - */ - public int getType() - { - // TODO Auto-generated method stub - return 0; - } - - /** - * {@inheritDoc} - */ - public Value getValue() - { - // TODO Auto-generated method stub - return null; - } - - /** - * {@inheritDoc} - */ - public Value[] getValues() - { - // TODO Auto-generated method stub - return null; - } - - /** - * {@inheritDoc} - */ - public boolean isExist() - { - // TODO Auto-generated method stub - return false; - } - - /** - * {@inheritDoc} - */ - public boolean isGranted(long arg0) - { - // TODO Auto-generated method stub - return false; - } - - /** - * {@inheritDoc} - */ - public int isMultiValue() - { - // TODO Auto-generated method stub - return 0; - } - - /** - * {@inheritDoc} - */ - public void refresh(boolean arg0) throws RepositoryException - { - // TODO Auto-generated method stub - - } - - /** - * {@inheritDoc} - */ - public void save() throws RepositoryException - { - // TODO Auto-generated method stub - - } - - /** - * {@inheritDoc} - */ - public void setAttribute(String arg0, String arg1) throws RepositoryException, AccessDeniedException, - UnsupportedOperationException - { - // TODO Auto-generated method stub - - } - - /** - * {@inheritDoc} - */ - public void setAttribute(String arg0, Calendar arg1) throws RepositoryException, AccessDeniedException, - UnsupportedOperationException - { - // TODO Auto-generated method stub - - } - - /** - * {@inheritDoc} - */ - public void setValue(String arg0) throws RepositoryException, AccessDeniedException - { - // TODO Auto-generated method stub - - } - - /** - * {@inheritDoc} - */ - public void setValue(int arg0) throws RepositoryException, AccessDeniedException - { - // TODO Auto-generated method stub - - } - - /** - * {@inheritDoc} - */ - public void setValue(long arg0) throws RepositoryException, AccessDeniedException - { - // TODO Auto-generated method stub - - } - - /** - * {@inheritDoc} - */ - public void setValue(InputStream arg0) throws RepositoryException, AccessDeniedException - { - // TODO Auto-generated method stub - - } - - /** - * {@inheritDoc} - */ - public void setValue(double arg0) throws RepositoryException, AccessDeniedException - { - // TODO Auto-generated method stub - - } - - /** - * {@inheritDoc} - */ - public void setValue(boolean arg0) throws RepositoryException, AccessDeniedException - { - // TODO Auto-generated method stub - - } - - /** - * {@inheritDoc} - */ - public void setValue(Calendar arg0) throws RepositoryException, AccessDeniedException - { - // TODO Auto-generated method stub - - } - - /** - * {@inheritDoc} - */ - public void setValue(Value arg0) throws RepositoryException, AccessDeniedException - { - // TODO Auto-generated method stub - - } - - /** - * {@inheritDoc} - */ - public void setValue(Value[] arg0) throws RepositoryException, AccessDeniedException - { - // TODO Auto-generated method stub - - } - -} Copied: tags/openutils-mgnlmedia-4.2-b3/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java (from rev 2184, trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java) =================================================================== --- tags/openutils-mgnlmedia-4.2-b3/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java (rev 0) +++ tags/openutils-mgnlmedia-4.2-b3/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java 2010-03-19 23:27:20 UTC (rev 2187) @@ -0,0 +1,416 @@ +/** + * + * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html) + * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +package net.sourceforge.openutils.mgnlmedia.media.utils; + +import info.magnolia.cms.core.Content; +import info.magnolia.cms.core.HierarchyManager; +import info.magnolia.cms.core.NodeData; +import info.magnolia.cms.security.AccessDeniedException; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Calendar; +import java.util.Collection; + +import javax.jcr.ItemNotFoundException; +import javax.jcr.PathNotFoundException; +import javax.jcr.Property; +import javax.jcr.RepositoryException; +import javax.jcr.Value; + +import org.apache.commons.io.IOUtils; + + +/** + * @author fgiust + * @version $Id$ + */ +public class FileNodeData implements NodeData +{ + + private byte[] content; + + /** + * @param classpathLocation + * @throws IOException + */ + public FileNodeData(String classpathLocation) throws IOException + { + InputStream is = getClass().getResourceAsStream(classpathLocation); + if (is == null) + { + throw new IllegalArgumentException("Classpath resource " + classpathLocation + " cannot be found"); + } + try + { + content = IOUtils.toByteArray(is); + } + finally + { + IOUtils.closeQuietly(is); + } + } + + /** + * {@inheritDoc} + */ + public void delete() throws RepositoryException + { + // TODO Auto-generated method stub + + } + + /** + * {@inheritDoc} + */ + public String getAttribute(String arg0) + { + // TODO Auto-generated method stub + return null; + } + + /** + * {@inheritDoc} + */ + @SuppressWarnings("unchecked") + public Collection getAttributeNames() throws RepositoryException + { + // TODO Auto-generated method stub + return null; + } + + /** + * {@inheritDoc} + */ + public boolean getBoolean() + { + // TODO Auto-generated method stub + return false; + } + + /** + * {@inheritDoc} + */ + public long getContentLength() + { + // TODO Auto-generated method stub + return 0; + } + + /** + * {@inheritDoc} + */ + public Calendar getDate() + { + // TODO Auto-generated method stub + return null; + } + + /** + * {@inheritDoc} + */ + public double getDouble() + { + // TODO Auto-generated method stub + return 0; + } + + /** + * {@inheritDoc} + */ + public String getHandle() + { + // TODO Auto-generated method stub + return null; + } + + /** + * {@inheritDoc} + */ + public HierarchyManager getHierarchyManager() + { + // TODO Auto-generated method stub + return null; + } + + /** + * {@inheritDoc} + */ + public Property getJCRProperty() + { + // TODO Auto-generated method stub + return null; + } + + /** + * {@inheritDoc} + */ + public long getLong() + { + // TODO Auto-generated method stub + return 0; + } + + /** + * {@inheritDoc} + */ + public String getName() + { + // TODO Auto-generated method stub + return null; + } + + /** + * {@inheritDoc} + */ + public Content getParent() throws AccessDeniedException, ItemNotFoundException, javax.jcr.AccessDeniedException, + RepositoryException + { + // TODO Auto-generated method stub + return null; + } + + /** + * {@inheritDoc} + */ + public Content getReferencedContent() throws RepositoryException, PathNotFoundException, RepositoryException + { + // TODO Auto-generated method stub + return null; + } + + /** + * {@inheritDoc} + */ + public Content getReferencedContent(String arg0) throws PathNotFoundException, RepositoryException + { + // TODO Auto-generated method stub + return null; + } + + /** + * {@inheritDoc} + */ + public InputStream getStream() + { + return new ByteArrayInputStream(content); + } + + /** + * {@inheritDoc} + */ + public String getString() + { + // TODO Auto-generated method stub + return null; + } + + /** + * {@inheritDoc} + */ + public String getString(String arg0) + { + // TODO Auto-generated method stub + return null; + } + + /** + * {@inheritDoc} + */ + public int getType() + { + // TODO Auto-generated method stub + return 0; + } + + /** + * {@inheritDoc} + */ + public Value getValue() + { + // TODO Auto-generated method stub + return null; + } + + /** + * {@inheritDoc} + */ + public Value[] getValues() + { + // TODO Auto-generated method stub + return null; + } + + /** + * {@inheritDoc} + */ + public boolean isExist() + { + // TODO Auto-generated method stub + return false; + } + + /** + * {@inheritDoc} + */ + public boolean isGranted(long arg0) + { + // TODO Auto-generated method stub + return false; + } + + /** + * {@inheritDoc} + */ + public int isMultiValue() + { + // TODO Auto-generated method stub + return 0; + } + + /** + * {@inheritDoc} + */ + public void refresh(boolean arg0) throws RepositoryException + { + // TODO Auto-generated method stub + + } + + /** + * {@inheritDoc} + */ + public void save() throws RepositoryException + { + // TODO Auto-generated method stub + + } + + /** + * {@inheritDoc} + */ + public void setAttribute(String arg0, String arg1) throws RepositoryException, AccessDeniedException, + UnsupportedOperationException + { + // TODO Auto-generated method stub + + } + + /** + * {@inheritDoc} + */ + public void setAttribute(String arg0, Calendar arg1) throws RepositoryException, AccessDeniedException, + UnsupportedOperationException + { + // TODO Auto-generated method stub + + } + + /** + * {@inheritDoc} + */ + public void setValue(String arg0) throws RepositoryException, AccessDeniedException + { + // TODO Auto-generated method stub + + } + + /** + * {@inheritDoc} + */ + public void setValue(int arg0) throws RepositoryException, AccessDeniedException + { + // TODO Auto-generated method stub + + } + + /** + * {@inheritDoc} + */ + public void setValue(long arg0) throws RepositoryException, AccessDeniedException + { + // TODO Auto-generated method stub + + } + + /** + * {@inheritDoc} + */ + public void setValue(InputStream arg0) throws RepositoryException, AccessDeniedException + { + // TODO Auto-generated method stub + + } + + /** + * {@inheritDoc} + */ + public void setValue(double arg0) throws RepositoryException, AccessDeniedException + { + // TODO Auto-generated method stub + + } + + /** + * {@inheritDoc} + */ + public void setValue(boolean arg0) throws RepositoryException, AccessDeniedException + { + // TODO Auto-generated method stub + + } + + /** + * {@inheritDoc} + */ + public void setValue(Calendar arg0) throws RepositoryException, AccessDeniedException + { + // TODO Auto-generated method stub + + } + + /** + * {@inheritDoc} + */ + public void setValue(Value arg0) throws RepositoryException, AccessDeniedException + { + // TODO Auto-generated method stub + + } + + /** + * {@inheritDoc} + */ + public void setValue(Value[] arg0) throws RepositoryException, AccessDeniedException + { + // TODO Auto-generated method stub + + } + + /** + * {@inheritDoc} + */ + public void setValue(Content value) throws RepositoryException, AccessDeniedException + { + // TODO Auto-generated method stub + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |