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-08-19 16:55:49
|
Revision: 1277 http://openutils.svn.sourceforge.net/openutils/?rev=1277&view=rev Author: fgiust Date: 2009-08-19 16:55:41 +0000 (Wed, 19 Aug 2009) Log Message: ----------- missing translations for buttons Modified Paths: -------------- trunk/openutils-mgnlmedia/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_it.properties Modified: trunk/openutils-mgnlmedia/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 2009-08-17 16:59:52 UTC (rev 1276) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_en.properties 2009-08-19 16:55:41 UTC (rev 1277) @@ -67,4 +67,7 @@ media.menu.title=Media media.menu.browse=Browse -media.menu.search=Search \ No newline at end of file +media.menu.search=Search + +buttons.ok=Ok +buttons.cancel=Cancel \ No newline at end of file Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2009-08-17 16:59:52 UTC (rev 1276) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2009-08-19 16:55:41 UTC (rev 1277) @@ -68,4 +68,7 @@ media.menu.title=Media media.menu.browse=Naviga -media.menu.search=Cerca \ No newline at end of file +media.menu.search=Cerca + +buttons.ok=Ok +buttons.cancel=Annulla \ 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: <luc...@us...> - 2009-08-17 17:00:03
|
Revision: 1276 http://openutils.svn.sourceforge.net/openutils/?rev=1276&view=rev Author: lucaboati Date: 2009-08-17 16:59:52 +0000 (Mon, 17 Aug 2009) Log Message: ----------- fix breadcrumbs/menu label Modified Paths: -------------- trunk/openutils-mgnlbootstrapsync/src/site/site.xml trunk/openutils-mgnlmedia/src/site/apt/index.apt trunk/openutils-mgnlmedia/src/site/site.xml Modified: trunk/openutils-mgnlbootstrapsync/src/site/site.xml =================================================================== --- trunk/openutils-mgnlbootstrapsync/src/site/site.xml 2009-08-17 10:51:17 UTC (rev 1275) +++ trunk/openutils-mgnlbootstrapsync/src/site/site.xml 2009-08-17 16:59:52 UTC (rev 1276) @@ -21,7 +21,7 @@ <item name="openutils" href="http://openutils.sourceforge.net/" /> <item name="openutils-mgnlbootstrapsync" href="http://openutils.sourceforge.net/openutils-mgnlbootstrapsync" /> </breadcrumbs> - <menu name="openutils mgnlstripes"> + <menu name="openutils mgnlbootstrapsync"> <item name="Usage" href="index.html"></item> </menu> <menu ref="modules" inherit="bottom" /> Modified: trunk/openutils-mgnlmedia/src/site/apt/index.apt =================================================================== --- trunk/openutils-mgnlmedia/src/site/apt/index.apt 2009-08-17 10:51:17 UTC (rev 1275) +++ trunk/openutils-mgnlmedia/src/site/apt/index.apt 2009-08-17 16:59:52 UTC (rev 1276) @@ -15,7 +15,7 @@ Configuration - First of all drop the openutils-mgnlstripes jar and the stripes jar into WEB-INF/lib, or (better) if you are using maven + First of all drop the openutils-mgnlmedia jar and the stripes jar into WEB-INF/lib, or (better) if you are using maven just declare the following dependency: +----------------------------------------------+ Modified: trunk/openutils-mgnlmedia/src/site/site.xml =================================================================== --- trunk/openutils-mgnlmedia/src/site/site.xml 2009-08-17 10:51:17 UTC (rev 1275) +++ trunk/openutils-mgnlmedia/src/site/site.xml 2009-08-17 16:59:52 UTC (rev 1276) @@ -19,7 +19,7 @@ </head> <breadcrumbs> <item name="openutils" href="http://openutils.sourceforge.net/" /> - <item name="openutils-mgnlstripes" href="http://openutils.sourceforge.net/openutils-mgnlmedia" /> + <item name="openutils-mgnlmedia" href="http://openutils.sourceforge.net/openutils-mgnlmedia" /> </breadcrumbs> <menu name="openutils mgnlmedia"> <item name="About" href="index.html"></item> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2009-08-17 10:51:23
|
Revision: 1275 http://openutils.svn.sourceforge.net/openutils/?rev=1275&view=rev Author: fgiust Date: 2009-08-17 10:51:17 +0000 (Mon, 17 Aug 2009) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/openutils-mgnlbootstrapsync/pom.xml Modified: trunk/openutils-mgnlbootstrapsync/pom.xml =================================================================== --- trunk/openutils-mgnlbootstrapsync/pom.xml 2009-08-17 10:51:10 UTC (rev 1274) +++ trunk/openutils-mgnlbootstrapsync/pom.xml 2009-08-17 10:51:17 UTC (rev 1275) @@ -10,7 +10,7 @@ <packaging>jar</packaging> <artifactId>openutils-mgnlbootstrapsync</artifactId> <name>openutils-mgnlbootstrapsync</name> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> <licenses> <license> <name>GPLv3</name> @@ -73,10 +73,4 @@ </snapshots> </repository> </repositories> - - <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlbootstrapsync-0.3</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlbootstrapsync-0.3</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlbootstrapsync-0.3</url> - </scm> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2009-08-17 10:51:16
|
Revision: 1274 http://openutils.svn.sourceforge.net/openutils/?rev=1274&view=rev Author: fgiust Date: 2009-08-17 10:51:10 +0000 (Mon, 17 Aug 2009) Log Message: ----------- [maven-release-plugin] copy for tag openutils-mgnlbootstrapsync-0.3 Added Paths: ----------- tags/openutils-mgnlbootstrapsync-0.3/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2009-08-17 10:50:15
|
Revision: 1273 http://openutils.svn.sourceforge.net/openutils/?rev=1273&view=rev Author: fgiust Date: 2009-08-17 10:50:09 +0000 (Mon, 17 Aug 2009) Log Message: ----------- [maven-release-plugin] prepare release openutils-mgnlbootstrapsync-0.3 Modified Paths: -------------- trunk/openutils-mgnlbootstrapsync/pom.xml Modified: trunk/openutils-mgnlbootstrapsync/pom.xml =================================================================== --- trunk/openutils-mgnlbootstrapsync/pom.xml 2009-08-17 10:49:08 UTC (rev 1272) +++ trunk/openutils-mgnlbootstrapsync/pom.xml 2009-08-17 10:50:09 UTC (rev 1273) @@ -10,7 +10,7 @@ <packaging>jar</packaging> <artifactId>openutils-mgnlbootstrapsync</artifactId> <name>openutils-mgnlbootstrapsync</name> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> <licenses> <license> <name>GPLv3</name> @@ -73,4 +73,10 @@ </snapshots> </repository> </repositories> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlbootstrapsync-0.3</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlbootstrapsync-0.3</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlbootstrapsync-0.3</url> + </scm> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2009-08-17 10:49:22
|
Revision: 1272 http://openutils.svn.sourceforge.net/openutils/?rev=1272&view=rev Author: fgiust Date: 2009-08-17 10:49:08 +0000 (Mon, 17 Aug 2009) Log Message: ----------- added license headers Modified Paths: -------------- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapAtomicFilter.java trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapEnableRoot.java trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapExportRoot.java trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/AbstractBootstrapSyncListener.java trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/BootstrapSyncListener.java trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/watch/BootstrapSyncRepositoryWatch.java Modified: trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapAtomicFilter.java =================================================================== --- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapAtomicFilter.java 2009-08-17 10:13:24 UTC (rev 1271) +++ trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapAtomicFilter.java 2009-08-17 10:49:08 UTC (rev 1272) @@ -1,6 +1,22 @@ +/** + * Copyright Openmind http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package it.openutils.mgnlbootstrapsync; - import info.magnolia.importexport.filters.VersionFilter; import org.apache.commons.lang.ArrayUtils; Modified: trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapEnableRoot.java =================================================================== --- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapEnableRoot.java 2009-08-17 10:13:24 UTC (rev 1271) +++ trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapEnableRoot.java 2009-08-17 10:49:08 UTC (rev 1272) @@ -1,3 +1,20 @@ +/** + * Copyright Openmind http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package it.openutils.mgnlbootstrapsync; import java.util.ArrayList; @@ -26,7 +43,6 @@ } /** - * * @param enableRoots comma separeted list of enabled roots */ public BootstrapEnableRoot(String enableRoots) Modified: trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapExportRoot.java =================================================================== --- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapExportRoot.java 2009-08-17 10:13:24 UTC (rev 1271) +++ trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/BootstrapExportRoot.java 2009-08-17 10:49:08 UTC (rev 1272) @@ -1,3 +1,20 @@ +/** + * Copyright Openmind http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package it.openutils.mgnlbootstrapsync; import java.util.ArrayList; Modified: trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java =================================================================== --- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java 2009-08-17 10:13:24 UTC (rev 1271) +++ trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java 2009-08-17 10:49:08 UTC (rev 1272) @@ -1,3 +1,20 @@ +/** + * Copyright Openmind http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package it.openutils.mgnlbootstrapsync.lifecycle; import info.magnolia.cms.beans.config.ContentRepository; Modified: trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/AbstractBootstrapSyncListener.java =================================================================== --- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/AbstractBootstrapSyncListener.java 2009-08-17 10:13:24 UTC (rev 1271) +++ trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/AbstractBootstrapSyncListener.java 2009-08-17 10:49:08 UTC (rev 1272) @@ -1,3 +1,20 @@ +/** + * Copyright Openmind http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package it.openutils.mgnlbootstrapsync.listener; import info.magnolia.cms.core.Content; Modified: trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/BootstrapSyncListener.java =================================================================== --- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/BootstrapSyncListener.java 2009-08-17 10:13:24 UTC (rev 1271) +++ trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/BootstrapSyncListener.java 2009-08-17 10:49:08 UTC (rev 1272) @@ -1,6 +1,22 @@ +/** + * Copyright Openmind http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package it.openutils.mgnlbootstrapsync.listener; -import info.magnolia.cms.beans.config.ConfigLoader; import info.magnolia.cms.beans.config.ContentRepository; import info.magnolia.cms.security.AccessDeniedException; import it.openutils.mgnlbootstrapsync.watch.BootstrapSyncRepositoryWatch; @@ -66,7 +82,7 @@ public void onEvent(EventIterator events) { - //@todo Do we need it yet? + // @todo Do we need it yet? try { if (!ContentRepository.checkIfInitialized()) Modified: trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/watch/BootstrapSyncRepositoryWatch.java =================================================================== --- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/watch/BootstrapSyncRepositoryWatch.java 2009-08-17 10:13:24 UTC (rev 1271) +++ trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/watch/BootstrapSyncRepositoryWatch.java 2009-08-17 10:49:08 UTC (rev 1272) @@ -1,3 +1,20 @@ +/** + * Copyright Openmind http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package it.openutils.mgnlbootstrapsync.watch; import it.openutils.mgnlbootstrapsync.BootstrapEnableRoot; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <luc...@us...> - 2009-08-17 10:13:40
|
Revision: 1271 http://openutils.svn.sourceforge.net/openutils/?rev=1271&view=rev Author: lucaboati Date: 2009-08-17 10:13:24 +0000 (Mon, 17 Aug 2009) Log Message: ----------- comma removed Modified Paths: -------------- trunk/openutils-mgnlbootstrapsync/src/site/apt/index.apt Modified: trunk/openutils-mgnlbootstrapsync/src/site/apt/index.apt =================================================================== --- trunk/openutils-mgnlbootstrapsync/src/site/apt/index.apt 2009-08-17 10:08:42 UTC (rev 1270) +++ trunk/openutils-mgnlbootstrapsync/src/site/apt/index.apt 2009-08-17 10:13:24 UTC (rev 1271) @@ -36,7 +36,7 @@ magnolia.bootstrapSync=true #list repositories you want to configure - magnolia.bootstrapSync.repositories=config,website,users, + magnolia.bootstrapSync.repositories=config,website,users #set path of folder export to magnolia.bootstrapSync.config.exportPath=....path of folder to export to.... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <luc...@us...> - 2009-08-17 10:08:48
|
Revision: 1270 http://openutils.svn.sourceforge.net/openutils/?rev=1270&view=rev Author: lucaboati Date: 2009-08-17 10:08:42 +0000 (Mon, 17 Aug 2009) Log Message: ----------- add changes file Added Paths: ----------- trunk/openutils-mgnlbootstrapsync/src/site/changes/ trunk/openutils-mgnlbootstrapsync/src/site/changes/changes.xml Added: trunk/openutils-mgnlbootstrapsync/src/site/changes/changes.xml =================================================================== --- trunk/openutils-mgnlbootstrapsync/src/site/changes/changes.xml (rev 0) +++ trunk/openutils-mgnlbootstrapsync/src/site/changes/changes.xml 2009-08-17 10:08:42 UTC (rev 1270) @@ -0,0 +1,23 @@ +<?xml version="1.0"?> + <!-- + "type" attribute can be: add, remove, update or fix. +--> +<document> + <properties> + <title>Changes</title> + <author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author> + </properties> + <body> + <release version="0.3" date="2009-08-17" description=""> + <action type="add" dev="lucaboati">Add default node types for users, userroles and usergroups repository</action> + <action type="fix" dev="lucaboati">Avoid {repository}.xml bootstrapping</action> + <action type="fix" dev="lucaboati">fix BootstrapSyncRepositoryWatch constructor</action> + </release> + <release version="0.2" date="2008-07-01" description=""> + <action type="update" dev="lucaboati">Stable release for Magnolia 4.x</action> + </release> + <release version="0.1" date="2008-05-07" description=""> + <action type="add" dev="fgiust">first alpha release</action> + </release> + </body> +</document> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <luc...@us...> - 2009-08-17 10:08:11
|
Revision: 1269 http://openutils.svn.sourceforge.net/openutils/?rev=1269&view=rev Author: lucaboati Date: 2009-08-17 10:07:59 +0000 (Mon, 17 Aug 2009) Log Message: ----------- add magnolia.bootstrapSync.users.nodeType to environment.properties example Modified Paths: -------------- trunk/openutils-mgnlbootstrapsync/src/site/apt/index.apt Modified: trunk/openutils-mgnlbootstrapsync/src/site/apt/index.apt =================================================================== --- trunk/openutils-mgnlbootstrapsync/src/site/apt/index.apt 2009-08-14 11:01:19 UTC (rev 1268) +++ trunk/openutils-mgnlbootstrapsync/src/site/apt/index.apt 2009-08-17 10:07:59 UTC (rev 1269) @@ -36,11 +36,12 @@ magnolia.bootstrapSync=true #list repositories you want to configure - magnolia.bootstrapSync.repositories=config,website + magnolia.bootstrapSync.repositories=config,website,users, #set path of folder export to magnolia.bootstrapSync.config.exportPath=....path of folder to export to.... magnolia.bootstrapSync.website.exportPath=....path of folder to export to.... + magnolia.bootstrapSync.users.exportPath=....path of folder to export to.... #set root nodes to export: every change in this and subnodes will export [repository].[path.to.node].xml #you can use * wildcards @@ -51,6 +52,10 @@ /modules/templating/*/*/*,\ /modules/* magnolia.bootstrapSync.website.exportRoots=/homepage,/help,/newsletter + magnolia.bootstrapSync.users.exportRoots=/* + + #mgnl:content is the default nodeType + magnolia.bootstrapSync.users.nodeType=mgnl:user +----------------------------------------------+ The bootstrap sync module is suggested to be used with a memory-only jackrabbit configuration, so that each developer This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2009-08-14 11:01:33
|
Revision: 1268 http://openutils.svn.sourceforge.net/openutils/?rev=1268&view=rev Author: fgiust Date: 2009-08-14 11:01:19 +0000 (Fri, 14 Aug 2009) Log Message: ----------- MEDIA-3 cleanup bootstrap files Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.common.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaAudioDlg.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaVideoDlg.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaYoutubeDlg.xml Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2009-08-14 10:54:10 UTC (rev 1267) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2009-08-14 11:01:19 UTC (rev 1268) @@ -40,8 +40,6 @@ { List<Task> tasks = new ArrayList<Task>(); - // tasks.add(new RemoveResolutionsNodeTask()); - // tasks.add(new RenameThumbToImageTask()); return tasks; } Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.common.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.common.xml 2009-08-14 10:54:10 UTC (rev 1267) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.common.xml 2009-08-14 11:01:19 UTC (rev 1268) @@ -10,7 +10,7 @@ xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:content</sv:value> + <sv:value>mgnl:contentNode</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>8ce70871-d358-4da1-823b-4d0302ce01de</sv:value> Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaAudioDlg.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaAudioDlg.xml 2009-08-14 10:54:10 UTC (rev 1267) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaAudioDlg.xml 2009-08-14 11:01:19 UTC (rev 1268) @@ -10,7 +10,7 @@ xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:content</sv:value> + <sv:value>mgnl:contentNode</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>42221071-75be-49d6-9585-0e2a5f167cea</sv:value> Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml 2009-08-14 10:54:10 UTC (rev 1267) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml 2009-08-14 11:01:19 UTC (rev 1268) @@ -10,7 +10,7 @@ xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:content</sv:value> + <sv:value>mgnl:contentNode</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>432ef260-7220-4c71-ba84-fc682bc798ab</sv:value> Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaVideoDlg.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaVideoDlg.xml 2009-08-14 10:54:10 UTC (rev 1267) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaVideoDlg.xml 2009-08-14 11:01:19 UTC (rev 1268) @@ -10,7 +10,7 @@ xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:content</sv:value> + <sv:value>mgnl:contentNode</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>5093ad84-c652-4e56-8eba-da9348eb18fe</sv:value> Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaYoutubeDlg.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaYoutubeDlg.xml 2009-08-14 10:54:10 UTC (rev 1267) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaYoutubeDlg.xml 2009-08-14 11:01:19 UTC (rev 1268) @@ -10,7 +10,7 @@ xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:content</sv:value> + <sv:value>mgnl:contentNode</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>0d7a3a5e-bce1-42c8-af9f-5a44142fe19d</sv:value> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2009-08-14 10:54:19
|
Revision: 1267 http://openutils.svn.sourceforge.net/openutils/?rev=1267&view=rev Author: fgiust Date: 2009-08-14 10:54:10 +0000 (Fri, 14 Aug 2009) Log Message: ----------- MEDIA-1 and MEDIA-2 - cleanup of dialogs and translations, add display of metadata Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaAudioDlg.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaVideoDlg.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaYoutubeDlg.xml trunk/openutils-mgnlmedia/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_it.properties Added Paths: ----------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.metadata.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.common.xml Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.metadata.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.metadata.xml (rev 0) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.metadata.xml 2009-08-14 10:54:10 UTC (rev 1267) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="metadata" xmlns:x2="http://schemas.microsoft.com/office/excel/2003/xml" + xmlns:fn_old="http://www.w3.org/2004/10/xpath-functions" xmlns:fn="http://www.w3.org/2005/xpath-functions" + xmlns:html="http://www.w3.org/TR/REC-html40" xmlns:jcr="http://www.jcp.org/jcr/1.0" + xmlns:mgnl="http://www.magnolia.info/jcr/mgnl" xmlns:jcrfn="http://www.jcp.org/jcr/xpath-functions/1.0" + xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:rep="internal" xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:stringutils="xalan://org.apache.commons.lang.StringUtils" + xmlns:_pre="urn:schemas-microsoft-com:office:spreadsheet" + xmlns:jcrutils="xalan://it.openmindonline.urmetdomus.assembler.utils.Path" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" + xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" + xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>721d96fe-c9ec-469a-bd57-d5828407ec83</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlmedia.media.dialog.DialogMetadata</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: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>2008-06-26T16:13:12.696Z</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-06-26T16:13:35.061Z</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2009-08-14T12:16:56.903+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.controls.metadata.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.dialogs.common.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.common.xml (rev 0) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.common.xml 2009-08-14 10:54:10 UTC (rev 1267) @@ -0,0 +1,434 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="common" xmlns:x2="http://schemas.microsoft.com/office/excel/2003/xml" + xmlns:fn_old="http://www.w3.org/2004/10/xpath-functions" xmlns:fn="http://www.w3.org/2005/xpath-functions" + xmlns:html="http://www.w3.org/TR/REC-html40" xmlns:jcr="http://www.jcp.org/jcr/1.0" + xmlns:mgnl="http://www.magnolia.info/jcr/mgnl" xmlns:jcrfn="http://www.jcp.org/jcr/xpath-functions/1.0" + xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:rep="internal" xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:stringutils="xalan://org.apache.commons.lang.StringUtils" + xmlns:_pre="urn:schemas-microsoft-com:office:spreadsheet" + xmlns:jcrutils="xalan://it.openmindonline.urmetdomus.assembler.utils.Path" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" + xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" + xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:content</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>8ce70871-d358-4da1-823b-4d0302ce01de</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="String"> + <sv:value>2004-11-02T15:34:23.417+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-06-08T14:48:46.351+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2009-08-14T11:25:06.931+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:title" sv:type="String"> + <sv:value/> + </sv:property> + </sv:node> + <sv:node sv:name="tabAttributes"> + <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>ca24d68c-c361-4c4e-bef9-9d955422bee4</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>tab</sv:value> + </sv:property> + <sv:property sv:name="label" sv:type="String"> + <sv:value>media.dialogs.tabAttributes.label</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>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="String"> + <sv:value>2004-11-02T15:34:29.217+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-06-21T09:55:27.791Z</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2008-06-21T10:32:11.889Z</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="title"> + <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>3e64db6a-08ad-45a3-92b3-6f886c274366</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>edit</sv:value> + </sv:property> + <sv:property sv:name="label" sv:type="String"> + <sv:value>media.dialogs.tabTitle.title.label</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>String</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="String"> + <sv:value>2004-11-02T17:20:40.266+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-07-02T15:10:45.788Z</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2009-08-14T11:22:33.674+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="description"> + <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>8c474eb0-e561-4376-9a53-6bdeb4832bb8</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>edit</sv:value> + </sv:property> + <sv:property sv:name="label" sv:type="String"> + <sv:value>media.dialogs.tabDescription.description.label</sv:value> + </sv:property> + <sv:property sv:name="rows" sv:type="String"> + <sv:value>2</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>String</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="String"> + <sv:value>2004-11-02T17:20:40.266+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-06-21T10:47:13.284Z</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2009-08-14T11:23:31.243+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="tags"> + <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>e3ab3cb5-5784-4489-86ac-afb589ba9842</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>edit</sv:value> + </sv:property> + <sv:property sv:name="label" sv:type="String"> + <sv:value>media.dialogs.tabTags.tags.label</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>String</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="String"> + <sv:value>2004-11-02T17:20:40.266+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-06-21T10:49:22.752Z</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2009-08-14T11:22:43.725+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="copyright"> + <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>db78efee-c231-49d9-9907-368bb5bb3891</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>edit</sv:value> + </sv:property> + <sv:property sv:name="label" sv:type="String"> + <sv:value>media.dialogs.tabAttributes.copyright.label</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>String</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>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="String"> + <sv:value>2004-11-02T15:34:29.357+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-06-21T10:32:32.173Z</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2008-06-21T10:32:32.189Z</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="source"> + <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>4af5c1f6-a282-47a1-af51-00d887f76b34</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>edit</sv:value> + </sv:property> + <sv:property sv:name="label" sv:type="String"> + <sv:value>media.dialogs.tabAttributes.source.label</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>String</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>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="String"> + <sv:value>2004-11-02T15:34:29.357+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-06-21T10:32:39.028Z</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2008-06-21T10:32:39.050Z</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="authorid"> + <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>b6b6934a-9582-4894-8f7a-1af8766644d0</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>metadata</sv:value> + </sv:property> + <sv:property sv:name="label" sv:type="String"> + <sv:value>media.dialogs.tabAttributes.creator.label</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>String</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="String"> + <sv:value>2004-11-02T15:34:29.357+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-06-21T10:32:47.601Z</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2009-08-14T12:23:03.298+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="creationdate"> + <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>09d6e2bb-466b-4e33-9e44-92e13b577cc3</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>metadata</sv:value> + </sv:property> + <sv:property sv:name="label" sv:type="String"> + <sv:value>media.dialogs.tabAttributes.creationDate.label</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>String</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="String"> + <sv:value>2004-11-02T15:34:29.357+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-06-21T10:32:56.621Z</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2009-08-14T12:23:15.761+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="lastmodified"> + <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>9b15394c-79c9-42f9-ab29-3eec96e4d77f</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>metadata</sv:value> + </sv:property> + <sv:property sv:name="label" sv:type="String"> + <sv:value>media.dialogs.tabAttributes.modificationDate.label</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>date</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="String"> + <sv:value>2004-11-02T15:34:29.357+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-06-21T10:33:05.445Z</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2009-08-14T12:23:46.933+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + </sv:node> +</sv:node> Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.common.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.modules.media.dialogs.mediaAudioDlg.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaAudioDlg.xml 2009-08-14 10:49:28 UTC (rev 1266) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaAudioDlg.xml 2009-08-14 10:54:10 UTC (rev 1267) @@ -18,17 +18,17 @@ <sv:property sv:name="class" sv:type="String"> <sv:value>net.sourceforge.openutils.mgnlmedia.media.dialog.LayerDialogMVC</sv:value> </sv:property> + <sv:property sv:name="height" sv:type="String"> + <sv:value>500</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="height" sv:type="String"> - <sv:value>450</sv:value> - </sv:property> <sv:property sv:name="label" sv:type="String"> <sv:value>media.dialogs.mediaAudioDlg.label</sv:value> </sv:property> <sv:property sv:name="width" sv:type="String"> - <sv:value>500</sv:value> + <sv:value>520</sv:value> </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> @@ -53,7 +53,7 @@ <sv:value>2008-07-02T16:35:26.521Z</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-07-30T23:45:24.186+02:00</sv:value> + <sv:value>2009-08-14T11:27:50.069+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:title" sv:type="String"> <sv:value/> @@ -142,255 +142,6 @@ </sv:node> </sv:node> </sv:node> - <sv:node sv:name="tabTitle"> - <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>82dd14cb-97e5-4a4b-a56d-0f2442bb25a6</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>tab</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabTitle.label</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="String"> - <sv:value>2004-11-02T15:34:28.151+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-07-02T15:10:45.788Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-08-13T15:37:07.580+02:00</sv:value> - </sv:property> - </sv:node> - <sv:node sv:name="title"> - <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>b8c9b66a-6481-4acb-86d0-e9092474bb3a</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>edit</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabTitle.title.label</sv:value> - </sv:property> - <sv:property sv:name="type" sv:type="String"> - <sv:value>String</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="String"> - <sv:value>2004-11-02T17:20:40.266+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-07-02T15:10:45.788Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-08-13T15:36:24.793+02:00</sv:value> - </sv:property> - </sv:node> - </sv:node> - </sv:node> - <sv:node sv:name="tabDescription"> - <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>fce459c3-6e2f-4112-9ab6-611a21d9ca0a</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>tab</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabDescription.label</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>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="String"> - <sv:value>2004-11-02T15:34:28.151+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-07-02T16:35:26.531Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-06-21T10:33:31.031Z</sv:value> - </sv:property> - </sv:node> - <sv:node sv:name="description"> - <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>b75c3cee-26e8-4909-b6e1-0db5299b6edd</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>edit</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabDescription.description.label</sv:value> - </sv:property> - <sv:property sv:name="type" sv:type="String"> - <sv:value>String</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>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="String"> - <sv:value>2004-11-02T17:20:40.266+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-07-02T16:35:26.532Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-06-21T10:47:39.791Z</sv:value> - </sv:property> - </sv:node> - </sv:node> - </sv:node> - <sv:node sv:name="tabTags"> - <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>384e67fa-71c8-4f32-b030-5f18689efa21</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>tab</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabTags.label</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>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="String"> - <sv:value>2004-11-02T15:34:28.151+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-07-02T16:35:26.537Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-06-21T10:52:35.199Z</sv:value> - </sv:property> - </sv:node> - <sv:node sv:name="tags"> - <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>40b9e44c-67b3-47d8-b98e-dfe08b8b3900</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>edit</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabTags.tags.label</sv:value> - </sv:property> - <sv:property sv:name="type" sv:type="String"> - <sv:value>String</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>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="String"> - <sv:value>2004-11-02T17:20:40.266+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-07-02T16:35:26.538Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-06-21T10:49:29.202Z</sv:value> - </sv:property> - </sv:node> - </sv:node> - </sv:node> <sv:node sv:name="tabAttributes"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>mgnl:contentNode</sv:value> @@ -398,12 +149,9 @@ <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>475cb0bb-17dd-4593-a9d8-ce04294a07e9</sv:value> </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>tab</sv:value> + <sv:property sv:name="reference" sv:type="String"> + <sv:value>/modules/media/dialogs/common/tabAttributes</sv:value> </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabAttributes.label</sv:value> - </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>mgnl:metaData</sv:value> @@ -418,7 +166,7 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:authorid" sv:type="String"> - <sv:value>superuser</sv:value> + <sv:value>admin</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="String"> <sv:value>2004-11-02T15:34:29.217+01:00</sv:value> @@ -427,224 +175,9 @@ <sv:value>2008-07-02T16:35:26.540Z</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-06-21T10:32:11.889Z</sv:value> + <sv:value>2009-08-14T11:26:40.983+02:00</sv:value> </sv:property> </sv:node> - <sv:node sv:name="copyright"> - <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>11b0de6c-6c69-4009-8c61-9ca5765dc6eb</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>edit</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabAttributes.copyright.label</sv:value> - </sv:property> - <sv:property sv:name="type" sv:type="String"> - <sv:value>String</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>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="String"> - <sv:value>2004-11-02T15:34:29.357+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-07-02T16:35:26.541Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-06-21T10:32:32.189Z</sv:value> - </sv:property> - </sv:node> - </sv:node> - <sv:node sv:name="source"> - <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>a43d22b3-3743-4b3f-b579-cd0d907d314e</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>edit</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabAttributes.source.label</sv:value> - </sv:property> - <sv:property sv:name="type" sv:type="String"> - <sv:value>String</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>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="String"> - <sv:value>2004-11-02T15:34:29.357+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-07-02T16:35:26.541Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-06-21T10:32:39.050Z</sv:value> - </sv:property> - </sv:node> - </sv:node> - <sv:node sv:name="creator"> - <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>f492337c-dbc5-427b-8d0e-f81bbb14d9d3</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>static</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabAttributes.creator.label</sv:value> - </sv:property> - <sv:property sv:name="type" sv:type="String"> - <sv:value>String</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>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="String"> - <sv:value>2004-11-02T15:34:29.357+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-07-02T16:35:26.542Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-06-21T10:32:47.623Z</sv:value> - </sv:property> - </sv:node> - </sv:node> - <sv:node sv:name="creationDate"> - <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>6b92ab62-0354-454f-96ed-f9065418790f</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>static</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabAttributes.creationDate.label</sv:value> - </sv:property> - <sv:property sv:name="type" sv:type="String"> - <sv:value>String</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>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="String"> - <sv:value>2004-11-02T15:34:29.357+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-07-02T16:35:26.542Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-06-21T10:32:56.641Z</sv:value> - </sv:property> - </sv:node> - </sv:node> - <sv:node sv:name="modificationDate"> - <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>5edee7b6-6e78-47c9-870c-048ef4cb6127</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>static</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabAttributes.modificationDate.label</sv:value> - </sv:property> - <sv:property sv:name="type" sv:type="String"> - <sv:value>String</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>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="String"> - <sv:value>2004-11-02T15:34:29.357+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-07-02T16:35:26.543Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-06-21T10:33:05.466Z</sv:value> - </sv:property> - </sv:node> - </sv:node> </sv:node> <sv:node sv:name="type"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> @@ -652,7 +185,6 @@ </sv:property> <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> <sv:value>mix:lockable</sv:value> - <sv:value>mix:versionable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>0dbc081e-42ef-42af-a885-875d80a1fd94</sv:value> Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml 2009-08-14 10:49:28 UTC (rev 1266) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.mediaImageDlg.xml 2009-08-14 10:54:10 UTC (rev 1267) @@ -18,17 +18,17 @@ <sv:property sv:name="class" sv:type="String"> <sv:value>net.sourceforge.openutils.mgnlmedia.media.dialog.LayerDialogMVC</sv:value> </sv:property> + <sv:property sv:name="height" sv:type="String"> + <sv:value>500</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="height" sv:type="String"> - <sv:value>450</sv:value> - </sv:property> <sv:property sv:name="label" sv:type="String"> <sv:value>media.dialogs.mediaImageDlg.label</sv:value> </sv:property> <sv:property sv:name="width" sv:type="String"> - <sv:value>500</sv:value> + <sv:value>520</sv:value> </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> @@ -53,7 +53,7 @@ <sv:value>2008-06-08T14:48:46.351+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-07-30T23:45:09.299+02:00</sv:value> + <sv:value>2009-08-14T11:33:02.217+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:title" sv:type="String"> <sv:value/> @@ -144,180 +144,17 @@ </sv:property> </sv:node> </sv:node> - <sv:node sv:name="colors"> - <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>0d24233e-7efd-45da-a612-1dc00d9a1b6e</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>radio</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabImage.colors.label</sv:value> - </sv:property> - <sv:property sv:name="type" sv:type="String"> - <sv:value>String</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>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="String"> - <sv:value>2004-11-02T15:34:29.357+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-06-21T10:14:51.844Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-06-21T10:18:14.610Z</sv:value> - </sv:property> - </sv:node> - <sv:node sv:name="options"> - <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:value>mix:versionable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>04b2ad3e-d542-4632-8a5b-24003e5eab54</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>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2008-06-21T10:18:18.144Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-06-21T10:18:21.684Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-06-21T10:18:21.705Z</sv:value> - </sv:property> - </sv:node> - <sv:node sv:name="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:value>mix:versionable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>5e4d7613-e70f-43d1-81d5-68d021bc7bf1</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabImage.colors.options.0.label</sv:value> - </sv:property> - <sv:property sv:name="value" sv:type="String"> - <sv:value>color</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>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2008-06-21T10:18:26.443Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-06-21T10:18:29.221Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-06-21T10:20:14.385Z</sv:value> - </sv:property> - </sv:node> - </sv:node> - <sv:node sv:name="1"> - <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:value>mix:versionable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>35f57b20-d1de-43c5-bc9b-8e1bdf9be712</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabImage.colors.options.1.label</sv:value> - </sv:property> - <sv:property sv:name="value" sv:type="String"> - <sv:value>bw</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>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2008-06-21T10:18:44.696Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-06-21T10:18:48.876Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-06-21T10:20:25.600Z</sv:value> - </sv:property> - </sv:node> - </sv:node> - </sv:node> - </sv:node> </sv:node> - <sv:node sv:name="tabTitle"> + <sv:node sv:name="tabAttributes"> <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>f1efd6b4-116f-4344-9276-7b49cd1447ba</sv:value> + <sv:value>2ad97fca-ed8d-41f9-b7b4-bc382f026979</sv:value> </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>tab</sv:value> + <sv:property sv:name="reference" sv:type="String"> + <sv:value>/modules/media/dialogs/common/tabAttributes</sv:value> </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabTitle.label</sv:value> - </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>mgnl:metaData</sv:value> @@ -335,479 +172,15 @@ <sv:value>admin</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="String"> - <sv:value>2004-11-02T15:34:28.151+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-07-02T15:10:45.788Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-08-13T15:37:22.494+02:00</sv:value> - </sv:property> - </sv:node> - <sv:node sv:name="title"> - <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>ac58fbf1-bd60-4332-ac50-06baf72032ec</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>edit</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>media.dialogs.tabTitle.title.label</sv:value> - </sv:property> - <sv:property sv:name="type" sv:type="String"> - <sv:value>String</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="String"> - <sv:value>2004-11-02T17:20:40.266+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-07-02T15:10:45.788Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2008-08-13T15:36:24.793+02:00</sv:value> - </sv:property> - </sv:node> - </sv:node> - </sv:node> - <sv:node sv:name="tabDescription"> - <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"> - ... [truncated message content] |
From: <fg...@us...> - 2009-08-14 10:49:35
|
Revision: 1266 http://openutils.svn.sourceforge.net/openutils/?rev=1266&view=rev Author: fgiust Date: 2009-08-14 10:49:28 +0000 (Fri, 14 Aug 2009) Log Message: ----------- MEDIA-2 display metadata in media dialog Added Paths: ----------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java (rev 0) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java 2009-08-14 10:49:28 UTC (rev 1266) @@ -0,0 +1,45 @@ +/** + * 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.dialog; + +import info.magnolia.cms.gui.dialog.DialogStatic; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.time.FastDateFormat; + + +/** + * @author fgiust + * @version $Id$ + */ +public class DialogMetadata extends DialogStatic +{ + + @Override + protected String readValue() + { + if (StringUtils.equals(this.getName(), "creationdate") || StringUtils.equals(this.getName(), "lastmodified")) + { + return FastDateFormat.getInstance("yyyy-MM-dd, HH:mm").format( + this.getStorageNode().getMetaData().getDateProperty(this.getName())); + } + + return this.getStorageNode().getMetaData().getStringProperty(this.getName()); + } + +} Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogMetadata.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2009-08-14 08:18:25
|
Revision: 1265 http://openutils.svn.sourceforge.net/openutils/?rev=1265&view=rev Author: fgiust Date: 2009-08-14 08:18:13 +0000 (Fri, 14 Aug 2009) Log Message: ----------- EnvironmentLog4jConfigListener now exposes a "server" System property also when log4jExposeWebAppRoot is set to false Modified Paths: -------------- trunk/openutils-deployment/src/main/java/it/openutils/deployment/log4j/EnvironmentLog4jConfigListener.java trunk/openutils-deployment/src/site/changes/changes.xml Modified: trunk/openutils-deployment/src/main/java/it/openutils/deployment/log4j/EnvironmentLog4jConfigListener.java =================================================================== --- trunk/openutils-deployment/src/main/java/it/openutils/deployment/log4j/EnvironmentLog4jConfigListener.java 2009-08-13 16:22:41 UTC (rev 1264) +++ trunk/openutils-deployment/src/main/java/it/openutils/deployment/log4j/EnvironmentLog4jConfigListener.java 2009-08-14 08:18:13 UTC (rev 1265) @@ -56,13 +56,13 @@ if (exposeWebAppRoot(servletContext)) { WebUtils.setWebAppRootSystemProperty(servletContext); + } - String servername = DeploymentResolver.resolveServerName(); - if (servername != null) - { - System.setProperty("server.name", servername); - System.setProperty("server", servername); - } + String servername = DeploymentResolver.resolveServerName(); + if (servername != null) + { + System.setProperty("server.name", servername); + System.setProperty("server", servername); } String locationList = servletContext.getInitParameter("log4jConfigLocation"); Modified: trunk/openutils-deployment/src/site/changes/changes.xml =================================================================== --- trunk/openutils-deployment/src/site/changes/changes.xml 2009-08-13 16:22:41 UTC (rev 1264) +++ trunk/openutils-deployment/src/site/changes/changes.xml 2009-08-14 08:18:13 UTC (rev 1265) @@ -8,6 +8,10 @@ <author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author> </properties> <body> + <release version="2.1.2" date="in svn" description=""> + <action type="update" dev="fgiust">EnvironmentLog4jConfigListener now exposes a "server" System property also when + log4jExposeWebAppRoot is set to false</action> + </release> <release version="2.1.1" date="2009-03-25" description=""> <action type="add" dev="fgiust">New "exposeSystemProperties" flag added to EnvironmentPropertyConfigurer</action> </release> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2009-08-13 16:22:49
|
Revision: 1264 http://openutils.svn.sourceforge.net/openutils/?rev=1264&view=rev Author: fgiust Date: 2009-08-13 16:22:41 +0000 (Thu, 13 Aug 2009) Log Message: ----------- avoid error logs for missing images 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-08-13 13:10:41 UTC (rev 1263) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-08-13 16:22:41 UTC (rev 1264) @@ -516,6 +516,18 @@ try { + if (!media.hasNodeData("image")) + { + return false; + } + } + catch (RepositoryException e2) + { + log.warn(e2.getMessage(), e2); + } + + try + { MgnlContext.doInSystemContext(new MgnlContext.SystemContextOperation() { @@ -546,17 +558,6 @@ throw new RuntimeException(e); } - try - { - if (!node.hasNodeData("image")) - { - throw new RuntimeException("No \"image\" nodedata for media " + media.getHandle()); - } - } - catch (RepositoryException e) - { - throw new RuntimeException(e); - } NodeData image = node.getNodeData("image"); if (image.getContentLength() == 0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2009-08-13 13:10:50
|
Revision: 1263 http://openutils.svn.sourceforge.net/openutils/?rev=1263&view=rev Author: fgiust Date: 2009-08-13 13:10:41 +0000 (Thu, 13 Aug 2009) Log Message: ----------- new randomInt function Modified Paths: -------------- trunk/openutils-elfunctions/src/main/resources/META-INF/stringutils.tld trunk/openutils-elfunctions/src/site/changes/changes.xml Modified: trunk/openutils-elfunctions/src/main/resources/META-INF/stringutils.tld =================================================================== --- trunk/openutils-elfunctions/src/main/resources/META-INF/stringutils.tld 2009-08-13 10:47:14 UTC (rev 1262) +++ trunk/openutils-elfunctions/src/main/resources/META-INF/stringutils.tld 2009-08-13 13:10:41 UTC (rev 1263) @@ -37,6 +37,12 @@ <function-signature>java.lang.String randomAlphanumeric(int)</function-signature> </function> <function> + <description>Returns a pseudorandom, uniformly distributed int value between 0 (inclusive) and the specified value (exclusive), from the Math.random() sequence.</description> + <name>randomInt</name> + <function-class>org.apache.commons.lang.math.RandomUtils</function-class> + <function-signature>int nextInt(int)</function-signature> + </function> + <function> <description>Unescapes a String</description> <name>unescapeXml</name> <function-class>org.apache.commons.lang.StringEscapeUtils</function-class> Modified: trunk/openutils-elfunctions/src/site/changes/changes.xml =================================================================== --- trunk/openutils-elfunctions/src/site/changes/changes.xml 2009-08-13 10:47:14 UTC (rev 1262) +++ trunk/openutils-elfunctions/src/site/changes/changes.xml 2009-08-13 13:10:41 UTC (rev 1263) @@ -8,6 +8,9 @@ <author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author> </properties> <body> + <release version="1.0.1" date="in svn" description=""> + <action type="add" dev="fgiust">Added "randomInt"</action> + </release> <release version="1.0" date="2008-12-11" description=""> <action type="add" dev="fgiust">first release</action> </release> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <luc...@us...> - 2009-08-13 10:47:24
|
Revision: 1262 http://openutils.svn.sourceforge.net/openutils/?rev=1262&view=rev Author: lucaboati Date: 2009-08-13 10:47:14 +0000 (Thu, 13 Aug 2009) Log Message: ----------- do not export root node (ex website.xml) Modified Paths: -------------- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/AbstractBootstrapSyncListener.java Modified: trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/AbstractBootstrapSyncListener.java =================================================================== --- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/AbstractBootstrapSyncListener.java 2009-08-13 10:46:07 UTC (rev 1261) +++ trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/listener/AbstractBootstrapSyncListener.java 2009-08-13 10:47:14 UTC (rev 1262) @@ -189,7 +189,6 @@ { parentHandle = "/"; } - // check if path is under a "compressed" node String pathParentToExport = this.watch.getExportRoots().getRootPath(parentHandle); @@ -281,7 +280,6 @@ { parentHandle = "/"; } - BootstrapAtomicFilter xmlReader = new BootstrapAtomicFilter(XMLReaderFactory .createXMLReader(org.apache.xerces.parsers.SAXParser.class.getName())); @@ -312,34 +310,39 @@ */ protected void exportFile(String fileName, XMLReader reader, HierarchyManager hm, String handle) { - // create necessary parent directories - File folder = new File(Path.getAbsoluteFileSystemPath(watch.getExportPath())); - folder.mkdirs(); + // do not export root (ex. website.xml) + if (StringUtils.isNotBlank(handle) && !StringUtils.equals(handle, "/")) + { + // create necessary parent directories + File folder = new File(Path.getAbsoluteFileSystemPath(watch.getExportPath())); + folder.mkdirs(); - File xmlFile = new File(folder.getAbsoluteFile(), fileName); - FileOutputStream fos = null; - try - { - fos = new FileOutputStream(xmlFile); + File xmlFile = new File(folder.getAbsoluteFile(), fileName); + FileOutputStream fos = null; + try + { + fos = new FileOutputStream(xmlFile); + } + catch (FileNotFoundException e) + { + log.error(e.getMessage(), e); + return; + } + + try + { + executeExport(fos, reader, hm.getWorkspace().getSession(), handle, watch.getRepository()); + } + catch (IOException e) + { + log.error(e.getMessage(), e); + } + finally + { + IOUtils.closeQuietly(fos); + } } - catch (FileNotFoundException e) - { - log.error(e.getMessage(), e); - return; - } - try - { - executeExport(fos, reader, hm.getWorkspace().getSession(), handle, watch.getRepository()); - } - catch (IOException e) - { - log.error(e.getMessage(), e); - } - finally - { - IOUtils.closeQuietly(fos); - } } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <luc...@us...> - 2009-08-13 10:46:17
|
Revision: 1261 http://openutils.svn.sourceforge.net/openutils/?rev=1261&view=rev Author: lucaboati Date: 2009-08-13 10:46:07 +0000 (Thu, 13 Aug 2009) Log Message: ----------- default node type added Modified Paths: -------------- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java Modified: trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java =================================================================== --- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java 2009-08-13 08:42:22 UTC (rev 1260) +++ trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/lifecycle/BootstrapSyncModuleLifecycle.java 2009-08-13 10:46:07 UTC (rev 1261) @@ -1,5 +1,16 @@ package it.openutils.mgnlbootstrapsync.lifecycle; +import info.magnolia.cms.beans.config.ContentRepository; +import info.magnolia.cms.core.HierarchyManager; +import info.magnolia.cms.core.ItemType; +import info.magnolia.cms.core.SystemProperty; +import info.magnolia.context.MgnlContext; +import info.magnolia.module.ModuleLifecycle; +import info.magnolia.module.ModuleLifecycleContext; +import it.openutils.mgnlbootstrapsync.listener.AbstractBootstrapSyncListener; +import it.openutils.mgnlbootstrapsync.listener.BootstrapSyncListener; +import it.openutils.mgnlbootstrapsync.watch.BootstrapSyncRepositoryWatch; + import java.util.HashMap; import java.util.Map; @@ -10,17 +21,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import info.magnolia.cms.core.HierarchyManager; -import info.magnolia.cms.core.ItemType; -import info.magnolia.cms.core.SystemProperty; -import info.magnolia.context.MgnlContext; -import info.magnolia.module.ModuleLifecycle; -import info.magnolia.module.ModuleLifecycleContext; -import it.openutils.mgnlbootstrapsync.listener.AbstractBootstrapSyncListener; -import it.openutils.mgnlbootstrapsync.listener.BootstrapSyncListener; -import it.openutils.mgnlbootstrapsync.watch.BootstrapSyncRepositoryWatch; - /** * @author molaschi * @version $Id: $ @@ -67,13 +68,26 @@ // get roots from which to export (one file for each node (ordering problem)) String enableRoots = SystemProperty .getProperty("magnolia.bootstrapSync." + repository + ".enablePaths"); - + // get node type to export - String nodeType = SystemProperty - .getProperty("magnolia.bootstrapSync." + repository + ".nodeType"); + String nodeType = null;// SystemProperty.getProperty("magnolia.bootstrapSync." + repository + + // ".nodeType"); if (nodeType == null) { + // set default nodeType nodeType = ItemType.CONTENT.getSystemName(); + if (ContentRepository.USERS.equalsIgnoreCase(repository)) + { + nodeType = ItemType.USER.getSystemName(); + } + else if (ContentRepository.USER_ROLES.equalsIgnoreCase(repository)) + { + nodeType = ItemType.ROLE.getSystemName(); + } + else if (ContentRepository.USER_GROUPS.equalsIgnoreCase(repository)) + { + nodeType = ItemType.GROUP.getSystemName(); + } } // create watch @@ -90,7 +104,7 @@ try { HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(repository); - + log.debug("Starting listener on repository {}", repository); hm.getWorkspace().getObservationManager().addEventListener( listener, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2009-08-13 08:42:32
|
Revision: 1260 http://openutils.svn.sourceforge.net/openutils/?rev=1260&view=rev Author: fgrilli Date: 2009-08-13 08:42:22 +0000 (Thu, 13 Aug 2009) Log Message: ----------- improced javadoc for Criteria Modified Paths: -------------- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2009-08-13 08:10:16 UTC (rev 1259) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2009-08-13 08:42:22 UTC (rev 1260) @@ -26,7 +26,6 @@ /** - * * <tt>Criteria</tt> is a simplified API for retrieving JCR Nodes by composing <tt>Criterion</tt> objects. This is a * very convenient approach for functionality like "search" screens where there is a variable number of conditions to be * placed upon the result set.<br> @@ -52,12 +51,57 @@ * //dogs//*[((jcr:contains(@name, 'Nana')) and (@weight>10.0) and (@birthDate >=xs:dateTime('2004-01-01T00:00:00.000+00:00') and @birthDate <=xs:dateTime('2008-12-01T23:59:59.000+00:00')))] order by @name descending * </pre> * - * A word of warning about implementations returned by JCRCriteriaFactory. They are <strong>NOT</strong> thread-safe, therefore client - * code wishing to use one of them as a shared global variable <strong>MUST</strong> coordinate access to it. These objects are actually - * meant to be instantiated and used within a method scope (e.g. a service method), where no concurrent issues arise. <br> + * You can also specify a different type to be returned in the Collection of results. eg. + * + * <pre> + * Collection<Pet> pets = JCRCriteriaFactory.createMgnlCriteria("//dogs//*", MgnlContext.getQueryManager("website"), "mgnl:content", Pet.class).add( + * Restrictions.contains("@name", "Nana")).add( + * Restrictions.gt("@weight", new Float(10))).add( + * Restrictions.between("@birthDate", begin, end).addOrder( + * Order.desc("@name")).list(); + * </pre> + * + * Internally, this will use info.magnolia.content2bean.Content2BeanUtil.toBean() to transform nodes into beans. So, for + * example, if you have a domain Pet class like this + * + * <pre> + * public class Pet + * { + * private String name; + * private Float weight; + * private Calendar birthDate; + * //getters and setters here... + * } + * </pre> + * + * Content nodes returned by the above query will be automatically converted to and populate instances of the + * <code>Pet</code> type. Furthermore, you may want to have only a subset of the whole result set returned, much like in + * a MySQL limit clause. In this case, you will use the <code>JCRCriteriaFactory.createMgnlCriteriaWithLimit</code> factory method. + * For this to work, the underlying JCR repository implementation must support this feature (Jackrabbit 1.4+ does). Here + * is an example. + * + *<pre> + * Collection<Pet> pets = JCRCriteriaFactory.createMgnlCriteriaWithLimit("//dogs//*", MgnlContext.getQueryManager("website"), "mgnl:content", Pet.class).add( + * Restrictions.contains("@name", "Nana")).add( + * Restrictions.gt("@weight", new Float(10))).add( + * Restrictions.between("@birthDate", begin, end). + * setFirstResult(5). + * setMaxResults(10). + * addOrder(Order.desc("@jcr:score()")).list(); + *</pre> + * + * Notice the <code>setFirstResult(int)</code> and <code>setMaxResults(int)</code> methods. Now calling + * <code>list()</code> will return a subset of only five <code>Pet</code> objects, starting from the 6th item (counting + * starts from 0). If you dont specify these two calls, <code>list()</code> will behave as usual by returning the entire result set. + * If you only call <code>setMaxResults(int)</code>, the result set will be the subset of elements <code>[0, maxResults]</code> + * (firstResultValue is 0 by default). + * <br><br> + * A word of warning about implementations returned by <code>JCRCriteriaFactory</code>. They are <strong>NOT</strong> thread-safe, + * therefore client code wishing to use one of them as a shared global variable <strong>MUST</strong> coordinate access + * to it. These objects are actually meant to be instantiated and used within a method scope (e.g. a service method), + * where no concurrent issues arise. <br> * <br> - * This API was inspired by Hibernate's Criteria API. <br> - * + * This API was inspired by Hibernate's Criteria API. <br><br> * @see JCRCriteriaFactory#createMgnlCriteria(String, info.magnolia.cms.core.search.QueryManager, String) * @see JCRCriteriaFactory#createMgnlCriteria(String, info.magnolia.cms.core.search.QueryManager, String, Class) * @see JCRCriteriaFactory#createMgnlCriteriaWithLimit(String, info.magnolia.cms.core.search.QueryManager, String) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2009-08-13 08:10:25
|
Revision: 1259 http://openutils.svn.sourceforge.net/openutils/?rev=1259&view=rev Author: fgrilli Date: 2009-08-13 08:10:16 +0000 (Thu, 13 Aug 2009) Log Message: ----------- some fixes and improvements suggested by findbugs Modified Paths: -------------- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java 2009-08-12 16:37:45 UTC (rev 1258) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java 2009-08-13 08:10:16 UTC (rev 1259) @@ -38,12 +38,6 @@ public InExpression(String nodeName, String[] values) { this.nodeName = nodeName; - if (!(values instanceof String[])) - { - String msg = "values must be of type String[]"; - log.error(msg); - throw new IllegalArgumentException(msg); - } this.values = values; } Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java 2009-08-12 16:37:45 UTC (rev 1258) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java 2009-08-13 08:10:16 UTC (rev 1259) @@ -94,11 +94,6 @@ INSTANCES.put(ANYWHERE.name, ANYWHERE); } - private Object readResolve() - { - return INSTANCES.get(name); - } - /** * convert the pattern, by appending/prepending "%" */ Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java 2009-08-12 16:37:45 UTC (rev 1258) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java 2009-08-13 08:10:16 UTC (rev 1259) @@ -104,7 +104,7 @@ public Criteria setMaxResults(int maxResults) { - this.maxResults = new Integer(maxResults); + this.maxResults = Integer.valueOf(maxResults); return this; } @@ -115,7 +115,7 @@ public Criteria setFirstResult(int firstResult) { - this.firstResult = new Integer(firstResult); + this.firstResult = Integer.valueOf(firstResult); return this; } @@ -126,7 +126,7 @@ public Criteria setTimeout(int timeout) { - this.timeout = new Integer(timeout); + this.timeout = Integer.valueOf(timeout); return this; } @@ -146,6 +146,8 @@ public static final class CriterionEntry implements Serializable { + private static final long serialVersionUID = 1L; + private final Criterion criterion; private final Criteria criteria; @@ -175,6 +177,7 @@ public static final class OrderEntry implements Serializable { + private static final long serialVersionUID = 1L; private final Order order; Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java 2009-08-12 16:37:45 UTC (rev 1258) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java 2009-08-13 08:10:16 UTC (rev 1259) @@ -110,9 +110,8 @@ else { log.debug("returning a Collection holding objects of type {} ", classType.getName()); - Iterator iter = retVal.iterator(); List list = new ArrayList(); - while (iter.hasNext()) + for (Iterator iter = retVal.iterator(); iter.hasNext();) { Content node = (Content) iter.next(); try Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java 2009-08-12 16:37:45 UTC (rev 1258) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java 2009-08-13 08:10:16 UTC (rev 1259) @@ -127,7 +127,7 @@ stop = System.currentTimeMillis(); log.debug("Query executed in {} milliseconds", stop - start); - Collection retVal = new ArrayList(); + Collection retVal; field = managerClass.getDeclaredField(HIERARCHY_MANAGER); field.setAccessible(true); HierarchyManager hm = (HierarchyManager) field.get(queryManager); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2009-08-12 16:37:52
|
Revision: 1258 http://openutils.svn.sourceforge.net/openutils/?rev=1258&view=rev Author: fgiust Date: 2009-08-12 16:37:45 +0000 (Wed, 12 Aug 2009) Log Message: ----------- magnolia 3.x compatibility Modified Paths: -------------- trunk/openutils-mgnlgroovy/src/main/resources/META-INF/magnolia/groovyshell.xml trunk/openutils-mgnlgroovy/src/site/apt/index.apt trunk/openutils-mgnlgroovy/src/site/changes/changes.xml Modified: trunk/openutils-mgnlgroovy/src/main/resources/META-INF/magnolia/groovyshell.xml =================================================================== --- trunk/openutils-mgnlgroovy/src/main/resources/META-INF/magnolia/groovyshell.xml 2009-08-12 16:33:16 UTC (rev 1257) +++ trunk/openutils-mgnlgroovy/src/main/resources/META-INF/magnolia/groovyshell.xml 2009-08-12 16:37:45 UTC (rev 1258) @@ -10,7 +10,7 @@ <dependencies> <dependency> <name>adminInterface</name> - <version>4</version> + <version>3.1/*</version> </dependency> </dependencies> </module> \ No newline at end of file Modified: trunk/openutils-mgnlgroovy/src/site/apt/index.apt =================================================================== --- trunk/openutils-mgnlgroovy/src/site/apt/index.apt 2009-08-12 16:33:16 UTC (rev 1257) +++ trunk/openutils-mgnlgroovy/src/site/apt/index.apt 2009-08-12 16:37:45 UTC (rev 1258) @@ -9,7 +9,7 @@ openutils-mgnlgroovy is a custom {{{http://www.magnolia-cms.com}magnolia}} module which adds a console for running groovy scripts inside Magnolia's adminCentral interface - <<Latest module version requires Magnolia 4.1.x>> + <<Requires Magnolia version 3.1 or higher (tested with 4.1.x)>> The module needs to be installed as usual, by declaring an additional dependency into your pom or by manually dropping the jar into Magnolia. If you are installing it manually, please note that you will also need to install other dependencies, see Modified: trunk/openutils-mgnlgroovy/src/site/changes/changes.xml =================================================================== --- trunk/openutils-mgnlgroovy/src/site/changes/changes.xml 2009-08-12 16:33:16 UTC (rev 1257) +++ trunk/openutils-mgnlgroovy/src/site/changes/changes.xml 2009-08-12 16:37:45 UTC (rev 1258) @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- + <!-- "type" attribute can be: add, remove, update or fix. --> <document> @@ -8,6 +8,11 @@ <author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author> </properties> <body> + <release version="1.0.1" date="in svn" description=""> + <action type="fix" dev="fgiust">Print out the full stacktrace for exception thrown in groovy scripts.</action> + <action type="update" dev="fgiust">Update groovy dependency to version 1.6.3.</action> + <action type="update" dev="fgiust">Update magnolia dependency to version 4.1.</action> + </release> <release version="1.0" date="2008-12-03" description="first release"> <action type="new" dev="fgiust">Initial public release.</action> </release> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2009-08-12 16:33:35
|
Revision: 1257 http://openutils.svn.sourceforge.net/openutils/?rev=1257&view=rev Author: fgiust Date: 2009-08-12 16:33:16 +0000 (Wed, 12 Aug 2009) Log Message: ----------- print a full stacktrace in case of errors Modified Paths: -------------- trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellPage.java Modified: trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellPage.java =================================================================== --- trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellPage.java 2009-08-12 16:20:46 UTC (rev 1256) +++ trunk/openutils-mgnlgroovy/src/main/java/net/sourceforge/openutils/mgnlgroovy/pages/GroovyShellPage.java 2009-08-12 16:33:16 UTC (rev 1257) @@ -16,6 +16,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.exception.ExceptionUtils; import org.codehaus.groovy.control.CompilationFailedException; import org.codehaus.groovy.runtime.InvokerHelper; import org.slf4j.Logger; @@ -69,15 +70,19 @@ retVal = script.run(); AlertUtil.setMessage("Script executed successfully. Return value is " + retVal); } + catch (CompilationFailedException e) { log.error("An error occurred while parsing the script. Error message is {}", e.getMessage()); AlertUtil.setMessage("An error occurred while parsing the script. Error message is " + e.getMessage()); } - catch (Exception e) + catch (Throwable e) { - log.error("An error occurred while executing the script. Error message is {}", e.getMessage()); - AlertUtil.setMessage("An error occurred while executing the script. Error message is " + e.getMessage()); + log.error("An error occurred while executing the script. Error message is " + e.getMessage(), e); + AlertUtil.setMessage("An error occurred while executing the script. Error message is " + + e.getMessage() + + "\n" + + ExceptionUtils.getFullStackTrace(e)); } return this.show(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2009-08-12 16:20:54
|
Revision: 1256 http://openutils.svn.sourceforge.net/openutils/?rev=1256&view=rev Author: fgiust Date: 2009-08-12 16:20:46 +0000 (Wed, 12 Aug 2009) Log Message: ----------- Avoid image processing when the requested size is identical to the original image Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java trunk/openutils-mgnlmedia/src/site/changes/changes.xml Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-08-12 14:26:58 UTC (rev 1255) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2009-08-12 16:20:46 UTC (rev 1256) @@ -24,6 +24,7 @@ import info.magnolia.cms.util.NodeDataUtil; import info.magnolia.context.MgnlContext; +import java.awt.Point; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -273,6 +274,15 @@ */ public static String getResolutionUrl(Content media, String resolution) { + FileProperties prop = new FileProperties(media, "image"); + Integer width = NumberUtils.toInt(prop.getProperty(FileProperties.PROPERTY_WIDTH)); + Integer height = NumberUtils.toInt(prop.getProperty(FileProperties.PROPERTY_HEIGHT)); + Point size = ImageUtils.parseForSize(resolution); + if (width == size.x && height == size.y) + { + return mcm.getURIMappingPrefix() + prop.getProperty(FileProperties.PATH); + } + if (media == null || !ImageUtils.checkOrCreateResolution(media, resolution)) { return null; 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-08-12 14:26:58 UTC (rev 1255) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java 2009-08-12 16:20:46 UTC (rev 1256) @@ -1,3 +1,5 @@ +package net.sourceforge.openutils.mgnlmedia.media.utils; + /** * Copyright Openmind http://www.openmindonline.it * @@ -15,7 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package net.sourceforge.openutils.mgnlmedia.media.utils; import info.magnolia.cms.beans.runtime.FileProperties; import info.magnolia.cms.core.Content; @@ -27,6 +28,7 @@ import java.awt.Color; import java.awt.Graphics2D; import java.awt.Image; +import java.awt.Point; import java.awt.RenderingHints; import java.awt.geom.RoundRectangle2D; import java.awt.image.BufferedImage; @@ -254,6 +256,13 @@ double xRatio = (double) x / oX; double yRatio = (double) y / oY; + + if (xRatio * yRatio == 1) + { + log.debug("Nothing to resize, return original"); + return original; + } + double ratio = Math.min(xRatio, yRatio); int newX = (int) Math.round(oX * ratio); int newY = (int) Math.round(oY * ratio); @@ -289,7 +298,8 @@ } else { - return resizeImage(original, x, y); + return original; + // return resizeImage(original, x, y); } } @@ -654,20 +664,14 @@ String controlChar = StringUtils.substring(resolution, 0, 1); + Point size = parseForSize(resolution); + if ("<".equals(controlChar) || "l".equals(controlChar)) { - String resx = resolution.startsWith("<") ? StringUtils.substringBefore(StringUtils.substringAfter( - resolution, - "<"), "x") : StringUtils.substringBefore(StringUtils.substringAfter(resolution, "l"), "x"); - String resy = StringUtils.substringAfter(resolution, "x"); - - img = fitIn(original, NumberUtils.toInt(resx), NumberUtils.toInt(resy)); + img = fitIn(original, size.x, size.y); } else if (resolution.startsWith("o")) { - String resx = StringUtils.substringBefore(StringUtils.substringAfter(resolution, "o"), "x"); - String resy = StringUtils.substringAfter(resolution, "x"); - Color background = null; if (StringUtils.contains(params, "background=")) @@ -682,21 +686,12 @@ log.error("Invalid color code: " + colorHex, e); } } - - img = resizeNoCrop(original, NumberUtils.toInt(resx), NumberUtils.toInt(resy), background); + img = resizeNoCrop(original, size.x, size.y, background); } else { - String resx = StringUtils.substringBefore(resolution, "x"); - String resy = StringUtils.substringAfter(resolution, "x"); - - if (resx.charAt(0) < '0' || resx.charAt(0) > '9') - { - resx = resx.substring(1); - } - - img = fillAndCropCentered(original, NumberUtils.toInt(resx), NumberUtils.toInt(resy)); + img = fillAndCropCentered(original, size.x, size.y); } return img; @@ -747,4 +742,43 @@ } } + public static java.awt.Point parseForSize(String res) + { + Point size = new Point(); + String resolution = StringUtils.lowerCase(res); + String resx, resy; + + if (StringUtils.contains(resolution, ";")) + { + resolution = StringUtils.substringBefore(resolution, ";"); + } + String controlChar = StringUtils.substring(resolution, 0, 1); + + if ("<".equals(controlChar) || "l".equals(controlChar)) + { + resx = resolution.startsWith("<") ? StringUtils.substringBefore( + StringUtils.substringAfter(resolution, "<"), + "x") : StringUtils.substringBefore(StringUtils.substringAfter(resolution, "l"), "x"); + resy = StringUtils.substringAfter(resolution, "x"); + } + else if (resolution.startsWith("o")) + { + resx = StringUtils.substringBefore(StringUtils.substringAfter(resolution, "o"), "x"); + resy = StringUtils.substringAfter(resolution, "x"); + } + else + { + resx = StringUtils.substringBefore(resolution, "x"); + resy = StringUtils.substringAfter(resolution, "x"); + + if (resx.charAt(0) < '0' || resx.charAt(0) > '9') + { + resx = resx.substring(1); + } + } + size.x = NumberUtils.toInt(resx); + size.y = NumberUtils.toInt(resy); + return size; + } + } Modified: trunk/openutils-mgnlmedia/src/site/changes/changes.xml =================================================================== --- trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-08-12 14:26:58 UTC (rev 1255) +++ trunk/openutils-mgnlmedia/src/site/changes/changes.xml 2009-08-12 16:20:46 UTC (rev 1256) @@ -8,6 +8,10 @@ <author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author> </properties> <body> + <release version="4.0-b6" date="in svn" description=""> + <action type="fix" dev="fgiust">Avoid image processing when the requested size is identical to the original image + </action> + </release> <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> @@ -28,7 +32,8 @@ <action type="update" dev="fgiust">Update openutils-mgnltasks dependency to 4.0</action> <action type="add" dev="fgiust">Support for resize without crop to a fixed size with borders. Background color can be specified with the syntax: "o100x100;background=FF0096"</action> - <action type="add" dev="fgiust">Alternative prefix for "fit in" resize. In previous versions you had to use < (not very handy in html), now you can use "L" (lower, case insensitive), e.g. "L100x100"</action> + <action type="add" dev="fgiust">Alternative prefix for "fit in" resize. In previous versions you had to use < + (not very handy in html), now you can use "L" (lower, case insensitive), e.g. "L100x100"</action> </release> <release version="4.0-b2" date="2009-04-16" description=""> <action type="update" dev="fgiust">Stable release for Magnolia 4.x</action> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2009-08-12 14:27:15
|
Revision: 1255 http://openutils.svn.sourceforge.net/openutils/?rev=1255&view=rev Author: fgrilli Date: 2009-08-12 14:26:58 +0000 (Wed, 12 Aug 2009) Log Message: ----------- fixed typo in javadoc whish -> wish Modified Paths: -------------- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java Modified: trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java =================================================================== --- trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java 2009-08-12 10:15:48 UTC (rev 1254) +++ trunk/openutils-bshd5/src/main/java/it/openutils/dao/hibernate/HibernateDAO.java 2009-08-12 14:26:58 UTC (rev 1255) @@ -100,7 +100,7 @@ /** * Return all objects related to the implementation of this DAO filtered using properties of the provided instance. - * @param filter an instance of the object with the properties you whish to filter on. + * @param filter an instance of the object with the properties you wish to filter on. * @param maxResults maximum number of results * @param page result page (first result is maxResults * page) * @return list of objects @@ -109,7 +109,7 @@ /** * Return all objects related to the implementation of this DAO filtered using properties of the provided instance. - * @param filter an instance of the object with the properties you whish to filter on. + * @param filter an instance of the object with the properties you wish to filter on. * @param metadata filter metadata * @param maxResults maximum number of results * @param page result page (first result is maxResults * page) @@ -119,7 +119,7 @@ /** * Return all objects related to the implementation of this DAO filtered using properties of the provided instance. - * @param filter an instance of the object with the properties you whish to filter on. + * @param filter an instance of the object with the properties you wish to filter on. * @param customOrder order criterias * @param metadata filter metadata * @param maxResults maximum number of results @@ -131,7 +131,7 @@ /** * Return all objects related to the implementation of this DAO filtered using properties of the provided instance. - * @param filter an instance of the object with the properties you whish to filter on. + * @param filter an instance of the object with the properties you wish to filter on. * @param customOrder order criterias * @param metadata filter metadata * @param maxResults maximum number of results @@ -145,7 +145,7 @@ /** * Return properties from all objects related to the implementation of this DAO filtered using properties of the * provided instance. - * @param filter an instance of the object with the properties you whish to filter on. + * @param filter an instance of the object with the properties you wish to filter on. * @param customOrder order criterias * @param metadata filter metadata * @param maxResults maximum number of results @@ -160,14 +160,14 @@ /** * Return all objects related to the implementation of this DAO filtered using properties of the provided instance. - * @param filter an instance of the object with the properties you whish to filter on. + * @param filter an instance of the object with the properties you wish to filter on. * @return list of objects */ List<T> findFiltered(final T filter); /** * Return all objects related to the implementation of this DAO filtered using properties of the provided instance. - * @param filter an instance of the object with the properties you whish to filter on. + * @param filter an instance of the object with the properties you wish to filter on. * @param orderProperties the name of the property used for ordering * @return list of objects */ @@ -175,7 +175,7 @@ /** * Return all objects related to the implementation of this DAO filtered using properties of the provided instance. - * @param filter an instance of the object with the properties you whish to filter on. + * @param filter an instance of the object with the properties you wish to filter on. * @param metadata filter metadata * @return list of objects */ @@ -184,7 +184,7 @@ /** * Return the first object related to the implementation of this DAO filtered using properties of the provided * instance. - * @param filter an instance of the object with the properties you whish to filter on. + * @param filter an instance of the object with the properties you wish to filter on. * @return first object in the collection */ T findFilteredFirst(final T filter); @@ -192,7 +192,7 @@ /** * Return the first object related to the implementation of this DAO filtered using properties of the provided * instance. - * @param filter an instance of the object with the properties you whish to filter on. + * @param filter an instance of the object with the properties you wish to filter on. * @return first object in the collection */ T findFilteredFirst(final T filter, final Order[] order); @@ -200,14 +200,14 @@ /** * Return the first object related to the implementation of this DAO filtered using properties of the provided * instance. - * @param filter an instance of the object with the properties you whish to filter on. + * @param filter an instance of the object with the properties you wish to filter on. * @param criteria additional criterion * @return first object in the collection */ T findFilteredFirst(final T filter, final List<Criterion> criteria); /** - * Used by the base DAO classes but here for your modification Remove a persistent instance from the datastore. The + * Used by the base DAO classes but here for your modification. Remove a persistent instance from the datastore. The * argument may be an instance associated with the receiving Session or a transient instance with an identifier * associated with existing persistent state. * @param key key This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <luc...@us...> - 2009-08-12 10:16:00
|
Revision: 1254 http://openutils.svn.sourceforge.net/openutils/?rev=1254&view=rev Author: lucaboati Date: 2009-08-12 10:15:48 +0000 (Wed, 12 Aug 2009) Log Message: ----------- add this.nodeType = nodeType; to constructor Modified Paths: -------------- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/watch/BootstrapSyncRepositoryWatch.java Modified: trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/watch/BootstrapSyncRepositoryWatch.java =================================================================== --- trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/watch/BootstrapSyncRepositoryWatch.java 2009-08-11 19:43:28 UTC (rev 1253) +++ trunk/openutils-mgnlbootstrapsync/src/main/java/it/openutils/mgnlbootstrapsync/watch/BootstrapSyncRepositoryWatch.java 2009-08-12 10:15:48 UTC (rev 1254) @@ -3,8 +3,8 @@ import it.openutils.mgnlbootstrapsync.BootstrapEnableRoot; import it.openutils.mgnlbootstrapsync.BootstrapExportRoot; + /** - * * @author mmolaschi * @version $Id: $ */ @@ -18,46 +18,66 @@ private BootstrapExportRoot exportRoots; private BootstrapEnableRoot enableRoots; - + private String nodeType; /** - * * @param repository repository to watch - * @param basePath base path for repository * @param exportPath folder to export files to * @param exportRoots comma separeted list of nodes (every modified to children will be exported as this node) * @param enableRoots enabled branches for listener + * @param nodeType nodeType */ - public BootstrapSyncRepositoryWatch(String repository, String exportPath, String exportRoots, String enableRoots, String nodeType) + public BootstrapSyncRepositoryWatch( + String repository, + String exportPath, + String exportRoots, + String enableRoots, + String nodeType) { this.repository = repository; this.exportPath = exportPath; this.exportRoots = new BootstrapExportRoot(exportRoots); this.enableRoots = new BootstrapEnableRoot(enableRoots); + this.nodeType = nodeType; } + /** + * Returns the repository. + * @return the repository + */ public String getRepository() { return repository; } + /** + * Sets the repository. + * @param repository the repository to set + */ public void setRepository(String repository) { this.repository = repository; } + /** + * Returns the exportPath. + * @return the exportPath + */ public String getExportPath() { return exportPath; } + /** + * Sets the exportPath. + * @param exportPath the exportPath to set + */ public void setExportPath(String exportPath) { this.exportPath = exportPath; } - /** * Returns the exportRoots. * @return the exportRoots @@ -67,7 +87,6 @@ return exportRoots; } - /** * Sets the exportRoots. * @param exportRoots the exportRoots to set @@ -77,7 +96,6 @@ this.exportRoots = exportRoots; } - /** * Returns the enableRoots. * @return the enableRoots @@ -87,7 +105,6 @@ return enableRoots; } - /** * Sets the enableRoots. * @param enableRoots the enableRoots to set @@ -97,7 +114,6 @@ this.enableRoots = enableRoots; } - /** * Returns the nodeType. * @return the nodeType @@ -107,7 +123,6 @@ return nodeType; } - /** * Sets the nodeType. * @param nodeType the nodeType to set @@ -116,4 +131,5 @@ { this.nodeType = nodeType; } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2009-08-11 19:43:44
|
Revision: 1253 http://openutils.svn.sourceforge.net/openutils/?rev=1253&view=rev Author: fgrilli Date: 2009-08-11 19:43:28 +0000 (Tue, 11 Aug 2009) Log Message: ----------- improved javadoc Modified Paths: -------------- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2009-08-10 12:35:20 UTC (rev 1252) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java 2009-08-11 19:43:28 UTC (rev 1253) @@ -18,7 +18,6 @@ */ package net.sourceforge.openutils.mgnlcriteria.jcr.query; - import java.util.Collection; import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion; @@ -27,6 +26,7 @@ /** + * * <tt>Criteria</tt> is a simplified API for retrieving JCR Nodes by composing <tt>Criterion</tt> objects. This is a * very convenient approach for functionality like "search" screens where there is a variable number of conditions to be * placed upon the result set.<br> @@ -35,29 +35,34 @@ * * <pre> * Calendar begin = Calendar.getInstance(); - * begin.set(2004, 0, 1); + * begin.set(2004, Calendar.JANUARY, 1); * Calendar end = Calendar.getInstance(); - * end.set(2008, 11, 1); + * end.set(2008, Calendar.DECEMBER, 1); * * Collection pets = JCRCriteriaFactory.createMgnlCriteria("//dogs//*", MgnlContext.getQueryManager("website"), "nt:base").add( * Restrictions.contains("@name", "Nana")).add( * Restrictions.gt("@weight", new Float(10))).add( * Restrictions.between("@birthDate", begin, end).addOrder( - * Order.desc("@jcr:score()")).list(); + * Order.desc("@name")).list(); * </pre> * * will be translated into the following xpath statement * * <pre> - * //dogs//*[((jcr:contains(@name, 'Nana')) and (@weight>10.0) and (@birthDate >=xs:dateTime('2004-01-01T00:00:00.000+00:00') and @birthDate <=xs:dateTime('2008-12-01T23:59:59.000+00:00')))] order by @jcr:score() descending + * //dogs//*[((jcr:contains(@name, 'Nana')) and (@weight>10.0) and (@birthDate >=xs:dateTime('2004-01-01T00:00:00.000+00:00') and @birthDate <=xs:dateTime('2008-12-01T23:59:59.000+00:00')))] order by @name descending * </pre> * - * This API is blatantly inspired by and respectfully borrows code from Hibernate's Criteria API. <br> + * A word of warning about implementations returned by JCRCriteriaFactory. They are <strong>NOT</strong> thread-safe, therefore client + * code wishing to use one of them as a shared global variable <strong>MUST</strong> coordinate access to it. These objects are actually + * meant to be instantiated and used within a method scope (e.g. a service method), where no concurrent issues arise. <br> * <br> + * This API was inspired by Hibernate's Criteria API. <br> + * * @see JCRCriteriaFactory#createMgnlCriteria(String, info.magnolia.cms.core.search.QueryManager, String) * @see JCRCriteriaFactory#createMgnlCriteria(String, info.magnolia.cms.core.search.QueryManager, String, Class) * @see JCRCriteriaFactory#createMgnlCriteriaWithLimit(String, info.magnolia.cms.core.search.QueryManager, String) - * @see JCRCriteriaFactory#createMgnlCriteriaWithLimit(String, info.magnolia.cms.core.search.QueryManager, String, Class) + * @see JCRCriteriaFactory#createMgnlCriteriaWithLimit(String, info.magnolia.cms.core.search.QueryManager, String, + * Class) * @see Restrictions * @see Order * @author Federico Grilli @@ -98,10 +103,8 @@ /* * Set a timeout for the underlying query. * @param timeout The timeout value to apply. - * @return this (for method chaining) FIXME is it possible in JCR? - * - public Criteria setTimeout(int timeout); - */ + * @return this (for method chaining) FIXME is it possible in JCR? public Criteria setTimeout(int timeout); + */ /** * Get the results. <strong>The implementation should guarantee the caller that the returned Collection is never This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |