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-06-04 10:00:46
|
Revision: 1227
http://openutils.svn.sourceforge.net/openutils/?rev=1227&view=rev
Author: fgiust
Date: 2009-06-04 10:00:44 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
release date
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/site/changes/changes.xml
Modified: trunk/openutils-mgnlcontrols/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlcontrols/src/site/changes/changes.xml 2009-06-04 09:43:59 UTC (rev 1226)
+++ trunk/openutils-mgnlcontrols/src/site/changes/changes.xml 2009-06-04 10:00:44 UTC (rev 1227)
@@ -8,7 +8,7 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
- <release version="4.0.1" date="in svn" description="">
+ <release version="4.0.1" date="2009-06-04" description="">
<action type="add" dev="fgiust">Added a new mehod addToParameters in ConfigurableFreemarkerDialog that can be
overridden to supply custom values to the freemarker template</action>
<action type="fix" dev="fgiust">Update handling of multi-value properties in ConfigurableFreemarkerDialog to
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-06-04 09:44:06
|
Revision: 1226
http://openutils.svn.sourceforge.net/openutils/?rev=1226&view=rev
Author: fgiust
Date: 2009-06-04 09:43:59 +0000 (Thu, 04 Jun 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-06-04 09:43:52 UTC (rev 1225)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-06-04 09:43:59 UTC (rev 1226)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlmedia</artifactId>
<name>openutils-mgnlmedia</name>
- <version>4.0-b5</version>
+ <version>4.0-b6-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-b5</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b5</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.0-b5</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-06-04 09:43:53
|
Revision: 1225
http://openutils.svn.sourceforge.net/openutils/?rev=1225&view=rev
Author: fgiust
Date: 2009-06-04 09:43:52 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmedia-4.0-b5
Added Paths:
-----------
tags/openutils-mgnlmedia-4.0-b5/
tags/openutils-mgnlmedia-4.0-b5/pom.xml
Removed Paths:
-------------
tags/openutils-mgnlmedia-4.0-b5/pom.xml
Property changes on: tags/openutils-mgnlmedia-4.0-b5
___________________________________________________________________
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-b5/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-06-04 09:39:54 UTC (rev 1223)
+++ tags/openutils-mgnlmedia-4.0-b5/pom.xml 2009-06-04 09:43:52 UTC (rev 1225)
@@ -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-b5-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-b5/pom.xml (from rev 1224, trunk/openutils-mgnlmedia/pom.xml)
===================================================================
--- tags/openutils-mgnlmedia-4.0-b5/pom.xml (rev 0)
+++ tags/openutils-mgnlmedia-4.0-b5/pom.xml 2009-06-04 09:43:52 UTC (rev 1225)
@@ -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-b5</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-b5</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b5</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.0-b5</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-06-04 09:43:38
|
Revision: 1224
http://openutils.svn.sourceforge.net/openutils/?rev=1224&view=rev
Author: fgiust
Date: 2009-06-04 09:43:37 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmedia-4.0-b5
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2009-06-04 09:39:54 UTC (rev 1223)
+++ trunk/openutils-mgnlmedia/pom.xml 2009-06-04 09:43:37 UTC (rev 1224)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlmedia</artifactId>
<name>openutils-mgnlmedia</name>
- <version>4.0-b5-SNAPSHOT</version>
+ <version>4.0-b5</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-b5</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.0-b5</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.0-b5</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-06-04 09:40:10
|
Revision: 1223
http://openutils.svn.sourceforge.net/openutils/?rev=1223&view=rev
Author: fgiust
Date: 2009-06-04 09:39:54 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
release date
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-06-04 09:39:32 UTC (rev 1222)
+++ trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-06-04 09:39:54 UTC (rev 1223)
@@ -8,7 +8,7 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
- <release version="4.0-b5" date="in svn" description="">
+ <release version="4.0-b5" date="2009-06-04" description="">
<action type="fix" dev="fgiust">MediaCustomSaveHandler now only warns about missing referenced media without
blocking</action>
<action type="fix" dev="fgiust">Media jcr browser was displying duplicate nodes</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-06-04 09:39:38
|
Revision: 1222
http://openutils.svn.sourceforge.net/openutils/?rev=1222&view=rev
Author: fgiust
Date: 2009-06-04 09:39:32 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
jcr browser fix + fckedit integration
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.server.URI2RepositoryMapping.mappings.media.xml
trunk/openutils-mgnlmedia/src/site/changes/changes.xml
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.fckEditor.config.browsableRepositories.media-selector.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.media-selector.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2009-06-04 09:38:57 UTC (rev 1221)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java 2009-06-04 09:39:32 UTC (rev 1222)
@@ -18,6 +18,7 @@
package net.sourceforge.openutils.mgnlmedia.media.tree;
import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.gui.control.Tree;
import info.magnolia.cms.gui.control.TreeColumn;
import info.magnolia.cms.gui.control.TreeColumnHtmlRenderer;
@@ -44,9 +45,13 @@
{
// TODO Auto-generated method stub
super.prepareTree(tree, browseMode, request);
-
+
+ tree.getItemTypes().clear();
+
+ tree.addItemType(ItemType.CONTENT);
tree.addItemType(MediaConfigurationManager.MEDIA);
tree.addItemType(MediaConfigurationManager.RESOLUTIONS);
+ tree.addItemType(Tree.ITEM_TYPE_NODEDATA);
TreeColumn tc = TreeColumn.createColumn(tree, "Node type", new TreeColumnHtmlRenderer()
{
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java 2009-06-04 09:39:32 UTC (rev 1222)
@@ -0,0 +1,68 @@
+/**
+ * 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.tree;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.gui.control.Tree;
+import info.magnolia.cms.gui.control.TreeColumn;
+import info.magnolia.cms.gui.control.TreeColumnHtmlRenderer;
+import info.magnolia.module.admininterface.trees.JcrBrowserTreeConfiguration;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
+
+
+/**
+ * @author molaschi
+ * @version $Id$
+ */
+public class MediaBrowserConfiguration extends JcrBrowserTreeConfiguration
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void prepareTree(Tree tree, boolean browseMode, HttpServletRequest request)
+ {
+ super.prepareTree(tree, browseMode, request);
+
+ tree.getItemTypes().clear();
+
+ tree.addItemType(ItemType.CONTENT);
+ tree.addItemType(MediaConfigurationManager.MEDIA);
+
+ TreeColumn tc = TreeColumn.createColumn(tree, "Media type", new TreeColumnHtmlRenderer()
+ {
+
+ /**
+ * {@inheritDoc}
+ */
+ public String renderHtml(TreeColumn treeColumn, Content content)
+ {
+ return content.getNodeData("type").getString();
+ }
+
+ });
+
+ tree.addColumn(tc);
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaBrowserConfiguration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java 2009-06-04 09:39:32 UTC (rev 1222)
@@ -0,0 +1,94 @@
+/**
+ * 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.uri;
+
+import info.magnolia.cms.beans.config.URI2RepositoryMapping;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.link.Link;
+
+import javax.jcr.RepositoryException;
+
+import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class MediaURI2RepositoryMapping extends URI2RepositoryMapping
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(MediaURI2RepositoryMapping.class);
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getURI(Link uuidLink)
+ {
+ String urisimple = uuidLink.getHandle();
+
+ String uri;
+ try
+ {
+ uri = MediaEl.getUrl(MgnlContext.getHierarchyManager(getRepository()).getContent(urisimple));
+ }
+ catch (RepositoryException e)
+ {
+ log.warn(e.getClass().getName() + " resolving " + urisimple, e);
+ uri = urisimple;
+
+ if (StringUtils.isNotEmpty(getHandlePrefix()))
+ {
+ uri = StringUtils.removeStart(uri, getHandlePrefix());
+ }
+ if (StringUtils.isNotEmpty(getURIPrefix()))
+ {
+ uri = getURIPrefix() + "/" + uri;
+ }
+ }
+
+ return cleanHandle(uri);
+ }
+
+ /**
+ * Clean a handle. Remove double / and add always a leading /
+ * @param handle
+ * @return
+ */
+ private String cleanHandle(String handle)
+ {
+ if (!handle.startsWith("/"))
+ {
+ handle = "/" + handle;
+ }
+ while (handle.indexOf("//") != -1)
+ {
+ handle = StringUtils.replace(handle, "//", "/");
+ }
+ return handle;
+ }
+
+}
Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/uri/MediaURI2RepositoryMapping.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2009-06-04 09:38:57 UTC (rev 1221)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml 2009-06-04 09:39:32 UTC (rev 1222)
@@ -13,6 +13,10 @@
<version>4.0/*</version>
</dependency>
<dependency>
+ <name>fckEditor</name>
+ <version>4.0/*</version>
+ </dependency>
+ <dependency>
<name>cache</name>
<version>4.0/*</version>
</dependency>
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.fckEditor.config.browsableRepositories.media-selector.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.fckEditor.config.browsableRepositories.media-selector.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.fckEditor.config.browsableRepositories.media-selector.xml 2009-06-04 09:39:32 UTC (rev 1222)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="media-selector"
+ xmlns:jcr="http://www.jcp.org/jcr/1.0"
+ xmlns:mgnl="http://www.magnolia.info/jcr/mgnl" xmlns:rep="internal" xmlns:mix="http://www.jcp.org/jcr/mix/1.0"
+ xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:fn="http://www.w3.org/2005/xpath-functions"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:sv="http://www.jcp.org/jcr/sv/1.0"
+ xmlns:fn_old="http://www.w3.org/2004/10/xpath-functions" xmlns:jcrfn="http://www.jcp.org/jcr/xpath-functions/1.0">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>c84e835e-839f-46d2-8e07-3eb85b12e537</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Media</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-11-07T19:40:13.406+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2007-11-07T19:40:17.156+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-06-02T18:49:49.759+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.fckEditor.config.browsableRepositories.media-selector.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.media-selector.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.media-selector.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.media-selector.xml 2009-06-04 09:39:32 UTC (rev 1222)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="media-selector"
+ xmlns:jcr="http://www.jcp.org/jcr/1.0"
+ xmlns:mgnl="http://www.magnolia.info/jcr/mgnl" xmlns:rep="internal" xmlns:mix="http://www.jcp.org/jcr/mix/1.0"
+ xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:fn="http://www.w3.org/2005/xpath-functions"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:sv="http://www.jcp.org/jcr/sv/1.0"
+ xmlns:fn_old="http://www.w3.org/2004/10/xpath-functions" xmlns:jcrfn="http://www.jcp.org/jcr/xpath-functions/1.0">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>6df4c72d-f71e-4a9d-a71b-11f7632a4fc9</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.module.admininterface.AdminTreeMVCHandler</sv:value>
+ </sv:property>
+ <sv:property sv:name="configurationClass" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.tree.MediaBrowserConfiguration</sv:value>
+ </sv:property>
+ <sv:property sv:name="i18nBasename" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
+ </sv:property>
+ <sv:property sv:name="repository" sv:type="String">
+ <sv:value>media</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2005-05-06T16:18:38.686+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-20T12:14:54.070Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2009-06-02T19:20:17.371+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.media-selector.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.server.URI2RepositoryMapping.mappings.media.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.server.URI2RepositoryMapping.mappings.media.xml 2009-06-04 09:38:57 UTC (rev 1221)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.server.URI2RepositoryMapping.mappings.media.xml 2009-06-04 09:39:32 UTC (rev 1222)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="media"
+<sv:node sv:name="media"
xmlns:jcr="http://www.jcp.org/jcr/1.0"
xmlns:mgnl="http://www.magnolia.info/jcr/mgnl" xmlns:rep="internal" xmlns:mix="http://www.jcp.org/jcr/mix/1.0"
xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:fn="http://www.w3.org/2005/xpath-functions"
@@ -14,6 +14,9 @@
<sv:property sv:name="URIPrefix" sv:type="String">
<sv:value>/mediaObject</sv:value>
</sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.uri.MediaURI2RepositoryMapping</sv:value>
+ </sv:property>
<sv:property sv:name="handlePrefix" sv:type="String">
<sv:value/>
</sv:property>
Modified: trunk/openutils-mgnlmedia/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-06-04 09:38:57 UTC (rev 1221)
+++ trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-06-04 09:39:32 UTC (rev 1222)
@@ -11,6 +11,10 @@
<release version="4.0-b5" date="in svn" description="">
<action type="fix" dev="fgiust">MediaCustomSaveHandler now only warns about missing referenced media without
blocking</action>
+ <action type="fix" dev="fgiust">Media jcr browser was displying duplicate nodes</action>
+ <action type="add" dev="fgiust">Fckeditor integration for creating links to objects in the media repository.
+ Requires the fix for MAGNOLIA-2759 to be applied to work (hopefully it will work out-of-the-box only starting
+ from magnolia 4.1.1)</action>
</release>
<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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-06-04 09:39:06
|
Revision: 1221
http://openutils.svn.sourceforge.net/openutils/?rev=1221&view=rev
Author: fgiust
Date: 2009-06-04 09:38:57 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
better logging of invalid image binaries (lenght=0)
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-05-26 10:32:35 UTC (rev 1220)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-06-04 09:38:57 UTC (rev 1221)
@@ -548,6 +548,15 @@
throw new RuntimeException(e);
}
NodeData image = node.getNodeData("image");
+
+ if (image.getContentLength() == 0)
+ {
+ log.error(
+ "Invalid image nodedata " + image.getHandle() + ", size " + image.getContentLength(),
+ new Exception());
+ return;
+ }
+
String extension = image.getAttribute(FileProperties.PROPERTY_EXTENSION);
if (!Arrays.asList(extensions).contains(extension))
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <df...@us...> - 2009-05-26 10:33:09
|
Revision: 1220
http://openutils.svn.sourceforge.net/openutils/?rev=1220&view=rev
Author: dfghi
Date: 2009-05-26 10:32:35 +0000 (Tue, 26 May 2009)
Log Message:
-----------
Used colums types from metadata even for the check query (for PostGreSql compatibility).
Really skipping sheet if the log says so (there was no return nor else after the check).
Modified Paths:
--------------
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
trunk/openutils-dbmigration/src/site/changes/changes.xml
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2009-05-24 12:04:12 UTC (rev 1219)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/ExcelConfigurationTask.java 2009-05-26 10:32:35 UTC (rev 1220)
@@ -145,7 +145,7 @@
for (int j = 0; j < sheetNums; j++)
{
HSSFSheet sheet = hssfworkbook.getSheetAt(j);
- String tableName = hssfworkbook.getSheetName(j);
+ String tableName = StringUtils.trim(hssfworkbook.getSheetName(j));
QueryConfig conf = config.get(tableName);
if (conf == null)
@@ -301,26 +301,28 @@
}
});
- if (!result)
+ if (result)
{
+ String checkStatement = StringUtils.remove(StringUtils.trim(con.getCheckQuery()), "\n");
+ String insertStatement = StringUtils.remove(StringUtils.trim(con.getInsertQuery()), "\n");
+ String selectStatement = StringUtils.remove(StringUtils.trim(con.getSelectQuery()), "\n");
+ String updateStatement = StringUtils.remove(StringUtils.trim(con.getUpdateQuery()), "\n");
+
+ processRecords(
+ sheet,
+ columns,
+ ArrayUtils.toPrimitive(types.toArray(new Integer[types.size()]), Types.NULL),
+ checkStatement,
+ insertStatement,
+ selectStatement,
+ updateStatement,
+ dataSource,
+ tableName);
+ }
+ else
+ {
log.warn("Skipping sheet {} ", tableName);
}
-
- String checkStatement = StringUtils.remove(StringUtils.trim(con.getCheckQuery()), "\n");
- String insertStatement = StringUtils.remove(StringUtils.trim(con.getInsertQuery()), "\n");
- String selectStatement = StringUtils.remove(StringUtils.trim(con.getSelectQuery()), "\n");
- String updateStatement = StringUtils.remove(StringUtils.trim(con.getUpdateQuery()), "\n");
-
- processRecords(
- sheet,
- columns,
- ArrayUtils.toPrimitive(types.toArray(new Integer[types.size()]), Types.NULL),
- checkStatement,
- insertStatement,
- selectStatement,
- updateStatement,
- dataSource,
- tableName);
}
/**
@@ -394,6 +396,8 @@
}
Object[] checkParams = ArrayUtils.subarray(values.toArray(), 0, checkNum);
+ // We have types from column analysis, so we can use them also in check query.
+ int[] checkParamTypes = ArrayUtils.subarray(types, 0, checkNum);
for (int i = 0; i < checkParams.length; i++)
{
if (StringUtils.isEmpty((String) checkParams[i]))
@@ -405,7 +409,7 @@
int existing;
try
{
- existing = jdbcTemplate.queryForInt(checkStatement, checkParams);
+ existing = jdbcTemplate.queryForInt(checkStatement, checkParams, checkParamTypes);
}
catch (BadSqlGrammarException bsge)
{
Modified: trunk/openutils-dbmigration/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-dbmigration/src/site/changes/changes.xml 2009-05-24 12:04:12 UTC (rev 1219)
+++ trunk/openutils-dbmigration/src/site/changes/changes.xml 2009-05-26 10:32:35 UTC (rev 1220)
@@ -8,6 +8,10 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
+ <release version="2.0.6" date="" description="">
+ <action type="fix" dev="dghirardelli">Used colums types from metadata even for the check query (for PostGreSql compatibility)</action>
+ <action type="fix" dev="dghirardelli">Really skipping sheet if the log says so</action>
+ </release>
<release version="2.0.5" date="2009-03-29" description="">
<action type="update" dev="fgiust">Updated slf4j, spring and poi dependencies</action>
</release>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-24 12:04:17
|
Revision: 1219
http://openutils.svn.sourceforge.net/openutils/?rev=1219&view=rev
Author: fgiust
Date: 2009-05-24 12:04:12 +0000 (Sun, 24 May 2009)
Log Message:
-----------
disable broken modules
Modified Paths:
--------------
trunk/openutils-configuration-services/pom.xml
trunk/openutils-configuration-services/src/test/resources/spring-database.xml
trunk/openutils-hibernate-security/pom.xml
trunk/openutils-spring-rmibernate/pom.xml
trunk/openutils-usermanagement/pom.xml
trunk/pom.xml
Modified: trunk/openutils-configuration-services/pom.xml
===================================================================
--- trunk/openutils-configuration-services/pom.xml 2009-05-24 10:38:26 UTC (rev 1218)
+++ trunk/openutils-configuration-services/pom.xml 2009-05-24 12:04:12 UTC (rev 1219)
@@ -65,6 +65,11 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.5.6</version>
</dependency>
@@ -129,6 +134,6 @@
</dependency>
</dependencies>
<properties>
- <spring.version>2.5.1</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-configuration-services/src/test/resources/spring-database.xml
===================================================================
--- trunk/openutils-configuration-services/src/test/resources/spring-database.xml 2009-05-24 10:38:26 UTC (rev 1218)
+++ trunk/openutils-configuration-services/src/test/resources/spring-database.xml 2009-05-24 12:04:12 UTC (rev 1219)
@@ -1,15 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
- # ATTENZIONE: queste proprietà sono utilizzate solo per gli unit tests
- # i file per la configurazione del db utilizzati dall'applicazione web sono in
- # src/main/web-app/WEB-INF
--->
+ <!--
+ # ATTENZIONE: queste proprietà sono utilizzate solo per gli unit tests # i file per la configurazione del db
+ utilizzati dall'applicazione web sono in # src/main/web-app/WEB-INF
+ -->
<beans>
<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location">
- <value>classpath:database.properties</value>
- </property>
+ <property name="location" value="classpath:database.properties" />
</bean>
<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
<property name="driverClassName">
@@ -25,4 +22,4 @@
<value>${hibernate.connection.password}</value>
</property>
</bean>
-</beans>
+</beans>
\ No newline at end of file
Modified: trunk/openutils-hibernate-security/pom.xml
===================================================================
--- trunk/openutils-hibernate-security/pom.xml 2009-05-24 10:38:26 UTC (rev 1218)
+++ trunk/openutils-hibernate-security/pom.xml 2009-05-24 12:04:12 UTC (rev 1219)
@@ -131,6 +131,11 @@
<version>1.5.6</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>3.3.1.GA</version>
@@ -150,6 +155,12 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<version>3.4.0.GA</version>
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2009-05-24 10:38:26 UTC (rev 1218)
+++ trunk/openutils-spring-rmibernate/pom.xml 2009-05-24 12:04:12 UTC (rev 1219)
@@ -65,6 +65,12 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
@@ -86,11 +92,6 @@
<version>3.1</version>
</dependency>
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
- </dependency>
- <dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>2.2.3</version>
Modified: trunk/openutils-usermanagement/pom.xml
===================================================================
--- trunk/openutils-usermanagement/pom.xml 2009-05-24 10:38:26 UTC (rev 1218)
+++ trunk/openutils-usermanagement/pom.xml 2009-05-24 12:04:12 UTC (rev 1219)
@@ -77,18 +77,11 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<version>3.4.0.GA</version>
- <exclusions>
- <exclusion>
- <!-- not needed here, just load annotations -->
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.4.GA</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-05-24 10:38:26 UTC (rev 1218)
+++ trunk/pom.xml 2009-05-24 12:04:12 UTC (rev 1219)
@@ -281,6 +281,11 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.5.6</version>
<exclusions>
@@ -328,9 +333,9 @@
<module>openutils-dbmigration</module>
<module>openutils-backup</module>
<module>openutils-configuration-dataobjects</module>
- <module>openutils-configuration-services</module>
+ <!--<module>openutils-configuration-services</module>-->
<module>openutils-hibernate-security</module>
- <module>openutils-spring-rmibernate</module>
+ <!--<module>openutils-spring-rmibernate</module>-->
<module>openutils-elfunctions</module>
<module>openutils-mgnlspring</module>
<module>openutils-mgnlstripes</module>
@@ -344,6 +349,6 @@
<module>openutils-mgnlstruts11</module>
<module>openutils-mgnlmedia</module>
<module>openutils-mgnlcriteria</module>
- <module>openutils-spring-remote-callback</module>
+ <!--<module>openutils-spring-remote-callback</module>-->
</modules>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 1218
http://openutils.svn.sourceforge.net/openutils/?rev=1218&view=rev
Author: fgiust
Date: 2009-05-24 10:38:26 +0000 (Sun, 24 May 2009)
Log Message:
-----------
remove call to removed method
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/exporter/HibernateRmiServiceExporter.java
Modified: trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/exporter/HibernateRmiServiceExporter.java
===================================================================
--- trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/exporter/HibernateRmiServiceExporter.java 2009-05-24 10:34:33 UTC (rev 1217)
+++ trunk/openutils-spring-rmibernate/src/main/java/it/openutils/spring/rmibernate/server/exporter/HibernateRmiServiceExporter.java 2009-05-24 10:38:26 UTC (rev 1218)
@@ -21,7 +21,6 @@
import org.hibernate.SessionFactory;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.remoting.rmi.RmiServiceExporter;
-import org.springframework.remoting.support.RemoteInvocationTraceInterceptor;
import org.springframework.util.ClassUtils;
@@ -48,10 +47,6 @@
checkServiceInterface();
ProxyFactory proxyFactory = new ProxyFactory();
proxyFactory.addInterface(getServiceInterface());
- if (isRegisterTraceInterceptor())
- {
- proxyFactory.addAdvice(new RemoteInvocationTraceInterceptor(getExporterName()));
- }
// add interceptor for lazy work
proxyFactory.addAdvice(new HibernateLazyRmiInterceptor(sessionFactory));
proxyFactory.setTarget(getService());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-24 10:34:34
|
Revision: 1217
http://openutils.svn.sourceforge.net/openutils/?rev=1217&view=rev
Author: fgiust
Date: 2009-05-24 10:34:33 +0000 (Sun, 24 May 2009)
Log Message:
-----------
fix dbunit version
Modified Paths:
--------------
trunk/openutils-spring-rmibernate/pom.xml
Modified: trunk/openutils-spring-rmibernate/pom.xml
===================================================================
--- trunk/openutils-spring-rmibernate/pom.xml 2009-05-24 10:32:40 UTC (rev 1216)
+++ trunk/openutils-spring-rmibernate/pom.xml 2009-05-24 10:34:33 UTC (rev 1217)
@@ -124,14 +124,8 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing-junit</artifactId>
- <version>2.0.2</version>
+ <version>2.2.1</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -140,12 +134,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2.1</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-24 10:32:47
|
Revision: 1216
http://openutils.svn.sourceforge.net/openutils/?rev=1216&view=rev
Author: fgiust
Date: 2009-05-24 10:32:40 +0000 (Sun, 24 May 2009)
Log Message:
-----------
fix dbunit version
Modified Paths:
--------------
trunk/openutils-hibernate-security/pom.xml
Modified: trunk/openutils-hibernate-security/pom.xml
===================================================================
--- trunk/openutils-hibernate-security/pom.xml 2009-05-24 10:22:34 UTC (rev 1215)
+++ trunk/openutils-hibernate-security/pom.xml 2009-05-24 10:32:40 UTC (rev 1216)
@@ -116,7 +116,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing-junit</artifactId>
- <version>2.0.2</version>
+ <version>2.2.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -217,12 +217,6 @@
<version>4.4</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.1</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<properties>
<spring.version>2.5.6</spring.version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-24 10:22:36
|
Revision: 1215
http://openutils.svn.sourceforge.net/openutils/?rev=1215&view=rev
Author: fgiust
Date: 2009-05-24 10:22:34 +0000 (Sun, 24 May 2009)
Log Message:
-----------
fix slf4j dependency
Modified Paths:
--------------
trunk/openutils-testing-junit/pom.xml
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2009-05-24 10:16:26 UTC (rev 1214)
+++ trunk/openutils-testing-junit/pom.xml 2009-05-24 10:22:34 UTC (rev 1215)
@@ -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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -48,6 +49,16 @@
</exclusions>
</dependency>
<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>2.5.6</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-24 10:16:32
|
Revision: 1214
http://openutils.svn.sourceforge.net/openutils/?rev=1214&view=rev
Author: fgiust
Date: 2009-05-24 10:16:26 +0000 (Sun, 24 May 2009)
Log Message:
-----------
imports fixed
Modified Paths:
--------------
trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/Group.java
trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/Role.java
trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/User.java
Modified: trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/Group.java
===================================================================
--- trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/Group.java 2009-05-24 10:10:40 UTC (rev 1213)
+++ trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/Group.java 2009-05-24 10:16:26 UTC (rev 1214)
@@ -1,3 +1,18 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package it.openutils.usermanagement.dataobjects;
import java.io.Serializable;
Modified: trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/Role.java
===================================================================
--- trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/Role.java 2009-05-24 10:10:40 UTC (rev 1213)
+++ trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/Role.java 2009-05-24 10:16:26 UTC (rev 1214)
@@ -1,3 +1,18 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package it.openutils.usermanagement.dataobjects;
import java.io.Serializable;
Modified: trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/User.java
===================================================================
--- trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/User.java 2009-05-24 10:10:40 UTC (rev 1213)
+++ trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/User.java 2009-05-24 10:16:26 UTC (rev 1214)
@@ -1,3 +1,18 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package it.openutils.usermanagement.dataobjects;
import java.io.Serializable;
@@ -15,13 +30,13 @@
import javax.persistence.ManyToMany;
import javax.persistence.Table;
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-import org.acegisecurity.userdetails.UserDetails;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.userdetails.UserDetails;
/**
@@ -111,8 +126,8 @@
}
/**
- * @return The set of roles related to the user. It returns null if the user is not in any group, or an empty set
- * if the groups the user is in, do not belong to any role.
+ * @return The set of roles related to the user. It returns null if the user is not in any group, or an empty set if
+ * the groups the user is in, do not belong to any role.
*/
public Set<Role> getRoles()
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-24 10:10:49
|
Revision: 1213
http://openutils.svn.sourceforge.net/openutils/?rev=1213&view=rev
Author: fgiust
Date: 2009-05-24 10:10:40 +0000 (Sun, 24 May 2009)
Log Message:
-----------
added missing hibernate-validator
Modified Paths:
--------------
trunk/openutils-spring/pom.xml
Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2009-05-24 10:04:44 UTC (rev 1212)
+++ trunk/openutils-spring/pom.xml 2009-05-24 10:10:40 UTC (rev 1213)
@@ -94,6 +94,12 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>3.1.0.GA</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-24 10:04:52
|
Revision: 1212
http://openutils.svn.sourceforge.net/openutils/?rev=1212&view=rev
Author: fgiust
Date: 2009-05-24 10:04:44 +0000 (Sun, 24 May 2009)
Log Message:
-----------
remove exclusion
Modified Paths:
--------------
trunk/openutils-spring/pom.xml
Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml 2009-05-24 09:56:02 UTC (rev 1211)
+++ trunk/openutils-spring/pom.xml 2009-05-24 10:04:44 UTC (rev 1212)
@@ -92,13 +92,6 @@
<artifactId>hibernate-annotations</artifactId>
<version>3.4.0.GA</version>
<optional>true</optional>
- <exclusions>
- <exclusion>
- <!-- not needed here, just load annotations -->
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>cglib</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-24 09:56:11
|
Revision: 1211
http://openutils.svn.sourceforge.net/openutils/?rev=1211&view=rev
Author: fgiust
Date: 2009-05-24 09:56:02 +0000 (Sun, 24 May 2009)
Log Message:
-----------
rename bad tag
Added Paths:
-----------
tags/openutils-testing-junit-dwr-1.1/
Removed Paths:
-------------
tags/1.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-24 09:55:34
|
Revision: 1210
http://openutils.svn.sourceforge.net/openutils/?rev=1210&view=rev
Author: fgiust
Date: 2009-05-24 09:55:21 +0000 (Sun, 24 May 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/pom.xml
Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml 2009-05-24 09:55:07 UTC (rev 1209)
+++ trunk/openutils-mgnlcriteria/pom.xml 2009-05-24 09:55:21 UTC (rev 1210)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-mgnlcriteria</artifactId>
<name>openutils-mgnlcriteria</name>
- <version>1.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
<dependencies>
<dependency>
@@ -45,10 +45,4 @@
</snapshots>
</repository>
</repositories>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-1.0</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-1.0</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlcriteria-1.0</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-24 09:55:16
|
Revision: 1209
http://openutils.svn.sourceforge.net/openutils/?rev=1209&view=rev
Author: fgiust
Date: 2009-05-24 09:55:07 +0000 (Sun, 24 May 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlcriteria-1.0
Added Paths:
-----------
tags/openutils-mgnlcriteria-1.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-24 09:54:35
|
Revision: 1208
http://openutils.svn.sourceforge.net/openutils/?rev=1208&view=rev
Author: fgiust
Date: 2009-05-24 09:54:27 +0000 (Sun, 24 May 2009)
Log Message:
-----------
remove bad tag
Removed Paths:
-------------
tags/openutils-mgnlcriteria-1.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-24 09:51:31
|
Revision: 1207
http://openutils.svn.sourceforge.net/openutils/?rev=1207&view=rev
Author: fgiust
Date: 2009-05-24 09:51:24 +0000 (Sun, 24 May 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcriteria-1.0
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/pom.xml
Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml 2009-05-24 09:49:48 UTC (rev 1206)
+++ trunk/openutils-mgnlcriteria/pom.xml 2009-05-24 09:51:24 UTC (rev 1207)
@@ -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-mgnlcriteria</artifactId>
<name>openutils-mgnlcriteria</name>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
<dependencies>
<dependency>
@@ -46,4 +45,10 @@
</snapshots>
</repository>
</repositories>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-1.0</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcriteria-1.0</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlcriteria-1.0</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-24 09:49:50
|
Revision: 1206
http://openutils.svn.sourceforge.net/openutils/?rev=1206&view=rev
Author: fgiust
Date: 2009-05-24 09:49:48 +0000 (Sun, 24 May 2009)
Log Message:
-----------
changelog
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/site/changes/changes.xml
Modified: trunk/openutils-mgnlcriteria/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-mgnlcriteria/src/site/changes/changes.xml 2009-05-24 09:49:20 UTC (rev 1205)
+++ trunk/openutils-mgnlcriteria/src/site/changes/changes.xml 2009-05-24 09:49:48 UTC (rev 1206)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!--
+ <!--
"type" attribute can be: add, remove, update or fix.
-->
<document>
@@ -8,7 +8,7 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
- <release version="1.0" date="2009-02-28" description="first release">
+ <release version="1.0" date="2009-05-24" description="first release">
<action type="new" dev="fgiust">Initial public release.</action>
</release>
</body>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-05-24 09:49:29
|
Revision: 1205
http://openutils.svn.sourceforge.net/openutils/?rev=1205&view=rev
Author: fgiust
Date: 2009-05-24 09:49:20 +0000 (Sun, 24 May 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlmessages/pom.xml
Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2009-05-24 09:49:08 UTC (rev 1204)
+++ trunk/openutils-mgnlmessages/pom.xml 2009-05-24 09:49:20 UTC (rev 1205)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlmessages</artifactId>
<name>openutils-mgnlmessages</name>
- <version>4.0.2</version>
+ <version>4.0.3-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -82,10 +82,4 @@
</snapshots>
</repository>
</repositories>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.2</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.2</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmessages-4.0.2</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-24 09:49:14
|
Revision: 1204
http://openutils.svn.sourceforge.net/openutils/?rev=1204&view=rev
Author: fgiust
Date: 2009-05-24 09:49:08 +0000 (Sun, 24 May 2009)
Log Message:
-----------
update to magnolia 4.0.1
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/pom.xml
Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml 2009-05-24 09:48:56 UTC (rev 1203)
+++ trunk/openutils-mgnlcriteria/pom.xml 2009-05-24 09:49:08 UTC (rev 1204)
@@ -1,100 +1,49 @@
-<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-mgnlcriteria</artifactId>
- <name>openutils-mgnlcriteria</name>
- <version>1.1-SNAPSHOT</version>
- <description>A Hibernate's Criteria-like API to programmatically
- generate JCR queries with Magnolia</description>
- <build>
- <plugins>
- <plugin>
- <groupId>com.google.code.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
- <configuration>
- <basedir>${basedir}</basedir>
- <header>${basedir}/src/etc/header.txt</header>
- <quiet>false</quiet>
- <failIfMissing>true</failIfMissing>
- <aggregate>false</aggregate>
- <includes>
- <include>src/**</include>
- <include>**/test/**</include>
- </includes>
- <excludes>
- <exclude>target/**</exclude>
- <exclude>src/site/**</exclude>
- </excludes>
- <useDefaultExcludes>true</useDefaultExcludes>
- <mapping>
- <jwc>XML_STYLE</jwc>
- <application>XML_STYLE</application>
- <myFileExtension>JAVADOC_STYLE</myFileExtension>
- </mapping>
- <useDefaultMapping>true</useDefaultMapping>
- <encoding>UTF-8</encoding>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-core</artifactId>
- <version>4.0.1</version>
- </dependency>
- <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>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- </dependencies>
- <pluginRepositories>
- <pluginRepository>
- <id>mc-release</id>
- <name>Local Maven repository of releases</name>
- <url>http://mc-repo.googlecode.com/svn/maven2/releases</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
- <repositories>
- <repository>
- <id>repository.magnolia.info</id>
- <name>magnolia repository</name>
- <url>http://repo.magnolia.info/m2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
+<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-mgnlcriteria</artifactId>
+ <name>openutils-mgnlcriteria</name>
+ <version>1.0-SNAPSHOT</version>
+ <description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
+ <dependencies>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-core</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <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>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>repository.magnolia.info</id>
+ <name>magnolia repository</name>
+ <url>http://repo.magnolia.info/m2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
</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-24 09:49:08
|
Revision: 1203
http://openutils.svn.sourceforge.net/openutils/?rev=1203&view=rev
Author: fgiust
Date: 2009-05-24 09:48:56 +0000 (Sun, 24 May 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmessages-4.0.2
Added Paths:
-----------
tags/openutils-mgnlmessages-4.0.2/
tags/openutils-mgnlmessages-4.0.2/pom.xml
Removed Paths:
-------------
tags/openutils-mgnlmessages-4.0.2/pom.xml
Deleted: tags/openutils-mgnlmessages-4.0.2/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2009-05-24 09:47:36 UTC (rev 1201)
+++ tags/openutils-mgnlmessages-4.0.2/pom.xml 2009-05-24 09:48:56 UTC (rev 1203)
@@ -1,86 +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-mgnlmessages</artifactId>
- <name>openutils-mgnlmessages</name>
- <version>4.0.2-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.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlext</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <repositories>
- <repository>
- <id>repository.magnolia.info</id>
- <name>magnolia repository</name>
- <url>http://repository.magnolia-cms.com/m2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-</project>
\ No newline at end of file
Copied: tags/openutils-mgnlmessages-4.0.2/pom.xml (from rev 1202, trunk/openutils-mgnlmessages/pom.xml)
===================================================================
--- tags/openutils-mgnlmessages-4.0.2/pom.xml (rev 0)
+++ tags/openutils-mgnlmessages-4.0.2/pom.xml 2009-05-24 09:48:56 UTC (rev 1203)
@@ -0,0 +1,91 @@
+<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-mgnlmessages</artifactId>
+ <name>openutils-mgnlmessages</name>
+ <version>4.0.2</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.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlext</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <version>5.1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>repository.magnolia.info</id>
+ <name>magnolia repository</name>
+ <url>http://repository.magnolia-cms.com/m2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.0.2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmessages-4.0.2</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.
|
