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...> - 2008-11-10 15:41:08
|
Revision: 926 http://openutils.svn.sourceforge.net/openutils/?rev=926&view=rev Author: fgiust Date: 2008-11-10 15:40:59 +0000 (Mon, 10 Nov 2008) Log Message: ----------- mgnlmedia first import - draft Added Paths: ----------- trunk/openutils-mgnlmedia/ trunk/openutils-mgnlmedia/pom.xml trunk/openutils-mgnlmedia/src/ trunk/openutils-mgnlmedia/src/main/ trunk/openutils-mgnlmedia/src/main/java/ trunk/openutils-mgnlmedia/src/main/java/net/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileVideo.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModuleLifecycle.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MessagesTemplatedMVCHandler.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/ 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/RemoveResolutionsNodeTask.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/RenameThumbToImageTask.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/JcrBrowserWithNodeTypeTreeConfiguration.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeMVCHandler.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/AudioTypeHandler.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/YouTubeVideoTypeHandler.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java trunk/openutils-mgnlmedia/src/main/resources/ trunk/openutils-mgnlmedia/src/main/resources/META-INF/ trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/ trunk/openutils-mgnlmedia/src/main/resources/META-INF/magnolia/media.xml trunk/openutils-mgnlmedia/src/main/resources/META-INF/media.tld trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/imageTag.tag trunk/openutils-mgnlmedia/src/main/resources/dialog/ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl trunk/openutils-mgnlmedia/src/main/resources/info/ trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/ trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/ trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/ trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/ trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.commands.default.activateMedia.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.media.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.adminInterface.config.menu.tools.mediaJCR.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileAudio.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileImage.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.fileVideo.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.controls.mediaSelection.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 trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.audio.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.image.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.video.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.mediatypes.youtube.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.mediaBrowser.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.mediaFolderSelection.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.pages.mediaFolderView.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.media-jcr.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.trees.media.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.server.URI2RepositoryMapping.mappings.media.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/media/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/media/messages_en.properties trunk/openutils-mgnlmedia/src/main/resources/mgnl-messages/media/messages_it.properties trunk/openutils-mgnlmedia/src/main/resources/mgnl-nodetypes/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-nodetypes/media/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-nodetypes/media/magnolia-nodetypes.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/failed.png trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/file.png trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/progress-bar/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/progress-bar/bar.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/progress-bar/progress.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/success.png trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/uploading.png trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/bubble.png trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/close.png trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/left.png trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/leftDisabled.png trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/loader.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/right.png trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/rightDisabled.png trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/multibox.css trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/upload.css trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/arrow_right_green_inactive.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/audio.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/audioThumb.jpg trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/browse16.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/edit.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/edit_inactive.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/film.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/film_inactive.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/folder16.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/icon24.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/image16.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/image16_inactive.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/link_go.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/photo.png trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/screensaver.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/search16.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/wallpaper.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/icons/zip.gif trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/media.js trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/miframe.js trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mootips.js trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mootools-1.2-core.js trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mootools-1.2-more.js trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/multibox/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/multibox/multibox.js trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/multibox/overlay.js trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/swfobject.js trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/upload/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/upload/FancyUpload2.js trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/upload/Fx.ProgressBar.js trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/upload/Swiff.Uploader.js trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/upload/Swiff.Uploader.swf trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/FLVPlayer_Progressive.swf trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/flvplayer.swf trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/mp3player.swf trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/player.swf trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/players/yt.swf trunk/openutils-mgnlmedia/src/main/resources/net/ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderSelectionPage.html trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaLoadZipFilePage.html trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaSearchPage.html trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/UploadZipFilePage.html trunk/openutils-mgnlmedia/src/test/ trunk/openutils-mgnlmedia/src/test/java/ trunk/openutils-mgnlmedia/src/test/resources/ Property changes on: trunk/openutils-mgnlmedia ___________________________________________________________________ Added: svn:ignore + .settings .checkstyle .classpath .project target Added: trunk/openutils-mgnlmedia/pom.xml =================================================================== --- trunk/openutils-mgnlmedia/pom.xml (rev 0) +++ trunk/openutils-mgnlmedia/pom.xml 2008-11-10 15:40:59 UTC (rev 926) @@ -0,0 +1,72 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils</artifactId> + <version>10</version> + <relativePath>..</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <packaging>jar</packaging> + <artifactId>openutils-mgnlmedia</artifactId> + <name>openutils-mgnlmedia</name> + <version>1.0-SNAPSHOT</version> + <licenses> + <license> + <name>GPLv3</name> + <url>http://www.gnu.org/licenses/gpl-3.0.txt</url> + </license> + </licenses> + <build> + <resources> + <resource> + <filtering>false</filtering> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + <resource> + <filtering>true</filtering> + <directory>src/main/resources</directory> + <includes> + <include>META-INF/magnolia/*</include> + </includes> + </resource> + </resources> + </build> + <dependencies> + <dependency> + <groupId>info.magnolia</groupId> + <artifactId>magnolia-core</artifactId> + <version>3.6.3</version> + </dependency> + <dependency> + <groupId>info.magnolia</groupId> + <artifactId>magnolia-module-admininterface</artifactId> + <version>3.6.3</version> + </dependency> + <dependency> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils-mgnltasks</artifactId> + <version>3.5.5</version> + </dependency> + <dependency> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils-mgnlext</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + <version>5.1</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> +</project> \ No newline at end of file Property changes on: trunk/openutils-mgnlmedia/pom.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/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java (rev 0) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java 2008-11-10 15:40:59 UTC (rev 926) @@ -0,0 +1,172 @@ +/** + * 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.commands; + +import info.magnolia.cms.core.Content; +import info.magnolia.cms.core.ItemType; +import info.magnolia.cms.exchange.ExchangeException; +import info.magnolia.cms.i18n.MessagesManager; +import info.magnolia.cms.util.AlertUtil; +import info.magnolia.cms.util.ExclusiveWrite; +import info.magnolia.context.Context; +import info.magnolia.module.admininterface.commands.ActivationCommand; + +import java.util.Iterator; +import java.util.List; + +import javax.jcr.RepositoryException; + +import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager; + +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * @author molaschi + * @version $Id$ + */ +public class MediaActivationCommand extends ActivationCommand +{ + + /** + * Logger. + */ + private Logger log = LoggerFactory.getLogger(MediaActivationCommand.class); + + /** + * {@inheritDoc} + */ + @Override + public boolean execute(Context ctx) + { + synchronized (ExclusiveWrite.getInstance()) + { + try + { + Content thisState = getNode(ctx); + String parentPath = StringUtils.substringBeforeLast(thisState.getHandle(), "/"); + if (StringUtils.isEmpty(parentPath)) + { + parentPath = "/"; + } + // make multiple activations instead of a big bulp + if (super.isRecursive()) + { + List versionMap = getVersionMap(); + if (versionMap == null) + { + activateRecursive(parentPath, thisState, ctx); + } + else + { + activateRecursive(ctx, versionMap); + } + } + else + { + if (StringUtils.isNotEmpty(getVersion())) + { + try + { + thisState = thisState.getVersionedContent(getVersion()); + } + catch (RepositoryException re) + { + log.error("Failed to get version " + getVersion() + " for " + thisState.getHandle(), re); + } + } + activateRecursiveOneLevel(parentPath, thisState); + } + } + catch (Exception e) + { + log.error("can't activate", e); + AlertUtil.setException(MessagesManager.get("tree.error.activate"), e, ctx); + return false; + } + log.info("exec successfully."); + return true; + } + } + + public void activateRecursiveOneLevel(String parentPath, Content node) throws RepositoryException, + ExchangeException + { + getSyndicator().activate(parentPath, node, getOrderingInfo(node)); + + Iterator children = node.getChildren(new Content.ContentFilter() + { + + public boolean accept(Content content) + { + try + { + return !getRule().isAllowed(content.getNodeTypeName()) + && !ItemType.CONTENT.getSystemName().equals(content.getNodeTypeName()) + && !MediaConfigurationManager.RESOLUTIONS.getSystemName().equals(content.getNodeTypeName()); + } + catch (RepositoryException e) + { + log.error("can't get nodetype", e); + return false; + } + } + }).iterator(); + + while (children.hasNext()) + { + activateRecursiveOneLevel(node.getHandle(), (Content) children.next()); + } + } + + /** + * {@inheritDoc} + */ + @Override + protected void activateRecursive(String parentPath, Content node, Context ctx) throws ExchangeException, + RepositoryException + { + getSyndicator().activate(parentPath, node, getOrderingInfo(node)); + + Iterator children = node.getChildren(new Content.ContentFilter() + { + + public boolean accept(Content content) + { + try + { + return !getRule().isAllowed(content.getNodeTypeName()) + && !MediaConfigurationManager.RESOLUTIONS.getSystemName().equals(content.getNodeTypeName()); + } + catch (RepositoryException e) + { + log.error("can't get nodetype", e); + return false; + } + } + }).iterator(); + + while (children.hasNext()) + { + this.activateRecursive(node.getHandle(), ((Content) children.next()), ctx); + } + } + +} Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/commands/MediaActivationCommand.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java (rev 0) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2008-11-10 15:40:59 UTC (rev 926) @@ -0,0 +1,381 @@ +/** + * 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.configuration; + +import info.magnolia.cms.beans.config.ContentRepository; +import info.magnolia.cms.beans.config.ObservedManager; +import info.magnolia.cms.beans.config.URI2RepositoryManager; +import info.magnolia.cms.beans.config.URI2RepositoryMapping; +import info.magnolia.cms.core.Content; +import info.magnolia.cms.core.ItemType; +import info.magnolia.cms.core.search.Query; +import info.magnolia.cms.core.search.QueryManager; +import info.magnolia.cms.core.search.QueryResult; +import info.magnolia.cms.util.ContentUtil; +import info.magnolia.cms.util.FactoryUtil; +import info.magnolia.cms.util.NodeDataUtil; +import info.magnolia.context.MgnlContext; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import javax.jcr.RepositoryException; +import javax.jcr.query.InvalidQueryException; + +import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModuleLifecycle; +import net.sourceforge.openutils.mgnlmedia.media.pages.MediaFolderViewPage; +import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler; + +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * @author molaschi + */ +public class MediaConfigurationManager extends ObservedManager +{ + + private static final String MGNL_MEDIA_TYPE = "mgnl:media"; + + private static final String MGNL_RESOLUTION_TYPE = "mgnl:resolutions"; + + /** + * Folder type + */ + public static final ItemType FOLDER = ItemType.CONTENT; + + /** + * Media type + */ + public static final ItemType MEDIA = new ItemType(MGNL_MEDIA_TYPE); + + /** + * + */ + public static final ItemType RESOLUTIONS = new ItemType(MGNL_RESOLUTION_TYPE); + + private Logger log = LoggerFactory.getLogger(MediaConfigurationManager.class); + + private Map<String, MediaTypeConfiguration> types = new LinkedHashMap<String, MediaTypeConfiguration>(); + + /** + * {@inheritDoc} + */ + @Override + protected void onClear() + { + types.clear(); + } + + /** + * {@inheritDoc} + */ + @Override + @SuppressWarnings("unchecked") + protected void onRegister(Content node) + { + for (Iterator iter = ContentUtil.getAllChildren(node).iterator(); iter.hasNext();) + { + Content typeNode = (Content) iter.next(); + + try + { + MediaTypeConfiguration conf = new MediaTypeConfiguration(); + conf.setName(typeNode.getName()); + conf.setDialog(NodeDataUtil.getString(typeNode, "dialog")); + conf.setLabel(NodeDataUtil.getString(typeNode, "label")); + conf.setMenuIcon(NodeDataUtil.getString(typeNode, "menuIcon")); + String extensions = NodeDataUtil.getString(typeNode, "extensions"); + if (!StringUtils.isEmpty(extensions)) + { + conf.setExtensions(Arrays.asList(StringUtils.split(extensions, ","))); + } + else + { + conf.setExtensions(new ArrayList<String>()); + } + String classNameHandler = NodeDataUtil.getString(typeNode, "handler"); + Class classHandler = Class.forName(classNameHandler); + if (!MediaTypeHandler.class.isAssignableFrom(classHandler)) + { + log + .error( + "Error getting media type configuration for {}: handler class {} not implements MediaTypeHanlder", + typeNode.getHandle(), + classHandler); + continue; + } + conf.setHandler((MediaTypeHandler) classHandler.newInstance()); + conf.getHandler().init(typeNode); + + types.put(typeNode.getName(), conf); + } + catch (InstantiationException ex) + { + log.error("Error getting media type configuration for {}", typeNode.getHandle(), ex); + } + catch (IllegalAccessException ex) + { + log.error("Error getting media type configuration for {}", typeNode.getHandle(), ex); + } + catch (ClassNotFoundException ex) + { + log.error("Error getting media type configuration for {}", typeNode.getHandle(), ex); + } + catch (RuntimeException ex) + { + log.error("Error getting media type configuration for {}", typeNode.getHandle(), ex); + } + } + } + + public static MediaConfigurationManager getInstance() + { + return (MediaConfigurationManager) FactoryUtil.getSingleton(MediaConfigurationManager.class); + } + + public static MediaTypeConfiguration getMediaHandlerFromExtension(String extension) + { + for (Map.Entry<String, MediaTypeConfiguration> entry : MediaConfigurationManager + .getInstance() + .getTypes() + .entrySet()) + { + if (entry.getValue().getExtensions().contains(extension.toLowerCase())) + { + return entry.getValue(); + } + } + return null; + } + + public Map<String, MediaTypeConfiguration> getTypes() + { + return types; + } + + /** + * Get all media nodes in a folder + * @param folder folder + * @return all media nodes + */ + public Collection<Content> getMediaNodes(Content folder) + { + return getMediaNodes(folder, null, MediaFolderViewPage.SORT_BY_MODIFICATIONDATE); + } + + /** + * Get the list of web pages where a media is used + * @param uuid uuid of media + * @return list of web pages where a media is used + * @throws InvalidQueryException invalid query + * @throws RepositoryException repository exception + */ + @SuppressWarnings("unchecked") + public List<String> getUsedInWebPages(String uuid) throws InvalidQueryException, RepositoryException + { + List<String> handles = new ArrayList<String>(); + QueryManager qm = MgnlContext.getQueryManager(ContentRepository.WEBSITE); + + Query q = qm.createQuery("select * from nt:base where contains(., '" + uuid + "')", Query.SQL); + QueryResult qr = q.execute(); + Collection<Content> nodes = qr.getContent(ItemType.CONTENT.getSystemName()); + if (nodes != null) + { + for (Content c : nodes) + { + if (!handles.contains(c.getHandle())) + { + handles.add(c.getHandle()); + } + + } + } + return handles; + } + + /** + * Get all media nodes of passed type in a folder + * @param folder folder + * @param type media + * @param sorting sorting + * @return all media nodes of passed type + */ + @SuppressWarnings("unchecked") + public Collection<Content> getMediaNodes(final Content folder, final String type, final String sorting) + { + List<Content> medias = (List<Content>) folder.getChildren(new Content.ContentFilter() + { + + /** + * {@inheritDoc} + */ + @Override + public boolean accept(Content content) + { + try + { + return content.getItemType().equals(MEDIA) && NodeDataUtil.getString(content, "type").equals(type); + } + catch (RepositoryException e) + { + log.error("Error getting item type on node {} module media", folder.getHandle(), e); + } + return false; + } + + }); + final MediaConfigurationManager mcm = this; + Collections.sort(medias, new Comparator<Content>() + { + + private Map<String, Integer> mapNpages = new HashMap<String, Integer>(); + + /** + * {@inheritDoc} + */ + @Override + public int compare(Content o1, Content o2) + { + if (sorting.equals(MediaFolderViewPage.SORT_BY_FILENAME)) + { + return o1.getName().compareTo(o2.getName()); + } + else if (sorting.equals(MediaFolderViewPage.SORT_BY_MODIFICATIONDATE)) + { + Calendar o1c = o1.getMetaData().getModificationDate() == null + ? o1.getMetaData().getCreationDate() + : o1.getMetaData().getModificationDate(); + Calendar o2c = o2.getMetaData().getModificationDate() == null + ? o2.getMetaData().getCreationDate() + : o2.getMetaData().getModificationDate(); + return o1c.compareTo(o2c); + } + else if (sorting.equals(MediaFolderViewPage.SORT_BY_USAGE)) + { + Integer nPages1 = mapNpages.get(o1.getHandle()); + Integer nPages2 = mapNpages.get(o1.getHandle()); + if (nPages1 == null) + { + try + { + nPages1 = mcm.getUsedInWebPages(o1.getUUID()).size(); + } + catch (InvalidQueryException e) + { + nPages1 = 0; + log.error("Exception getting web pages for media {}", o1.getHandle(), e); + } + catch (RepositoryException e) + { + nPages1 = 0; + log.error("Exception getting web pages for media {}", o1.getHandle(), e); + } + mapNpages.put(o1.getHandle(), nPages1); + } + if (nPages2 == null) + { + try + { + nPages2 = mcm.getUsedInWebPages(o2.getUUID()).size(); + } + catch (InvalidQueryException e) + { + nPages2 = 0; + log.error("Exception getting web pages for media {}", o2.getHandle(), e); + } + catch (RepositoryException e) + { + nPages2 = 0; + log.error("Exception getting web pages for media {}", o2.getHandle(), e); + } + mapNpages.put(o2.getHandle(), nPages2); + } + return nPages1.compareTo(nPages2); + } + else + { + try + { + return (o1.getIndex() >= o2.getIndex()) ? 1 : -1; + } + catch (RepositoryException e) + { + return 0; + } + } + } + + }); + + return medias; + } + + /** + * Get the type configuration for a media + * @param media media + * @return type configuration + */ + public MediaTypeConfiguration getMediaTypeConfigurationFromMedia(Content media) + { + try + { + if (!media.getItemType().equals(MEDIA)) + { + return null; + } + } + catch (RepositoryException e) + { + log.error("Error getting item type on node {} module media", media.getHandle(), e); + return null; + } + + return types.get(NodeDataUtil.getString(media, "type")); + } + + /** + * Get uri mapping for repo + * @return uri mapping for repo + */ + @SuppressWarnings("unchecked") + public String getURIMappingPrefix() + { + for (URI2RepositoryMapping mapping : (Collection<URI2RepositoryMapping>) URI2RepositoryManager + .getInstance() + .getMappings()) + { + if (mapping.getRepository().equals(MediaModuleLifecycle.REPO)) + { + return mapping.getURIPrefix(); + } + } + return StringUtils.EMPTY; + } +} Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java (rev 0) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java 2008-11-10 15:40:59 UTC (rev 926) @@ -0,0 +1,152 @@ +/** + * 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.configuration; + +import java.util.List; + +import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler; + + +/** + * @author molaschi + * @version $Id$ + */ +public class MediaTypeConfiguration +{ + + private String name; + + private String label; + + private String menuIcon; + + private String dialog; + + private MediaTypeHandler handler; + + private List<String> extensions; + + /** + * Returns the label. + * @return the label + */ + public String getLabel() + { + return label; + } + + /** + * Sets the label. + * @param label the label to set + */ + public void setLabel(String label) + { + this.label = label; + } + + /** + * Returns the handler. + * @return the handler + */ + public MediaTypeHandler getHandler() + { + return handler; + } + + /** + * Sets the handler. + * @param handler the handler to set + */ + public void setHandler(MediaTypeHandler handler) + { + this.handler = handler; + } + + /** + * Returns the menuIcon. + * @return the menuIcon + */ + public String getMenuIcon() + { + return menuIcon; + } + + /** + * Sets the menuIcon. + * @param menuIcon the menuIcon to set + */ + public void setMenuIcon(String menuIcon) + { + this.menuIcon = menuIcon; + } + + /** + * Returns the dialog. + * @return the dialog + */ + public String getDialog() + { + return dialog; + } + + /** + * Sets the dialog. + * @param dialog the dialog to set + */ + public void setDialog(String dialog) + { + this.dialog = dialog; + } + + /** + * Returns the name. + * @return the name + */ + public String getName() + { + return name; + } + + /** + * Sets the name. + * @param name the name to set + */ + public void setName(String name) + { + this.name = name; + } + + /** + * Returns the extensions. + * @return the extensions + */ + public List<String> getExtensions() + { + return extensions; + } + + /** + * Sets the extensions. + * @param extensions the extensions to set + */ + public void setExtensions(List<String> extensions) + { + this.extensions = extensions; + } + +} Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaTypeConfiguration.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java (rev 0) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java 2008-11-10 15:40:59 UTC (rev 926) @@ -0,0 +1,74 @@ +/** + * 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.core.Content; +import info.magnolia.cms.gui.dialog.DialogBox; + +import java.io.IOException; +import java.io.Writer; + +import javax.jcr.RepositoryException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + +/** + * @author molaschi + * @version $Id$ + */ +public class DialogCustomSaveHandler extends DialogBox +{ + + private Content configNode; + + /** + * {@inheritDoc} + */ + @Override + public void init(HttpServletRequest request, HttpServletResponse response, Content storageNode, Content configNode) + throws RepositoryException + { + this.configNode = configNode; + super.init(request, response, storageNode, configNode); + } + + /** + * {@inheritDoc} + */ + @Override + public void drawHtmlPost(Writer out) throws IOException + { + out.write(this.getHtmlDescription()); + + out.write("<input type=\"hidden\" name=\""); + out.write(this.getName()); + out.write("_saveHandler\" value=\""); + out.write("net.sourceforge.openutils.mgnlmedia.media.save.MediaCustomSaveHandler"); + out.write("\" />"); + + out.write("<input type=\"hidden\" name=\""); + out.write(this.getName()); + out.write("_configNode\" value=\""); + out.write(configNode.getHandle()); + out.write("\" />"); + + out.write("</td></tr>\n"); //$NON-NLS-1$ + } + +} Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogCustomSaveHandler.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java (rev 0) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java 2008-11-10 15:40:59 UTC (rev 926) @@ -0,0 +1,194 @@ +/** + * 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.beans.config.MIMEMapping; +import info.magnolia.cms.gui.control.File; +import info.magnolia.cms.gui.dialog.DialogFile; +import info.magnolia.cms.gui.misc.CssConstants; +import info.magnolia.cms.gui.misc.Spacer; + +import java.io.IOException; +import java.io.Writer; + +import javax.jcr.PropertyType; + +import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager; + + +/** + * @author molaschi + * @version Id: + */ +public class DialogFileAudio extends DialogFile +{ + + /** + * {@inheritDoc} + */ + @SuppressWarnings("unchecked") + @Override + public void initImageExtensions() + { + this.getImageExtensions().add("mp3"); + } + + /** + * {@inheritDoc} + */ + @Override + public void drawHtml(Writer out) throws IOException + { + File control = getFileControl(); + control.setType(this.getConfigValue("type", PropertyType.TYPENAME_STRING)); //$NON-NLS-1$ + control.setSaveInfo(false); // set manualy below + control.setCssClass(CssConstants.CSSCLASS_FILE); + control.setCssClassFileName(CssConstants.CSSCLASS_EDIT); + control.setCssStyles("width", this.getConfigValue("width", "100%")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + this.drawHtmlPre(out); + + String width = this.getConfigValue("width", "100%"); //$NON-NLS-1$ //$NON-NLS-2$ + + final boolean preview = Boolean.valueOf(getConfigValue("preview", "true")).booleanValue(); + final boolean extensionIsDisplayableImage = this.getImageExtensions().contains( + control.getExtension().toLowerCase()); + final boolean showImage = extensionIsDisplayableImage && preview; + + String htmlControlBrowse = control.getHtmlBrowse(); + StringBuffer htmlControlFileName = new StringBuffer(); + htmlControlFileName.append("<span class=\"" //$NON-NLS-1$ + + CssConstants.CSSCLASS_DESCRIPTION + + "\">" //$NON-NLS-1$ + + getMessage("dialog.file.filename") //$NON-NLS-1$ + + "</span>"); //$NON-NLS-1$ + htmlControlFileName.append(Spacer.getHtml(1, 1)); + htmlControlFileName.append(control.getHtmlFileName() + "<span id=\"" //$NON-NLS-1$ + + this.getName() + + "_fileNameExtension\">." //$NON-NLS-1$ + + control.getExtension() + + "</span>"); //$NON-NLS-1$ + String htmlContentEmpty = htmlControlBrowse + Spacer.getHtml(0, 0) + htmlControlFileName; + out.write("<div id=\"" + this.getName() + "_contentDiv\" style=\"width:100%;\">"); //$NON-NLS-1$ //$NON-NLS-2$ + boolean exists = false; + + if (this.getStorageNode() != null) + { + exists = this.getStorageNode().getNodeData(this.getName()).isExist(); + } + + if (!exists) + { + out.write(htmlContentEmpty); + out.write("</div>"); //$NON-NLS-1$ + } + else + { + if (showImage) + { + + out.write("\n<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"" + width + "\">"); //$NON-NLS-1$ //$NON-NLS-2$ + out.write("<tr><td class=\"" + CssConstants.CSSCLASS_FILEIMAGE + "\">"); //$NON-NLS-1$ //$NON-NLS-2$ + + out.write("\n<div id=\"container"); + out.write(this.getName()); + out + .write("\"><a href=\"http://www.macromedia.com/go/getflashplayer\">Get the Flash Player</a> to see this player.</div>"); + + out.write("<script type=\"text/javascript\" src=\""); + out.write(this.getRequest().getContextPath()); + out.write("/.resources/media/js/swfobject.js\"></script>"); + out.write("\n<script type=\"text/javascript\" src=\""); + out.write(this.getRequest().getContextPath()); + out.write("/.resources/media/js/swfobject.js\"></script>"); + + out.write("\n<script type=\"text/javascript\">"); + out.write("\nvar s1 = new SWFObject(\""); + out.write(this.getRequest().getContextPath()); + out.write("/.resources/media/players/player.swf\",\"ply\",\"320\",\"20\",\"9\",\"#FFFFFF\");"); + out.write("\ns1.addParam(\"flashvars\",\"file="); + out.write(this.getRequest().getContextPath()); + out.write(MediaConfigurationManager.getInstance().getURIMappingPrefix()); + out.write(getFileURI(control)); + out.write("/"); + out.write(control.getFileName()); + out.write(".mp3"); + out.write("\");"); + out.write("\ns1.write(\"container"); + out.write(this.getName()); + + out.write("\");\n</script>"); + + /* + * // flash movie out.write("<object type=\"application/x-shockwave-flash\" data=\""); + * out.write(this.getRequest().getContextPath()); out.write("/.resources/media/players/player.swf"); + * out.write("\" title=\""); out.write(control.getFileName()); out.write("\" "); + * out.write("width=\"320\" "); out.write("height=\"30\" "); out.write(">"); out.write("<param + * name=\"movie\" value=\""); out.write(this.getRequest().getContextPath()); + * out.write("/.resources/media/players/player.swf"); out.write("\"/>"); out.write("<param + * name=\"flashvars\" value=\"file="); out.write(this.getRequest().getContextPath()); + * out.write(getFileURI(control)); out.write("\"/>"); out.write("</object>\n"); + */ + out.write("</td></tr><tr><td>"); //$NON-NLS-1$ + + } + out.write(htmlControlFileName.toString()); + if (!showImage) + { + String iconPath = MIMEMapping.getMIMETypeIcon(control.getExtension()); + + out.write(Spacer.getHtml(0, 0)); + out.write("<a href=" + this.getRequest().getContextPath() + control.getPath() + " target=\"_blank\">"); //$NON-NLS-1$ //$NON-NLS-2$ + out.write("<img src=\"" //$NON-NLS-1$ + + this.getRequest().getContextPath() + + iconPath + + "\" class=\"" //$NON-NLS-1$ + + CssConstants.CSSCLASS_FILEICON + + "\" border=\"0\">"); //$NON-NLS-1$ + out.write(control.getFileName() + "." + control.getExtension() + "</a>"); //$NON-NLS-1$ //$NON-NLS-2$ + } + out.write(Spacer.getHtml(12, 12)); + out.write(control.getHtmlRemove("mgnlDialogFileRemove('" + this.getName() + "');")); //$NON-NLS-1$ //$NON-NLS-2$ + if (showImage) + { + out.write("</td></tr></table>"); //$NON-NLS-1$ + } + out.write("</div>\n"); //$NON-NLS-1$ + out.write("<div style=\"position:absolute;top:-500px;left:-500px;visibility:hidden;\">\n<textarea id=\""); //$NON-NLS-1$ + out.write(this.getName()); + out.write("_contentEmpty\">");//$NON-NLS-1$ + out.write(htmlContentEmpty); + + // @todo should be escaped, but we need to test it + // out.write(StringEscapeUtils.escapeXml(htmlContentEmpty)); + out.write("</textarea>\n</div>\n"); //$NON-NLS-1$ + } + control.setSaveInfo(true); + out.write(control.getHtmlSaveInfo()); + control.setNodeDataTemplate(this.getConfigValue("nodeDataTemplate", null)); //$NON-NLS-1$ + out.write(control.getHtmlNodeDataTemplate()); + this.drawHtmlPost(out); + } + + private String getPreviewUrl() + { + return MediaConfigurationManager.getInstance().getURIMappingPrefix() + + this.getStorageNode().getHandle() + + "/resolutions/thumbnail/data.jpg"; + } +} Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileAudio.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java (rev 0) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java 2008-11-10 15:40:59 UTC (rev 926) @@ -0,0 +1,240 @@ +/** + * 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.beans.config.MIMEMapping; +import info.magnolia.cms.gui.control.File; +import info.magnolia.cms.gui.dialog.DialogFile; +import info.magnolia.cms.gui.misc.CssConstants; +import info.magnolia.cms.gui.misc.Spacer; + +import java.io.IOException; +import java.io.Writer; + +import javax.jcr.PropertyType; + +import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager; + +import org.apache.commons.lang.StringUtils; + + +/** + * @author molaschi + * @version Id: + */ +public class DialogFileImage extends DialogFile +{ + + /** + * {@inheritDoc} + */ + @SuppressWarnings("unchecked") + @Override + public void initImageExtensions() + { + this.getImageExtensions().add("jpg"); + this.getImageExtensions().add("jpeg"); + this.getImageExtensions().add("gif"); + this.getImageExtensions().add("png"); + this.getImageExtensions().add("bmp"); + } + + /** + * {@inheritDoc} + */ + @Override + public void drawHtml(Writer out) throws IOException + { + File control = getFileControl(); + control.setType(this.getConfigValue("type", PropertyType.TYPENAME_STRING)); + control.setSaveInfo(false); // set manualy below + control.setCssClass(CssConstants.CSSCLASS_FILE); + control.setCssClassFileName(CssConstants.CSSCLASS_EDIT); + control.setCssStyles("width", this.getConfigValue("width", "100%")); //$NON-NLS-3$ + + this.drawHtmlPre(out); + + String width = this.getConfigValue("width", "100%"); + + final boolea... [truncated message content] |
From: <fg...@us...> - 2008-11-10 15:26:54
|
Revision: 925 http://openutils.svn.sourceforge.net/openutils/?rev=925&view=rev Author: fgiust Date: 2008-11-10 15:26:41 +0000 (Mon, 10 Nov 2008) Log Message: ----------- shell access changed again in sourceforge (manual steps needed for a release... if needed: ask!) Modified Paths: -------------- trunk/openutils-backup/pom.xml trunk/openutils-bshd5/pom.xml trunk/openutils-configuration-dataobjects/pom.xml trunk/openutils-configuration-services/pom.xml trunk/openutils-dbmigration/pom.xml trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java trunk/openutils-deployment/pom.xml trunk/openutils-hibernate-security/pom.xml trunk/openutils-log4j/pom.xml trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java trunk/openutils-maven-skin/pom.xml trunk/openutils-mgnlbootstrapsync/pom.xml trunk/openutils-mgnlcontrols/pom.xml trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java trunk/openutils-mgnlext/pom.xml trunk/openutils-mgnlspring/pom.xml trunk/openutils-mgnlstripes/pom.xml trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java trunk/openutils-mgnltasks/pom.xml trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckMissingParagraphsTask.java trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckMissingTemplatesTask.java trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalBootstrapResource.java trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/NodeSortTask.java trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java trunk/openutils-spring/pom.xml trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java trunk/openutils-spring-remote-callback/pom.xml trunk/openutils-spring-rmibernate/pom.xml trunk/openutils-tags-spring/pom.xml trunk/openutils-testing/pom.xml trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitConfiguration.java trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java trunk/openutils-testing/src/main/java/it/openutils/testing/TestUtils.java trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/CleanInsertOperation.java trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityCleanInsertOperation.java trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityInsertOperation.java trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlAbstractNoFkOperation.java trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkCleanInsertOperation.java trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkInsertOperation.java trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkTruncateOperation.java trunk/openutils-testing/src/test/java/it/openutils/testing/RegExpTableFilterTest.java trunk/openutils-testing-junit/pom.xml trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/MultipleDatasourceDbUnitTest.java trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/SingleDatasourceDbUnitTest.java trunk/openutils-testing-testng/pom.xml trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java trunk/openutils-testing4dwr/pom.xml trunk/openutils-testing4dwr-junit/pom.xml trunk/openutils-testing4dwr-testng/pom.xml trunk/openutils-testing4web/pom.xml trunk/openutils-usermanagement/pom.xml trunk/openutils-usermanagement-dataobjects/pom.xml trunk/openutils-web/pom.xml trunk/pom.xml Removed Paths: ------------- trunk/openutils-parent/ Modified: trunk/openutils-backup/pom.xml =================================================================== --- trunk/openutils-backup/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-backup/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-backup</artifactId> Modified: trunk/openutils-bshd5/pom.xml =================================================================== --- trunk/openutils-bshd5/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-bshd5/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-bshd5</artifactId> Modified: trunk/openutils-configuration-dataobjects/pom.xml =================================================================== --- trunk/openutils-configuration-dataobjects/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-configuration-dataobjects/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <groupId>net.sourceforge.openutils</groupId> Modified: trunk/openutils-configuration-services/pom.xml =================================================================== --- trunk/openutils-configuration-services/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-configuration-services/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <groupId>net.sourceforge.openutils</groupId> Modified: trunk/openutils-dbmigration/pom.xml =================================================================== --- trunk/openutils-dbmigration/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-dbmigration/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-dbmigration</artifactId> Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java =================================================================== --- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcIfColumnExistsConditionalTask.java 2008-11-10 15:26:41 UTC (rev 925) @@ -31,7 +31,7 @@ /** * Task that executes if a given column exists. * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class JdbcIfColumnExistsConditionalTask extends BaseConditionalTask { Modified: trunk/openutils-deployment/pom.xml =================================================================== --- trunk/openutils-deployment/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-deployment/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-deployment</artifactId> Modified: trunk/openutils-hibernate-security/pom.xml =================================================================== --- trunk/openutils-hibernate-security/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-hibernate-security/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -2,7 +2,7 @@ <parent> <artifactId>openutils</artifactId> <groupId>net.sourceforge.openutils</groupId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/openutils-log4j/pom.xml =================================================================== --- trunk/openutils-log4j/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-log4j/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-log4j</artifactId> Modified: trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java =================================================================== --- trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java 2008-11-10 15:26:41 UTC (rev 925) @@ -36,7 +36,7 @@ * <code>archive</code> <strong>Note that since DailyRollingFileAppender is not easily extendible, this class is * actually a copy and paste of all the code with slights modifications...</strong> * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class EnhancedDailyRollingFileAppender extends FileAppender { Modified: trunk/openutils-maven-skin/pom.xml =================================================================== --- trunk/openutils-maven-skin/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-maven-skin/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-maven-skin</artifactId> Modified: trunk/openutils-mgnlbootstrapsync/pom.xml =================================================================== --- trunk/openutils-mgnlbootstrapsync/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnlbootstrapsync/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/openutils-mgnlcontrols/pom.xml =================================================================== --- trunk/openutils-mgnlcontrols/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnlcontrols/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -2,7 +2,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java =================================================================== --- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java 2008-11-10 15:26:41 UTC (rev 925) @@ -53,7 +53,7 @@ /** * similar to DialogFreemarker but with a fixed template, needed till MAGNOLIA-2175 is done * @author fgiust - * @version $Id: $ + * @version $Id$ */ public abstract class ConfigurableFreemarkerDialog extends DialogBox { Modified: trunk/openutils-mgnlext/pom.xml =================================================================== --- trunk/openutils-mgnlext/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnlext/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -2,7 +2,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/openutils-mgnlspring/pom.xml =================================================================== --- trunk/openutils-mgnlspring/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnlspring/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/openutils-mgnlstripes/pom.xml =================================================================== --- trunk/openutils-mgnlstripes/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnlstripes/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java =================================================================== --- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java 2008-11-10 15:26:41 UTC (rev 925) @@ -43,7 +43,7 @@ /** * An implementation of MultipartWrapper that delegates to the standard magnolia multipart form handling. * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class MagnoliaMultipartWrapper implements MultipartWrapper { Modified: trunk/openutils-mgnltasks/pom.xml =================================================================== --- trunk/openutils-mgnltasks/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnltasks/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java =================================================================== --- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java 2008-11-10 15:26:41 UTC (rev 925) @@ -36,7 +36,7 @@ /** * Sets or add permissions on a repository:path for a given role. * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class AddPermissionTask extends AbstractRepositoryTask implements Task { Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java =================================================================== --- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2008-11-10 15:26:41 UTC (rev 925) @@ -41,7 +41,7 @@ * An abstract task that check for invalid templates/paragraphs. Should not be used directly, see * {@link CheckMissingTemplatesTask} and {@link CheckMissingParagraphsTask} instead. * @author fgiust - * @version $Id: $ + * @version $Id$ */ public abstract class BaseCheckMissingTask extends AbstractRepositoryTask { Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java =================================================================== --- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java 2008-11-10 15:26:41 UTC (rev 925) @@ -37,7 +37,7 @@ * A task that changes the password of an user if the current password is the default one. Useful to forbide * superuser/superuser accounts on a live instance ;) * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class ChangeDefaultPasswordTask extends AbstractRepositoryTask implements Task { Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java =================================================================== --- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java 2008-11-10 15:26:41 UTC (rev 925) @@ -32,7 +32,7 @@ /** * Creates a user if not already existing. * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class CheckAndCreateUserTask extends AbstractRepositoryTask implements Task { Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckMissingParagraphsTask.java =================================================================== --- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckMissingParagraphsTask.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckMissingParagraphsTask.java 2008-11-10 15:26:41 UTC (rev 925) @@ -22,7 +22,7 @@ * Please note that this task collect the paragraph list extracting any direct subnode of the "paragraphs" nodes in each * installed module, and not using ParagraphManager (not yet initialized at startup). * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class CheckMissingParagraphsTask extends BaseCheckMissingTask { Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckMissingTemplatesTask.java =================================================================== --- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckMissingTemplatesTask.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckMissingTemplatesTask.java 2008-11-10 15:26:41 UTC (rev 925) @@ -22,7 +22,7 @@ * Please note that this task collect the template list extracting any direct subnode of the "templates" nodes in each * installed module, and not using TemplateManager (not yet initialized at startup). * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class CheckMissingTemplatesTask extends BaseCheckMissingTask { Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalBootstrapResource.java =================================================================== --- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalBootstrapResource.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ConditionalBootstrapResource.java 2008-11-10 15:26:41 UTC (rev 925) @@ -27,7 +27,7 @@ /** * A base abstract class for tasks that bootstrap a resource based on a condition. * @author fgiust - * @version $Id: $ + * @version $Id$ */ public abstract class ConditionalBootstrapResource extends BootstrapSingleResource { Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java =================================================================== --- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java 2008-11-10 15:26:41 UTC (rev 925) @@ -38,7 +38,7 @@ * Adds a default repository permissions for all the configured users, only if there is no acl set for the given * repository. * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class CreateDefaultRepositoryAclForAllUsersTask extends AbstractRepositoryTask { Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java =================================================================== --- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java 2008-11-10 15:26:41 UTC (rev 925) @@ -28,7 +28,7 @@ /** * Deletes a node (if existing). * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class DeleteNodeTask extends AbstractRepositoryTask { Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java =================================================================== --- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java 2008-11-10 15:26:41 UTC (rev 925) @@ -34,7 +34,7 @@ /** * Disable any configured subscriber. * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class DisableSubscribersTask extends AbstractRepositoryTask { Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java =================================================================== --- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java 2008-11-10 15:26:41 UTC (rev 925) @@ -36,7 +36,7 @@ * A task to bootstrap a module. Can be used to fully re-bootstrap a custom module after an update (useful to reload * templates, dialogs, etc). This task will always ignore bootstrap files for the <code>website</code> repository. * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class ModuleConfigBootstrapTask extends BootstrapResourcesTask { Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/NodeSortTask.java =================================================================== --- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/NodeSortTask.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/NodeSortTask.java 2008-11-10 15:26:41 UTC (rev 925) @@ -35,7 +35,7 @@ /** * Sorts a list of nodes alphabetically. * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class NodeSortTask extends AbstractRepositoryTask { Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java =================================================================== --- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java 2008-11-10 15:26:41 UTC (rev 925) @@ -34,7 +34,7 @@ /** * A task that replace any occurrence of a given template with another at startup (handy for renamed templates). * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class ReplaceTemplateTask extends AbstractRepositoryTask { Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java =================================================================== --- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java 2008-11-10 15:26:41 UTC (rev 925) @@ -36,7 +36,7 @@ * A base module version handler that re-bootstrap its configuration each time the version number changes. Can be used * as is or subclassed (usually overriding getStartupTasks() for configuration tweacks). * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class SimpleModuleVersionHandler extends DefaultModuleVersionHandler { Modified: trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java =================================================================== --- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java 2008-11-10 15:26:41 UTC (rev 925) @@ -32,7 +32,7 @@ /** * A task that updates the current version of a module stored in the config repository. * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class UpdateModuleVersionTask extends AbstractRepositoryTask { Modified: trunk/openutils-spring/pom.xml =================================================================== --- trunk/openutils-spring/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-spring/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-spring</artifactId> Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java =================================================================== --- trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java 2008-11-10 15:26:41 UTC (rev 925) @@ -17,7 +17,7 @@ /** * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class FileMessageStore implements MessageStore { Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java =================================================================== --- trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java 2008-11-10 15:26:41 UTC (rev 925) @@ -5,7 +5,7 @@ /** * @author fgiust - * @version $Id: $ + * @version $Id$ */ public interface MessageStore { Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java =================================================================== --- trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java 2008-11-10 15:26:41 UTC (rev 925) @@ -22,7 +22,7 @@ /** * @author fgiust - * @version $Id: $ + * @version $Id$ */ public interface TemplatedMailSender { Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java =================================================================== --- trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java 2008-11-10 15:26:41 UTC (rev 925) @@ -42,7 +42,7 @@ /** * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class TemplatedMailSenderImpl implements TemplatedMailSender { Modified: trunk/openutils-spring-remote-callback/pom.xml =================================================================== --- trunk/openutils-spring-remote-callback/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-spring-remote-callback/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -3,7 +3,7 @@ <parent> <artifactId>openutils</artifactId> <groupId>net.sourceforge.openutils</groupId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/openutils-spring-rmibernate/pom.xml =================================================================== --- trunk/openutils-spring-rmibernate/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-spring-rmibernate/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-spring-rmibernate</artifactId> Modified: trunk/openutils-tags-spring/pom.xml =================================================================== --- trunk/openutils-tags-spring/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-tags-spring/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-tags-spring</artifactId> Modified: trunk/openutils-testing/pom.xml =================================================================== --- trunk/openutils-testing/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-testing</artifactId> Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitConfiguration.java =================================================================== --- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitConfiguration.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitConfiguration.java 2008-11-10 15:26:41 UTC (rev 925) @@ -26,7 +26,7 @@ /** * A DbUnitConfiguration can contain one or more {@link DbUnitExecution}. * @author fgiust - * @version $Id: $ + * @version $Id$ */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java =================================================================== --- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java 2008-11-10 15:26:41 UTC (rev 925) @@ -37,7 +37,7 @@ /** * @author fgiust - * @version $Id: $ + * @version $Id$ */ public final class DbUnitUtils { Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java =================================================================== --- trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing/src/main/java/it/openutils/testing/RegExpTableFilter.java 2008-11-10 15:26:41 UTC (rev 925) @@ -24,7 +24,7 @@ /** * A table filter that excludes tables mathing the given regexp. * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class RegExpTableFilter extends AbstractTableFilter { Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/TestUtils.java =================================================================== --- trunk/openutils-testing/src/main/java/it/openutils/testing/TestUtils.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing/src/main/java/it/openutils/testing/TestUtils.java 2008-11-10 15:26:41 UTC (rev 925) @@ -23,7 +23,7 @@ /** * @author fgiust - * @version $Id: $ + * @version $Id$ */ public final class TestUtils { Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/CleanInsertOperation.java =================================================================== --- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/CleanInsertOperation.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/CleanInsertOperation.java 2008-11-10 15:26:41 UTC (rev 925) @@ -23,7 +23,7 @@ * Mimics the standard <code>DatabaseOperation.CLEAN_INSERT</code> operation with an empty constructor (can be used in * annotations). * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class CleanInsertOperation extends CompositeOperation { Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityCleanInsertOperation.java =================================================================== --- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityCleanInsertOperation.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityCleanInsertOperation.java 2008-11-10 15:26:41 UTC (rev 925) @@ -24,7 +24,7 @@ * annotation. Wraps a <code>DatabaseOperation.CLEAN_INSERT</code> operation. * @see org.dbunit.ext.mssql.InsertIdentityOperation * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class MsSqlIndentityCleanInsertOperation extends InsertIdentityOperation { Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityInsertOperation.java =================================================================== --- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityInsertOperation.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityInsertOperation.java 2008-11-10 15:26:41 UTC (rev 925) @@ -24,7 +24,7 @@ * annotation. Wraps a <code>DatabaseOperation.INSERT</code> operation. * @see org.dbunit.ext.mssql.InsertIdentityOperation * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class MsSqlIndentityInsertOperation extends InsertIdentityOperation { Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlAbstractNoFkOperation.java =================================================================== --- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlAbstractNoFkOperation.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlAbstractNoFkOperation.java 2008-11-10 15:26:41 UTC (rev 925) @@ -30,7 +30,7 @@ /** * Extended operation for dbunit that disables FK checks. * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class MySqlAbstractNoFkOperation extends AbstractOperation { Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkCleanInsertOperation.java =================================================================== --- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkCleanInsertOperation.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkCleanInsertOperation.java 2008-11-10 15:26:41 UTC (rev 925) @@ -21,7 +21,7 @@ /** * Extended operation for dbunit that disables FK checks. * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class MySqlNoFkCleanInsertOperation extends MySqlAbstractNoFkOperation { Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkInsertOperation.java =================================================================== --- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkInsertOperation.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkInsertOperation.java 2008-11-10 15:26:41 UTC (rev 925) @@ -21,7 +21,7 @@ /** * Extended operation for dbunit that disables FK checks. * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class MySqlNoFkInsertOperation extends MySqlAbstractNoFkOperation { Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkTruncateOperation.java =================================================================== --- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkTruncateOperation.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkTruncateOperation.java 2008-11-10 15:26:41 UTC (rev 925) @@ -21,7 +21,7 @@ /** * Extended operation for dbunit that disables FK checks. * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class MySqlNoFkTruncateOperation extends MySqlAbstractNoFkOperation { Modified: trunk/openutils-testing/src/test/java/it/openutils/testing/RegExpTableFilterTest.java =================================================================== --- trunk/openutils-testing/src/test/java/it/openutils/testing/RegExpTableFilterTest.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing/src/test/java/it/openutils/testing/RegExpTableFilterTest.java 2008-11-10 15:26:41 UTC (rev 925) @@ -6,7 +6,7 @@ /** * @author fgiust - * @version $Id: $ + * @version $Id$ */ @DbUnitExecution public class RegExpTableFilterTest Modified: trunk/openutils-testing-junit/pom.xml =================================================================== --- trunk/openutils-testing-junit/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing-junit/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-testing-junit</artifactId> Modified: trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java =================================================================== --- trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing-junit/src/main/java/it/openutils/testing/junit/AbstractDbUnitJunitSpringContextTests.java 2008-11-10 15:26:41 UTC (rev 925) @@ -25,7 +25,7 @@ /** * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class AbstractDbUnitJunitSpringContextTests extends AbstractJUnit4SpringContextTests { Modified: trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/MultipleDatasourceDbUnitTest.java =================================================================== --- trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/MultipleDatasourceDbUnitTest.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/MultipleDatasourceDbUnitTest.java 2008-11-10 15:26:41 UTC (rev 925) @@ -24,7 +24,7 @@ /** * @author fgiust - * @version $Id: $ + * @version $Id$ */ @ContextConfiguration(locations = {"/spring-tests.xml" }) @DbUnitConfiguration(dbUnitExecutions = { Modified: trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/SingleDatasourceDbUnitTest.java =================================================================== --- trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/SingleDatasourceDbUnitTest.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/SingleDatasourceDbUnitTest.java 2008-11-10 15:26:41 UTC (rev 925) @@ -28,7 +28,7 @@ /** * @author fgiust - * @version $Id: $ + * @version $Id$ */ @ContextConfiguration(locations = {"/spring-tests.xml" }) @DbUnitExecution(datasets = {"/db1-load.xml" }, dataSource = "dataSource1", insertOperation = InsertOperation.class) Modified: trunk/openutils-testing-testng/pom.xml =================================================================== --- trunk/openutils-testing-testng/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing-testng/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-testing-testng</artifactId> Modified: trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java =================================================================== --- trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing-testng/src/main/java/it/openutils/testing/testng/AbstractDbUnitTestNGSpringContextTests.java 2008-11-10 15:26:41 UTC (rev 925) @@ -25,7 +25,7 @@ /** * @author fgiust - * @version $Id: $ + * @version $Id$ */ public class AbstractDbUnitTestNGSpringContextTests extends AbstractTestNGSpringContextTests { Modified: trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java =================================================================== --- trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/MultipleDatasourceDbUnitTest.java 2008-11-10 15:26:41 UTC (rev 925) @@ -24,7 +24,7 @@ /** * @author fgiust - * @version $Id: $ + * @version $Id$ */ @ContextConfiguration(locations = {"/spring-tests.xml" }) @DbUnitConfiguration(dbUnitExecutions = { Modified: trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java =================================================================== --- trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing-testng/src/test/java/it/openutils/testing/testng/SingleDatasourceDbUnitTest.java 2008-11-10 15:26:41 UTC (rev 925) @@ -28,7 +28,7 @@ /** * @author fgiust - * @version $Id: $ + * @version $Id$ */ @ContextConfiguration(locations = {"/spring-tests.xml" }) @DbUnitExecution(datasets = {"/db1-load.xml" }, dataSource = "dataSource1", insertOperation = InsertOperation.class) Modified: trunk/openutils-testing4dwr/pom.xml =================================================================== --- trunk/openutils-testing4dwr/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing4dwr/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-testing4dwr</artifactId> Modified: trunk/openutils-testing4dwr-junit/pom.xml =================================================================== --- trunk/openutils-testing4dwr-junit/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing4dwr-junit/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-testing4dwr-junit</artifactId> Modified: trunk/openutils-testing4dwr-testng/pom.xml =================================================================== --- trunk/openutils-testing4dwr-testng/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing4dwr-testng/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-testing4dwr-testng</artifactId> Modified: trunk/openutils-testing4web/pom.xml =================================================================== --- trunk/openutils-testing4web/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-testing4web/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>7</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-testing4web</artifactId> Modified: trunk/openutils-usermanagement/pom.xml =================================================================== --- trunk/openutils-usermanagement/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-usermanagement/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <groupId>net.sourceforge.openutils</groupId> Modified: trunk/openutils-usermanagement-dataobjects/pom.xml =================================================================== --- trunk/openutils-usermanagement-dataobjects/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-usermanagement-dataobjects/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <groupId>net.sourceforge.openutils</groupId> Modified: trunk/openutils-web/pom.xml =================================================================== --- trunk/openutils-web/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/openutils-web/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>9</version> + <version>10</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-11-02 15:37:36 UTC (rev 924) +++ trunk/pom.xml 2008-11-10 15:26:41 UTC (rev 925) @@ -5,7 +5,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> <packaging>pom</packaging> - <version>9</version> + <version>10</version> <name>openutils</name> <description>openutils parent POM</description> <url>http://openutils.sourceforge.net</url> @@ -91,7 +91,7 @@ <version>2.0-beta-7</version> <configuration> <stagingSiteURL> - scp://web.sourceforge.net/home/groups/o/op/openutils/htdocs/staging/${pom.artifactId}/ + scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/staging/${pom.artifactId}/ </stagingSiteURL> </configuration> </plugin> @@ -200,16 +200,16 @@ <site> <id>sourceforge</id> <name>sourceforge</name> - <url>scp://web.sourceforge.net/home/groups/o/op/openutils/htdocs/</url> + <url>scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/</url> </site> <downloadUrl>http://prdownloads.sourceforge.net/150467</downloadUrl> <repository> <id>openutils</id> - <url>scp://web.sourceforge.net/home/groups/o/op/openutils/htdocs/repository/releases</url> + <url>scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/repository/releases</url> </repository> <snapshotRepository> <id>openutils.snapshots</id> - <url>scp://web.sourceforge.net/home/groups/o/op/openutils/htdocs/repository/snapshots</url> + <url>scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/repository/snapshots</url> </snapshotRepository> </distributionManagement> <modules> @@ -237,10 +237,18 @@ <module>openutils-mgnlspring</module> <module>openutils-mgnlstripes</module> <module>openutils-mgnltasks</module> - <module>openutils-mgnlbootstrapsync</module> - <module>openutils-mgnlext</module> - <module>openutils-mgnlcontrols</module> + <module>openutils-mgnlbootstrapsync</module> + <module>openutils-mgnlext</module> + <module>openutils-mgnlcontrols</module> <module>openutils-spring-rmibernate</module> + <!-- + <module>openutils-elfunctions</module> + <module>openutils-mgnlmessages</module> + <module>openutils-mgnlrating</module> + <module>openutils-mgnlcas</module> + <module>openutils-mgnlgroovy</module> + <module>openutils-mgnlmedia</module> + --> <!-- <module>openutils-spring-remote-callback</module>--> </modules> <dependencyManagement> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-11-02 15:37:41
|
Revision: 924 http://openutils.svn.sourceforge.net/openutils/?rev=924&view=rev Author: fgiust Date: 2008-11-02 15:37:36 +0000 (Sun, 02 Nov 2008) Log Message: ----------- update distribution management due to sourceforge new policy on shell server usage Modified Paths: -------------- trunk/openutils-backup/pom.xml trunk/openutils-bshd5/pom.xml trunk/openutils-configuration-dataobjects/pom.xml trunk/openutils-configuration-services/pom.xml trunk/openutils-dbmigration/pom.xml trunk/openutils-deployment/pom.xml trunk/openutils-hibernate-security/pom.xml trunk/openutils-log4j/pom.xml trunk/openutils-maven-skin/pom.xml trunk/openutils-mgnlbootstrapsync/pom.xml trunk/openutils-mgnlcontrols/pom.xml trunk/openutils-mgnlext/pom.xml trunk/openutils-mgnlspring/pom.xml trunk/openutils-mgnlstripes/pom.xml trunk/openutils-mgnltasks/pom.xml trunk/openutils-spring/pom.xml trunk/openutils-spring-remote-callback/pom.xml trunk/openutils-spring-rmibernate/pom.xml trunk/openutils-tags-spring/pom.xml trunk/openutils-testing/pom.xml trunk/openutils-testing-junit/pom.xml trunk/openutils-testing-testng/pom.xml trunk/openutils-testing4dwr/pom.xml trunk/openutils-testing4dwr-junit/pom.xml trunk/openutils-testing4dwr-testng/pom.xml trunk/openutils-testing4web/pom.xml trunk/openutils-usermanagement/pom.xml trunk/openutils-usermanagement-dataobjects/pom.xml trunk/openutils-web/pom.xml trunk/pom.xml Modified: trunk/openutils-backup/pom.xml =================================================================== --- trunk/openutils-backup/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-backup/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-backup</artifactId> Modified: trunk/openutils-bshd5/pom.xml =================================================================== --- trunk/openutils-bshd5/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-bshd5/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-bshd5</artifactId> Modified: trunk/openutils-configuration-dataobjects/pom.xml =================================================================== --- trunk/openutils-configuration-dataobjects/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-configuration-dataobjects/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <groupId>net.sourceforge.openutils</groupId> Modified: trunk/openutils-configuration-services/pom.xml =================================================================== --- trunk/openutils-configuration-services/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-configuration-services/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <groupId>net.sourceforge.openutils</groupId> Modified: trunk/openutils-dbmigration/pom.xml =================================================================== --- trunk/openutils-dbmigration/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-dbmigration/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-dbmigration</artifactId> Modified: trunk/openutils-deployment/pom.xml =================================================================== --- trunk/openutils-deployment/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-deployment/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-deployment</artifactId> Modified: trunk/openutils-hibernate-security/pom.xml =================================================================== --- trunk/openutils-hibernate-security/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-hibernate-security/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -2,7 +2,7 @@ <parent> <artifactId>openutils</artifactId> <groupId>net.sourceforge.openutils</groupId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/openutils-log4j/pom.xml =================================================================== --- trunk/openutils-log4j/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-log4j/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-log4j</artifactId> Modified: trunk/openutils-maven-skin/pom.xml =================================================================== --- trunk/openutils-maven-skin/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-maven-skin/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-maven-skin</artifactId> Modified: trunk/openutils-mgnlbootstrapsync/pom.xml =================================================================== --- trunk/openutils-mgnlbootstrapsync/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-mgnlbootstrapsync/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/openutils-mgnlcontrols/pom.xml =================================================================== --- trunk/openutils-mgnlcontrols/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-mgnlcontrols/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -2,7 +2,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/openutils-mgnlext/pom.xml =================================================================== --- trunk/openutils-mgnlext/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-mgnlext/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -2,7 +2,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/openutils-mgnlspring/pom.xml =================================================================== --- trunk/openutils-mgnlspring/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-mgnlspring/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/openutils-mgnlstripes/pom.xml =================================================================== --- trunk/openutils-mgnlstripes/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-mgnlstripes/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/openutils-mgnltasks/pom.xml =================================================================== --- trunk/openutils-mgnltasks/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-mgnltasks/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/openutils-spring/pom.xml =================================================================== --- trunk/openutils-spring/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-spring/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-spring</artifactId> Modified: trunk/openutils-spring-remote-callback/pom.xml =================================================================== --- trunk/openutils-spring-remote-callback/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-spring-remote-callback/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -3,7 +3,7 @@ <parent> <artifactId>openutils</artifactId> <groupId>net.sourceforge.openutils</groupId> - <version>7</version> + <version>9</version> <relativePath>..</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/openutils-spring-rmibernate/pom.xml =================================================================== --- trunk/openutils-spring-rmibernate/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-spring-rmibernate/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-spring-rmibernate</artifactId> Modified: trunk/openutils-tags-spring/pom.xml =================================================================== --- trunk/openutils-tags-spring/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-tags-spring/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-tags-spring</artifactId> Modified: trunk/openutils-testing/pom.xml =================================================================== --- trunk/openutils-testing/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-testing/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-testing</artifactId> Modified: trunk/openutils-testing-junit/pom.xml =================================================================== --- trunk/openutils-testing-junit/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-testing-junit/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-testing-junit</artifactId> Modified: trunk/openutils-testing-testng/pom.xml =================================================================== --- trunk/openutils-testing-testng/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-testing-testng/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-testing-testng</artifactId> Modified: trunk/openutils-testing4dwr/pom.xml =================================================================== --- trunk/openutils-testing4dwr/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-testing4dwr/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>7</version> + <version>9</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-testing4dwr</artifactId> Modified: trunk/openutils-testing4dwr-junit/pom.xml =================================================================== --- trunk/openutils-testing4dwr-junit/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-testing4dwr-junit/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-testing4dwr-junit</artifactId> Modified: trunk/openutils-testing4dwr-testng/pom.xml =================================================================== --- trunk/openutils-testing4dwr-testng/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-testing4dwr-testng/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-testing4dwr-testng</artifactId> Modified: trunk/openutils-testing4web/pom.xml =================================================================== --- trunk/openutils-testing4web/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-testing4web/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>net.sourceforge.openutils</groupId> @@ -51,6 +52,12 @@ <groupId>tomcat</groupId> <artifactId>naming-resources</artifactId> <version>5.5.15</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>tomcat</groupId> Modified: trunk/openutils-usermanagement/pom.xml =================================================================== --- trunk/openutils-usermanagement/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-usermanagement/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <groupId>net.sourceforge.openutils</groupId> Modified: trunk/openutils-usermanagement-dataobjects/pom.xml =================================================================== --- trunk/openutils-usermanagement-dataobjects/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-usermanagement-dataobjects/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -3,7 +3,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <groupId>net.sourceforge.openutils</groupId> Modified: trunk/openutils-web/pom.xml =================================================================== --- trunk/openutils-web/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/openutils-web/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -4,7 +4,7 @@ <parent> <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> - <version>8</version> + <version>9</version> <relativePath>..</relativePath> </parent> <artifactId>openutils-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-09-18 19:41:17 UTC (rev 923) +++ trunk/pom.xml 2008-11-02 15:37:36 UTC (rev 924) @@ -5,7 +5,7 @@ <groupId>net.sourceforge.openutils</groupId> <artifactId>openutils</artifactId> <packaging>pom</packaging> - <version>8</version> + <version>9</version> <name>openutils</name> <description>openutils parent POM</description> <url>http://openutils.sourceforge.net</url> @@ -88,16 +88,16 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>2.0-beta-6</version> + <version>2.0-beta-7</version> <configuration> <stagingSiteURL> - scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/staging/${pom.artifactId}/ + scp://web.sourceforge.net/home/groups/o/op/openutils/htdocs/staging/${pom.artifactId}/ </stagingSiteURL> </configuration> </plugin> <plugin> <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-7</version> + <version>2.0-beta-8</version> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> @@ -124,6 +124,10 @@ </executions> </plugin> <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.4</version> + </plugin> + <plugin> <artifactId>maven-eclipse-plugin</artifactId> <version>2.3</version> <configuration> @@ -162,7 +166,7 @@ </plugin> <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.0-beta-3</version> + <version>2.1</version> </plugin> <plugin> <artifactId>maven-changes-plugin</artifactId> @@ -196,16 +200,16 @@ <site> <id>sourceforge</id> <name>sourceforge</name> - <url>scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/</url> + <url>scp://web.sourceforge.net/home/groups/o/op/openutils/htdocs/</url> </site> <downloadUrl>http://prdownloads.sourceforge.net/150467</downloadUrl> <repository> <id>openutils</id> - <url>scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/repository/releases</url> + <url>scp://web.sourceforge.net/home/groups/o/op/openutils/htdocs/repository/releases</url> </repository> <snapshotRepository> <id>openutils.snapshots</id> - <url>scp://shell.sourceforge.net/home/groups/o/op/openutils/htdocs/repository/snapshots</url> + <url>scp://web.sourceforge.net/home/groups/o/op/openutils/htdocs/repository/snapshots</url> </snapshotRepository> </distributionManagement> <modules> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-09-18 12:41:07
|
Revision: 923 http://openutils.svn.sourceforge.net/openutils/?rev=923&view=rev Author: fgiust Date: 2008-09-18 19:41:17 +0000 (Thu, 18 Sep 2008) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/openutils-deployment/pom.xml Modified: trunk/openutils-deployment/pom.xml =================================================================== --- trunk/openutils-deployment/pom.xml 2008-09-18 19:40:48 UTC (rev 922) +++ trunk/openutils-deployment/pom.xml 2008-09-18 19:41:17 UTC (rev 923) @@ -8,7 +8,7 @@ </parent> <artifactId>openutils-deployment</artifactId> <name>openutils deployment tools</name> - <version>2.0.2</version> + <version>2.0.3-SNAPSHOT</version> <description /> <dependencies> <dependency> @@ -67,10 +67,4 @@ <properties> <spring.version>2.5.1</spring.version> </properties> - - <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-2.0.2</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-2.0.2</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-2.0.2</url> - </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-09-18 12:40:39
|
Revision: 922 http://openutils.svn.sourceforge.net/openutils/?rev=922&view=rev Author: fgiust Date: 2008-09-18 19:40:48 +0000 (Thu, 18 Sep 2008) Log Message: ----------- [maven-release-plugin] copy for tag openutils-deployment-2.0.2 Added Paths: ----------- tags/openutils-deployment-2.0.2/ tags/openutils-deployment-2.0.2/pom.xml Removed Paths: ------------- tags/openutils-deployment-2.0.2/pom.xml Deleted: tags/openutils-deployment-2.0.2/pom.xml =================================================================== --- trunk/openutils-deployment/pom.xml 2008-09-18 19:38:50 UTC (rev 920) +++ tags/openutils-deployment-2.0.2/pom.xml 2008-09-18 19:40:48 UTC (rev 922) @@ -1,71 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils</artifactId> - <version>8</version> - <relativePath>..</relativePath> - </parent> - <artifactId>openutils-deployment</artifactId> - <name>openutils deployment tools</name> - <version>2.0.2-SNAPSHOT</version> - <description /> - <dependencies> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.3</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>${spring.version}</version> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> - <version>${spring.version}</version> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.3</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>1.5.3</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.0</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <spring.version>2.5.1</spring.version> - </properties> -</project> \ No newline at end of file Copied: tags/openutils-deployment-2.0.2/pom.xml (from rev 921, trunk/openutils-deployment/pom.xml) =================================================================== --- tags/openutils-deployment-2.0.2/pom.xml (rev 0) +++ tags/openutils-deployment-2.0.2/pom.xml 2008-09-18 19:40:48 UTC (rev 922) @@ -0,0 +1,76 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils</artifactId> + <version>8</version> + <relativePath>..</relativePath> + </parent> + <artifactId>openutils-deployment</artifactId> + <name>openutils deployment tools</name> + <version>2.0.2</version> + <description /> + <dependencies> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.3</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${spring.version}</version> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + <version>${spring.version}</version> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.3</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>1.5.3</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.0</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <spring.version>2.5.1</spring.version> + </properties> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-2.0.2</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-2.0.2</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-2.0.2</url> + </scm> +</project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-09-18 12:39:59
|
Revision: 921 http://openutils.svn.sourceforge.net/openutils/?rev=921&view=rev Author: fgiust Date: 2008-09-18 19:40:08 +0000 (Thu, 18 Sep 2008) Log Message: ----------- [maven-release-plugin] prepare release openutils-deployment-2.0.2 Modified Paths: -------------- trunk/openutils-deployment/pom.xml Modified: trunk/openutils-deployment/pom.xml =================================================================== --- trunk/openutils-deployment/pom.xml 2008-09-18 19:38:50 UTC (rev 920) +++ trunk/openutils-deployment/pom.xml 2008-09-18 19:40:08 UTC (rev 921) @@ -1,5 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>net.sourceforge.openutils</groupId> @@ -9,7 +8,7 @@ </parent> <artifactId>openutils-deployment</artifactId> <name>openutils deployment tools</name> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.2</version> <description /> <dependencies> <dependency> @@ -68,4 +67,10 @@ <properties> <spring.version>2.5.1</spring.version> </properties> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-2.0.2</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-2.0.2</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-2.0.2</url> + </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-09-18 12:38:41
|
Revision: 920 http://openutils.svn.sourceforge.net/openutils/?rev=920&view=rev Author: fgiust Date: 2008-09-18 19:38:50 +0000 (Thu, 18 Sep 2008) Log Message: ----------- minor changes to DeploymentResolver Modified Paths: -------------- trunk/openutils-deployment/pom.xml trunk/openutils-deployment/src/main/java/it/openutils/deployment/log4j/DeploymentResolver.java trunk/openutils-deployment/src/site/changes/changes.xml Modified: trunk/openutils-deployment/pom.xml =================================================================== --- trunk/openutils-deployment/pom.xml 2008-09-17 17:17:04 UTC (rev 919) +++ trunk/openutils-deployment/pom.xml 2008-09-18 19:38:50 UTC (rev 920) @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>net.sourceforge.openutils</groupId> @@ -43,12 +44,12 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.4.3</version> + <version>1.5.3</version> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>jcl104-over-slf4j</artifactId> - <version>1.4.3</version> + <artifactId>jcl-over-slf4j</artifactId> + <version>1.5.3</version> </dependency> <dependency> <groupId>javax.servlet</groupId> Modified: trunk/openutils-deployment/src/main/java/it/openutils/deployment/log4j/DeploymentResolver.java =================================================================== --- trunk/openutils-deployment/src/main/java/it/openutils/deployment/log4j/DeploymentResolver.java 2008-09-17 17:17:04 UTC (rev 919) +++ trunk/openutils-deployment/src/main/java/it/openutils/deployment/log4j/DeploymentResolver.java 2008-09-18 19:38:50 UTC (rev 920) @@ -25,6 +25,8 @@ import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -34,6 +36,11 @@ public class DeploymentResolver { + /** + * Logger. + */ + private static Logger log = LoggerFactory.getLogger(DeploymentResolver.class); + public static File resolveServerRelativeLocation(ServletContext context, String commaSeparatedListOfPaths) throws FileNotFoundException { @@ -41,9 +48,11 @@ String servername = resolveServerName(); - String rootPath = StringUtils.replace(context.getRealPath("/"), "\\", "/"); //$NON-NLS-1$ //$NON-NLS-2$ + String rootPath = StringUtils.stripEnd(StringUtils.replace(context.getRealPath("/"), "\\", "/"), "/"); //$NON-NLS-1$ //$NON-NLS-2$ String webapp = StringUtils.substringAfterLast(rootPath, "/"); //$NON-NLS-1$ + log.info("Resolving log configuration using servername={} and webapp={}", servername, webapp); + for (int j = 0; j < propertiesLocation.length; j++) { String location = StringUtils.trim(propertiesLocation[j]); @@ -54,9 +63,12 @@ if (!initFile.exists() || initFile.isDirectory()) { + log.debug("Log4j config not found at {}", initFile.getAbsolutePath()); continue; } + log.debug("Log4j config FOUND at {}", initFile.getAbsolutePath()); + return initFile; } @@ -65,7 +77,7 @@ MessageFormat .format( "No configuration found using location list {0}. [servername] is [{1}], [webapp] is [{2}] and base path is [{3}]", //$NON-NLS-1$ - new Object[]{ArrayUtils.toString(propertiesLocation), servername, webapp, rootPath})); + new Object[]{ArrayUtils.toString(propertiesLocation), servername, webapp, rootPath })); } Modified: trunk/openutils-deployment/src/site/changes/changes.xml =================================================================== --- trunk/openutils-deployment/src/site/changes/changes.xml 2008-09-17 17:17:04 UTC (rev 919) +++ trunk/openutils-deployment/src/site/changes/changes.xml 2008-09-18 19:38:50 UTC (rev 920) @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- + <!-- "type" attribute can be: add, remove, update or fix. --> <document> @@ -8,11 +8,15 @@ <author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author> </properties> <body> + <release version="2.0.2" date="2008-09-18" description=""> + <action type="fix" dev="fgiust"> Added debug logs to DeploymentResolver, and solved resolution of webapp root when + the root real path returned by the container ends with "/".</action> + <action type="update" dev="fgiust"> Update slf4j dependencies to 1.5.3.</action> + </release> <release version="2.0.1" date="2008-02-11" description="2.0.1"> - <action type="fix" dev="fgiust"> - Better handling of classpath resources in it.openutils.deployment.spring.EnvironmentPropertyConfigurer - (resources with "classpath:" prefix were not loaded properly in a web application). - </action> + <action type="fix" dev="fgiust"> Better handling of classpath resources in + it.openutils.deployment.spring.EnvironmentPropertyConfigurer (resources with "classpath:" prefix were not loaded + properly in a web application).</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: <fg...@us...> - 2008-09-17 16:35:38
|
Revision: 916 http://openutils.svn.sourceforge.net/openutils/?rev=916&view=rev Author: fgiust Date: 2008-09-17 16:35:47 +0000 (Wed, 17 Sep 2008) Log Message: ----------- changelog Modified Paths: -------------- trunk/openutils-mgnlstripes/src/site/changes/changes.xml Modified: trunk/openutils-mgnlstripes/src/site/changes/changes.xml =================================================================== --- trunk/openutils-mgnlstripes/src/site/changes/changes.xml 2008-09-16 15:03:47 UTC (rev 915) +++ trunk/openutils-mgnlstripes/src/site/changes/changes.xml 2008-09-17 16:35:47 UTC (rev 916) @@ -8,7 +8,10 @@ <author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author> </properties> <body> - <release version="3.6-b1" date="2008-04-24" description=""> + <release version="3.6-b2" date="2008-09-17" description=""> + <action type="fix" dev="fgiust">fix handling of stripes locale</action> + </release> + <release version="3.6-b1" date="2008-9-16" description=""> <action type="update" dev="fgiust">support for stripes 1.5 (note: it only works with 1.5, not 1.4.x anymore) </action> <action type="update" dev="fgiust">update deps to magnolia 3.6.1</action> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-09-16 07:33:52
|
Revision: 914 http://openutils.svn.sourceforge.net/openutils/?rev=914&view=rev Author: fgiust Date: 2008-09-16 07:34:01 +0000 (Tue, 16 Sep 2008) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/openutils-mgnlstripes/pom.xml Modified: trunk/openutils-mgnlstripes/pom.xml =================================================================== --- trunk/openutils-mgnlstripes/pom.xml 2008-09-16 07:33:52 UTC (rev 913) +++ trunk/openutils-mgnlstripes/pom.xml 2008-09-16 07:34:01 UTC (rev 914) @@ -10,7 +10,7 @@ <packaging>jar</packaging> <artifactId>openutils-mgnlstripes</artifactId> <name>openutils-mgnlstripes</name> - <version>3.6-b1</version> + <version>3.6-SNAPSHOT</version> <licenses> <license> <name>GPLv3</name> @@ -96,10 +96,4 @@ </snapshots> </repository> </repositories> - - <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-3.6-b1</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-3.6-b1</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlstripes-3.6-b1</url> - </scm> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-09-16 07:33:44
|
Revision: 913 http://openutils.svn.sourceforge.net/openutils/?rev=913&view=rev Author: fgiust Date: 2008-09-16 07:33:52 +0000 (Tue, 16 Sep 2008) Log Message: ----------- [maven-release-plugin] copy for tag openutils-mgnlstripes-3.6-b1 Added Paths: ----------- tags/openutils-mgnlstripes-3.6-b1/ tags/openutils-mgnlstripes-3.6-b1/pom.xml Removed Paths: ------------- tags/openutils-mgnlstripes-3.6-b1/pom.xml Deleted: tags/openutils-mgnlstripes-3.6-b1/pom.xml =================================================================== --- trunk/openutils-mgnlstripes/pom.xml 2008-09-16 07:31:56 UTC (rev 911) +++ tags/openutils-mgnlstripes-3.6-b1/pom.xml 2008-09-16 07:33:52 UTC (rev 913) @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils</artifactId> - <version>8</version> - <relativePath>..</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - <artifactId>openutils-mgnlstripes</artifactId> - <name>openutils-mgnlstripes</name> - <version>3.5.1-SNAPSHOT</version> - <licenses> - <license> - <name>GPLv3</name> - <url>http://www.gnu.org/licenses/gpl-3.0.txt</url> - </license> - </licenses> - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - <resource> - <filtering>true</filtering> - <directory>src/main/resources</directory> - <includes> - <include>META-INF/magnolia/*</include> - </includes> - </resource> - </resources> - </build> - <dependencies> - <dependency> - <groupId>net.sourceforge.stripes</groupId> - <artifactId>stripes</artifactId> - <version>1.5</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>info.magnolia</groupId> - <artifactId>magnolia-core</artifactId> - <version>3.6.1</version> - </dependency> - <dependency> - <groupId>info.magnolia</groupId> - <artifactId>magnolia-module-admininterface</artifactId> - <version>3.6.1</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - <version>5.7</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <repositories> - <repository> - <id>repository.magnolia.info</id> - <name>magnolia repository</name> - <url>http://repo.magnolia.info/m2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> -</project> Copied: tags/openutils-mgnlstripes-3.6-b1/pom.xml (from rev 912, trunk/openutils-mgnlstripes/pom.xml) =================================================================== --- tags/openutils-mgnlstripes-3.6-b1/pom.xml (rev 0) +++ tags/openutils-mgnlstripes-3.6-b1/pom.xml 2008-09-16 07:33:52 UTC (rev 913) @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils</artifactId> + <version>8</version> + <relativePath>..</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <packaging>jar</packaging> + <artifactId>openutils-mgnlstripes</artifactId> + <name>openutils-mgnlstripes</name> + <version>3.6-b1</version> + <licenses> + <license> + <name>GPLv3</name> + <url>http://www.gnu.org/licenses/gpl-3.0.txt</url> + </license> + </licenses> + <build> + <resources> + <resource> + <filtering>false</filtering> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + <resource> + <filtering>true</filtering> + <directory>src/main/resources</directory> + <includes> + <include>META-INF/magnolia/*</include> + </includes> + </resource> + </resources> + </build> + <dependencies> + <dependency> + <groupId>net.sourceforge.stripes</groupId> + <artifactId>stripes</artifactId> + <version>1.5</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>info.magnolia</groupId> + <artifactId>magnolia-core</artifactId> + <version>3.6.1</version> + </dependency> + <dependency> + <groupId>info.magnolia</groupId> + <artifactId>magnolia-module-admininterface</artifactId> + <version>3.6.1</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + <version>5.7</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <repositories> + <repository> + <id>repository.magnolia.info</id> + <name>magnolia repository</name> + <url>http://repo.magnolia.info/m2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-3.6-b1</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-3.6-b1</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlstripes-3.6-b1</url> + </scm> +</project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-09-16 07:33:22
|
Revision: 912 http://openutils.svn.sourceforge.net/openutils/?rev=912&view=rev Author: fgiust Date: 2008-09-16 07:33:32 +0000 (Tue, 16 Sep 2008) Log Message: ----------- [maven-release-plugin] prepare release openutils-mgnlstripes-3.6-b1 Modified Paths: -------------- trunk/openutils-mgnlstripes/pom.xml Modified: trunk/openutils-mgnlstripes/pom.xml =================================================================== --- trunk/openutils-mgnlstripes/pom.xml 2008-09-16 07:31:56 UTC (rev 911) +++ trunk/openutils-mgnlstripes/pom.xml 2008-09-16 07:33:32 UTC (rev 912) @@ -10,7 +10,7 @@ <packaging>jar</packaging> <artifactId>openutils-mgnlstripes</artifactId> <name>openutils-mgnlstripes</name> - <version>3.5.1-SNAPSHOT</version> + <version>3.6-b1</version> <licenses> <license> <name>GPLv3</name> @@ -96,4 +96,10 @@ </snapshots> </repository> </repositories> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-3.6-b1</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-3.6-b1</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlstripes-3.6-b1</url> + </scm> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-09-16 07:31:45
|
Revision: 911 http://openutils.svn.sourceforge.net/openutils/?rev=911&view=rev Author: fgiust Date: 2008-09-16 07:31:56 +0000 (Tue, 16 Sep 2008) Log Message: ----------- docs Modified Paths: -------------- trunk/openutils-mgnlstripes/src/site/apt/index.apt trunk/openutils-mgnlstripes/src/site/changes/changes.xml Modified: trunk/openutils-mgnlstripes/src/site/apt/index.apt =================================================================== --- trunk/openutils-mgnlstripes/src/site/apt/index.apt 2008-09-15 22:06:51 UTC (rev 910) +++ trunk/openutils-mgnlstripes/src/site/apt/index.apt 2008-09-16 07:31:56 UTC (rev 911) @@ -13,8 +13,20 @@ Any magically-converted Stripes action will still be able to use any standard Stripes feature, plus it will enjoy the automatic injection of any paragraph property. - <<This module requires magnolia 3.5.x, and will not work on any earlier version!>> + <<This module requires magnolia 3.5.x or 3.6.x, and will not work on any earlier version!>> +Supported versions: + +*-----------------------------*--------------------------------*------------------------------- +| mgnlstripes | stripes | magnolia +*-----------------------------*--------------------------------*------------------------------- +| 3.5.x | 1.4.x (doesn't work with 1.5) | 3.5 (also works on 3.6) +*-----------------------------*--------------------------------*------------------------------- +| 3.6.x (currently beta) | 1.5 (doesn't work with 1.4.x) | 3.6 (also works on 3.5) +*-----------------------------*--------------------------------*------------------------------- + + + Configuration First of all drop the openutils-mgnlstripes jar and the stripes jar into WEB-INF/lib, or (better) if you are using maven Modified: trunk/openutils-mgnlstripes/src/site/changes/changes.xml =================================================================== --- trunk/openutils-mgnlstripes/src/site/changes/changes.xml 2008-09-15 22:06:51 UTC (rev 910) +++ trunk/openutils-mgnlstripes/src/site/changes/changes.xml 2008-09-16 07:31:56 UTC (rev 911) @@ -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="3.6-b1" date="2008-04-24" description=""> + <action type="update" dev="fgiust">support for stripes 1.5 (note: it only works with 1.5, not 1.4.x anymore) + </action> + <action type="update" dev="fgiust">update deps to magnolia 3.6.1</action> + </release> <release version="3.5" date="2008-04-24" description="3.5"> <action type="update" dev="fgiust">update deps to magnolia 3.5.4</action> <action type="update" dev="fgiust">the stripes filter is now added by the module automatically, and it should not This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-09-15 22:06:42
|
Revision: 910 http://openutils.svn.sourceforge.net/openutils/?rev=910&view=rev Author: fgiust Date: 2008-09-15 22:06:51 +0000 (Mon, 15 Sep 2008) Log Message: ----------- stripes 1.5 support Modified Paths: -------------- trunk/openutils-mgnlstripes/pom.xml trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.paragraph-renderers.stripes.xml Added Paths: ----------- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.template-renderers.stripes.xml Removed Paths: ------------- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRequestWrapper.java trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphResponseWrapper.java trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/tag/ trunk/openutils-mgnlstripes/src/main/resources/META-INF/mgnlstripes.tld Modified: trunk/openutils-mgnlstripes/pom.xml =================================================================== --- trunk/openutils-mgnlstripes/pom.xml 2008-08-18 19:37:24 UTC (rev 909) +++ trunk/openutils-mgnlstripes/pom.xml 2008-09-15 22:06:51 UTC (rev 910) @@ -39,7 +39,7 @@ <dependency> <groupId>net.sourceforge.stripes</groupId> <artifactId>stripes</artifactId> - <version>1.4.3</version> + <version>1.5</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -50,12 +50,12 @@ <dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-core</artifactId> - <version>3.5.4</version> + <version>3.6.1</version> </dependency> <dependency> <groupId>info.magnolia</groupId> <artifactId>magnolia-module-admininterface</artifactId> - <version>3.5.4</version> + <version>3.6.1</version> </dependency> <dependency> <groupId>javax.servlet</groupId> Copied: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java (from rev 909, trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRequestWrapper.java) =================================================================== --- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java (rev 0) +++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java 2008-09-15 22:06:51 UTC (rev 910) @@ -0,0 +1,187 @@ +/** + * 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.magnoliastripes; + +import info.magnolia.context.MgnlContext; +import info.magnolia.context.WebContext; + +import java.io.IOException; +import java.io.Writer; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Map; + +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; + +import net.sourceforge.stripes.exception.StripesServletException; + + +/** + * Magnolia request wrapper for Stripes actions. + * @author fgiust + * @version $Id: StripesParagraphRequestWrapper.java 10833 2008-09-15 15:39:08Z fgiust $ + */ +class MgnlStripesRequestWrapper extends HttpServletRequestWrapper +{ + + /** + * Hacked servlet path. + */ + private String servletPath; + + /** + * Parameter map. + */ + private Map<String, String[]> parameterMap; + + private Writer out; + + /** + * Instantiate a new request wrapper. + * @param request original HttpServletRequest + * @param servletPath modified servlet path (matches Stripes binding) + * @param paragraphsData map containing paragraph attributes + * @throws StripesServletException if any other error occurs constructing the wrapper + */ + public MgnlStripesRequestWrapper( + HttpServletRequest request, + String servletPath, + Map<String, String[]> paragraphsData, + Writer out) throws StripesServletException + { + super(request); + this.servletPath = servletPath; + this.out = out; + + parameterMap = new HashMap<String, String[]>(); + parameterMap.putAll(request.getParameterMap()); + parameterMap.putAll(paragraphsData); + } + + /** + * {@inheritDoc} + */ + @Override + public String getServletPath() + { + return servletPath; + } + + /** + * {@inheritDoc} + */ + @SuppressWarnings("unchecked") + @Override + public Enumeration<String> getParameterNames() + { + return ((Hashtable) parameterMap).keys(); + } + + /** + * {@inheritDoc} + */ + @Override + public String[] getParameterValues(String name) + { + return parameterMap.get(name); + } + + /** + * {@inheritDoc} + */ + @Override + public Map<String, String[]> getParameterMap() + { + return parameterMap; + } + + /** + * {@inheritDoc} + */ + @Override + public String getParameter(String name) + { + String[] values = getParameterValues(name); + if (values != null && values.length > 0) + { + return values[0]; + } + else + { + return null; + } + } + + /** + * {@inheritDoc} + */ + @Override + public RequestDispatcher getRequestDispatcher(String path) + { + return new MagnoliaRequestDispatcher(path, out); + } + + /** + * A {@link RequestDispatcher} that uses {@link WebContext} for including a resource. + * @author fgiust + * @version $Id: StripesParagraphRequestWrapper.java 10833 2008-09-15 15:39:08Z fgiust $ + */ + private static class MagnoliaRequestDispatcher implements RequestDispatcher + { + + /** + * The url this RequestDispatcher is bound to. + */ + private String url; + + private Writer out; + + /** + * Created a new MagnoliaRequestDispatcher for the given url. + * @param url url passed to {@link HttpServletRequest#getRequestDispatcher()} + */ + public MagnoliaRequestDispatcher(String url, Writer out) + { + this.url = url; + this.out = out; + } + + /** + * {@inheritDoc} + */ + public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException + { + ((WebContext) MgnlContext.getInstance()).include(url, out); + } + + /** + * {@inheritDoc} + */ + public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException + { + ((WebContext) MgnlContext.getInstance()).include(url, out); + } + + } +} \ No newline at end of file Property changes on: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesRequestWrapper.java ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java (from rev 909, trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphResponseWrapper.java) =================================================================== --- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java (rev 0) +++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java 2008-09-15 22:06:51 UTC (rev 910) @@ -0,0 +1,60 @@ +/** + * 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.magnoliastripes; + +import java.io.IOException; +import java.io.PrintWriter; +import java.io.Writer; + +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponseWrapper; + + +/** + * A response wrapper for the Stripes paragraph (replace the standard writer with the Magnolia one). + * @author fgiust + * @version $Id: StripesParagraphResponseWrapper.java 10833 2008-09-15 15:39:08Z fgiust $ + */ +class MgnlStripesResponseWrapper extends HttpServletResponseWrapper +{ + + /** + * Writer that should be used for output. + */ + private PrintWriter out; + + /** + * @param response HttpServletResponse + * @param out writer guven by Magnolia. + */ + public MgnlStripesResponseWrapper(HttpServletResponse response, Writer out) + { + super(response); + this.out = new PrintWriter(out); + } + + /** + * {@inheritDoc} + */ + @Override + public PrintWriter getWriter() throws IOException + { + return out; + } + +} \ No newline at end of file Property changes on: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlStripesResponseWrapper.java ___________________________________________________________________ Added: svn:mergeinfo + Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java =================================================================== --- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java 2008-08-18 19:37:24 UTC (rev 909) +++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRenderer.java 2008-09-15 22:06:51 UTC (rev 910) @@ -17,345 +17,13 @@ */ package it.openutils.magnoliastripes; -import info.magnolia.cms.beans.config.Paragraph; -import info.magnolia.cms.beans.runtime.ParagraphRenderer; -import info.magnolia.cms.core.Content; -import info.magnolia.cms.core.NodeData; -import info.magnolia.context.MgnlContext; -import info.magnolia.context.WebContext; - -import java.io.IOException; -import java.io.Writer; -import java.lang.reflect.InvocationTargetException; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Stack; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.PageContext; - -import net.sourceforge.stripes.action.ActionBeanContext; -import net.sourceforge.stripes.action.Resolution; -import net.sourceforge.stripes.config.Configuration; -import net.sourceforge.stripes.controller.DispatcherHelper; -import net.sourceforge.stripes.controller.DispatcherServlet; -import net.sourceforge.stripes.controller.ExecutionContext; -import net.sourceforge.stripes.controller.LifecycleStage; -import net.sourceforge.stripes.controller.StripesConstants; -import net.sourceforge.stripes.controller.StripesFilter; -import net.sourceforge.stripes.exception.StripesServletException; -import net.sourceforge.stripes.validation.BooleanTypeConverter; - -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - /** - * <p> - * A Magnolia paragraph renderer that delegates to Stripes actions. Most of the code is just a cut and paste from - * Stripes' {@link DispatcherServlet}, adapted to work withing magnolia by: - * </p> - * <ul> - * <li>wrap the request in order to modify the request path and provide a custom requestDispatcher</li> - * <li>wrap the response in order to provide a custom Writer</li> - * <li>use a fake servlet instance/context to setup a Stripe context (there is no servlet here)</li> - * <li>injiect any paragraph property as a parameter</li> - * </ul> - * <p> - * <strong>Todo:</strong> - * </p> - * <ul> - * <li>Handle multipart forms in request wrapper (should be easy to do)</li> - * <li>A better way of handling multivalued properties in paragraph</li> - * <li>Handle binary properties in paragraph</li> - * </ul> + * @deprecated use {@link StripesRenderer} which acts both as a ParagraphRenderer and as a TemplateRenderer * @author fgiust - * @version $Id: $ + * @version $Id: StripesParagraphRenderer.java 10833 2008-09-15 15:39:08Z fgiust $ */ -public class StripesParagraphRenderer implements ParagraphRenderer +@Deprecated +public class StripesParagraphRenderer extends StripesRenderer { - private Boolean alwaysInvokeValidate; - - /** - * Logger. - */ - private Logger log = LoggerFactory.getLogger(StripesParagraphRenderer.class); - - /** - * <p> - * Invokes the following instance level methods in order to coordinate the processing of requests: - * </p> - * <ul> - * <li>{@link #resolveActionBean(ExecutionContext)}</li> - * <li>{@link #resolveHandler(ExecutionContext)}</li> - * <li>{@link #doBindingAndValidation(ExecutionContext)}</li> - * <li>{@link #doCustomValidation(ExecutionContext)}</li> - * <li>{@link #handleValidationErrors(ExecutionContext)}</li> - * <li>{@link #invokeEventHandler(ExecutionContext)}</li> - * </ul> - * <p> - * If any of the above methods return a {@link Resolution} the rest of the request processing is aborted and the - * resolution is executed. - * </p> - * {@inheritDoc} - */ - public void render(Content content, Paragraph paragraph, Writer out) throws IOException - { - // @fgiust start custom magnolia setup - - WebContext webContext = (WebContext) MgnlContext.getInstance(); - HttpServletResponse response = new StripesParagraphResponseWrapper(webContext.getResponse(), out); - - final String templatePath = paragraph.getTemplatePath(); - Map<String, String[]> nodeDataMap = contentToMap(content); - - HttpServletRequest request; - try - { - request = new StripesParagraphRequestWrapper( - ((WebContext) MgnlContext.getInstance()).getRequest(), - templatePath, - nodeDataMap, - out); - - ((StripesParagraphRequestWrapper) request).setLocale(MgnlContext.getLocale()); - } - catch (StripesServletException e) - { - throw new RuntimeException(e); - } - - // @todo fgiust force include instead of forwarding. Not needed anymore since we are wrapping requestDispatcher? - request.setAttribute(StripesConstants.REQ_ATTR_INCLUDE_PATH, templatePath); - - PageContext pageContext = webContext.getPageContext(); - ServletContext servletContext = webContext.getServletContext(); - - if (pageContext != null) - { - pageContext.getServletContext(); - } - // @fgiust end custom magnolia setup - - // It sucks that we have to do this here (in the request cycle), but there doesn't - // seem to be a good way to get at the Configuration from the Filter in init() - doOneTimeConfiguration(); - - log.debug("Dispatching request to URL: ", request.getRequestURI()); - - try - { - Configuration config = (Configuration) servletContext.getAttribute(Configuration.class.getName()); - - if (config == null) - { - // avoid NPES, an error has already been logged. - log.warn("Stripes configuration not found for request " - + request.getAttribute("javax.servlet.forward.request_uri") - + " while including " - + request.getRequestURI()); - - return; - } - - // First manufacture an ActionBeanContext - final ActionBeanContext context = config - .getActionBeanContextFactory() - .getContextInstance(request, response); - context.setServletContext(servletContext); - - // Then setup the ExecutionContext that we'll use to process this request - final ExecutionContext ctx = new ExecutionContext(); - ctx.setInterceptors(config.getInterceptors(LifecycleStage.ActionBeanResolution)); - ctx.setLifecycleStage(LifecycleStage.ActionBeanResolution); - ctx.setActionBeanContext(context); - - if (pageContext != null) - { - DispatcherHelper.setPageContext(pageContext); - } - - // Resolve the ActionBean, and if an interceptor returns a resolution, bail now - saveActionBean(request); - Resolution resolution = DispatcherHelper.resolveActionBean(ctx); - - if (resolution == null) - { - resolution = DispatcherHelper.resolveHandler(ctx); - - if (resolution == null) - { - // Then run binding and validation - resolution = DispatcherHelper.doBindingAndValidation(ctx, true); - - if (resolution == null) - { - // Then continue on to custom validation - resolution = DispatcherHelper.doCustomValidation(ctx, alwaysInvokeValidate); - - if (resolution == null) - { - // And then validation error handling - resolution = DispatcherHelper.handleValidationErrors(ctx); - - if (resolution == null) - { - // And finally(ish) invoking of the event handler - resolution = DispatcherHelper.invokeEventHandler(ctx); - - // If the event produced errors, fill them in - DispatcherHelper.fillInValidationErrors(ctx); - } - } - } - } - } - - // Whatever stage it came from, execute the resolution - if (resolution != null) - { - DispatcherHelper.executeResolution(ctx, resolution); - } - } - catch (RuntimeException re) - { - throw re; - } - catch (InvocationTargetException ite) - { - if (ite.getTargetException() instanceof RuntimeException) - { - throw (RuntimeException) ite.getTargetException(); - } - else - { - Throwable targetEx = ite.getTargetException(); - throw new RuntimeException(targetEx.getClass().getName() + ": " + targetEx.getMessage(), targetEx); - } - } - catch (Exception e) - { - throw new RuntimeException("Exception encountered processing request: " + e.getMessage(), e); - } - finally - { - - if (pageContext != null) - { - // *Don't* release the page context, if set it will be closed by the main magnolia template - // JspFactory.getDefaultFactory().releasePageContext(pageContext); - DispatcherHelper.setPageContext(null); - } - restoreActionBean(request); - } - } - - /** - * @param content paragraph node - * @return a map of Strings (converted nodedata) - */ - @SuppressWarnings("unchecked") - protected Map<String, String[]> contentToMap(Content content) - { - Collection<NodeData> paragraphsData = content.getNodeDataCollection(); - Map<String, String[]> nodeDataMap = new HashMap<String, String[]>(); - for (NodeData nodeData : paragraphsData) - { - String name = StringUtils.replaceChars(nodeData.getName(), "{}", "[]"); - String value = nodeData.getString(); - if (StringUtils.contains(name, "multiple")) - { - nodeDataMap.put(name, StringUtils.split(value, "\n")); - } - else - { - nodeDataMap.put(name, new String[]{value }); - } - } - return nodeDataMap; - } - - /** - * Performs a simple piece of one time configuration that requires access to the Configuration object delivered - * through the Stripes Filter. - */ - private void doOneTimeConfiguration() - { - if (alwaysInvokeValidate == null) - { - // Check to see if, in this application, validate() methods should always be run - // even when validation errors already exist - String callValidateWhenErrorsExist = StripesFilter - .getConfiguration() - .getBootstrapPropertyResolver() - .getProperty(DispatcherServlet.RUN_CUSTOM_VALIDATION_WHEN_ERRORS); - - if (callValidateWhenErrorsExist != null) - { - BooleanTypeConverter c = new BooleanTypeConverter(); - this.alwaysInvokeValidate = c.convert(callValidateWhenErrorsExist, Boolean.class, null); - } - else - { - this.alwaysInvokeValidate = false; // Default behaviour - } - } - } - - /** - * Fetches, and lazily creates if required, a Stack in the request to store ActionBeans should the current request - * involve forwards or includes to other ActionBeans. - * @param request the current HttpServletRequest - * @param create create a Stack if not already set - * @return the Stack if present, or if creation is requested - */ - @SuppressWarnings("unchecked") - protected Stack getActionBeanStack(HttpServletRequest request, boolean create) - { - Stack stack = (Stack) request.getAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN_STACK); - if (stack == null && create) - { - stack = new Stack(); - request.setAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN_STACK, stack); - } - - return stack; - } - - /** - * Saves the current value of the 'actionBean' attribute in the request so that it can be restored at a later date - * by calling {@link #restoreActionBean(HttpServletRequest)}. If no ActionBean is currently stored in the request, - * nothing is changed. - * @param request the current HttpServletRequest - */ - @SuppressWarnings("unchecked") - protected void saveActionBean(HttpServletRequest request) - { - if (request.getAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN) != null) - { - Stack stack = getActionBeanStack(request, true); - stack.push(request.getAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN)); - } - } - - /** - * Restores the previous value of the 'actionBean' attribute in the request. If no ActionBeans have been saved using - * {@link #saveActionBean(HttpServletRequest)} then this method has no effect. - * @param request the current HttpServletRequest - */ - @SuppressWarnings("unchecked") - protected void restoreActionBean(HttpServletRequest request) - { - Stack stack = getActionBeanStack(request, false); - if (stack != null && !stack.empty()) - { - request.setAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN, stack.pop()); - } - } - -} +} \ No newline at end of file Deleted: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRequestWrapper.java =================================================================== --- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRequestWrapper.java 2008-08-18 19:37:24 UTC (rev 909) +++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphRequestWrapper.java 2008-09-15 22:06:51 UTC (rev 910) @@ -1,198 +0,0 @@ -/** - * Copyright Openmind http://www.openmindonline.it - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package it.openutils.magnoliastripes; - -import info.magnolia.context.MgnlContext; -import info.magnolia.context.WebContext; - -import java.io.IOException; -import java.io.Writer; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Locale; -import java.util.Map; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; - -import net.sourceforge.stripes.controller.StripesRequestWrapper; -import net.sourceforge.stripes.exception.StripesServletException; - - -/** - * Magnolia request wrapper for Stripes actions. - * @author fgiust - * @version $Id: $ - */ -class StripesParagraphRequestWrapper extends StripesRequestWrapper -{ - - /** - * Hacked servlet path. - */ - private String servletPath; - - /** - * Parameter map. - */ - private Map<String, String[]> parameterMap; - - private Writer out; - - /** - * Instantiate a new request wrapper. - * @param request original HttpServletRequest - * @param servletPath modified servlet path (matches Stripes binding) - * @param paragraphsData map containing paragraph attributes - * @throws StripesServletException if any other error occurs constructing the wrapper - */ - @SuppressWarnings("unchecked") - public StripesParagraphRequestWrapper( - HttpServletRequest request, - String servletPath, - Map<String, String[]> paragraphsData, - Writer out) throws StripesServletException - { - super(request); - this.servletPath = servletPath; - this.out = out; - - parameterMap = new Hashtable<String, String[]>(); - parameterMap.putAll(request.getParameterMap()); - parameterMap.putAll(paragraphsData); - } - - /** - * {@inheritDoc} - */ - @Override - public String getServletPath() - { - return servletPath; - } - - /** - * {@inheritDoc} - */ - @Override - protected void setLocale(Locale locale) - { - super.setLocale(locale); - } - - /** - * {@inheritDoc} - */ - @SuppressWarnings("unchecked") - @Override - public Enumeration<String> getParameterNames() - { - return ((Hashtable) parameterMap).keys(); - } - - /** - * {@inheritDoc} - */ - @Override - public String[] getParameterValues(String name) - { - return parameterMap.get(name); - } - - /** - * {@inheritDoc} - */ - @Override - public Map<String, String[]> getParameterMap() - { - - return parameterMap; - } - - /** - * {@inheritDoc} - */ - @Override - public String getParameter(String name) - { - String[] values = getParameterValues(name); - if (values != null && values.length > 0) - { - return values[0]; - } - else - { - return null; - } - } - - /** - * {@inheritDoc} - */ - @Override - public RequestDispatcher getRequestDispatcher(String path) - { - return new MagnoliaRequestDispatcher(path, out); - } - - /** - * A {@link RequestDispatcher} that uses {@link WebContext} for including a resource. - * @author fgiust - * @version $Id: $ - */ - private static class MagnoliaRequestDispatcher implements RequestDispatcher - { - - /** - * The url this RequestDispatcher is bound to. - */ - private String url; - - private Writer out; - - /** - * Created a new MagnoliaRequestDispatcher for the given url. - * @param url url passed to {@link HttpServletRequest#getRequestDispatcher()} - */ - public MagnoliaRequestDispatcher(String url, Writer out) - { - this.url = url; - this.out = out; - } - - /** - * {@inheritDoc} - */ - public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException - { - ((WebContext) MgnlContext.getInstance()).include(url, out); - } - - /** - * {@inheritDoc} - */ - public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException - { - ((WebContext) MgnlContext.getInstance()).include(url, out); - } - - } -} \ No newline at end of file Deleted: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphResponseWrapper.java =================================================================== --- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphResponseWrapper.java 2008-08-18 19:37:24 UTC (rev 909) +++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesParagraphResponseWrapper.java 2008-09-15 22:06:51 UTC (rev 910) @@ -1,60 +0,0 @@ -/** - * Copyright Openmind http://www.openmindonline.it - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package it.openutils.magnoliastripes; - -import java.io.IOException; -import java.io.PrintWriter; -import java.io.Writer; - -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; - - -/** - * A response wrapper for the Stripes paragraph (replace the standard writer with the Magnolia one). - * @author fgiust - * @version $Id: $ - */ -class StripesParagraphResponseWrapper extends HttpServletResponseWrapper -{ - - /** - * Writer that should be used for output. - */ - private PrintWriter out; - - /** - * @param response HttpServletResponse - * @param out writer guven by Magnolia. - */ - public StripesParagraphResponseWrapper(HttpServletResponse response, Writer out) - { - super(response); - this.out = new PrintWriter(out); - } - - /** - * {@inheritDoc} - */ - @Override - public PrintWriter getWriter() throws IOException - { - return out; - } - -} \ No newline at end of file Added: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java =================================================================== --- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java (rev 0) +++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java 2008-09-15 22:06:51 UTC (rev 910) @@ -0,0 +1,193 @@ +/** + * 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.magnoliastripes; + +import info.magnolia.cms.beans.config.Paragraph; +import info.magnolia.cms.beans.config.Template; +import info.magnolia.cms.beans.runtime.ParagraphRenderer; +import info.magnolia.cms.beans.runtime.TemplateRenderer; +import info.magnolia.cms.core.Content; +import info.magnolia.cms.core.NodeData; +import info.magnolia.context.MgnlContext; +import info.magnolia.context.WebContext; + +import java.io.IOException; +import java.io.Writer; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import net.sourceforge.stripes.controller.DispatcherServlet; +import net.sourceforge.stripes.controller.StripesConstants; +import net.sourceforge.stripes.controller.StripesRequestWrapper; +import net.sourceforge.stripes.exception.StripesServletException; + +import org.apache.commons.lang.StringUtils; + + +/** + * <p> + * A Magnolia paragraph renderer that delegates to Stripes actions. Most of the code is just a cut and paste from + * Stripes' {@link DispatcherServlet}, adapted to work withing magnolia by: + * </p> + * <ul> + * <li>wrap the request in order to modify the request path and provide a custom requestDispatcher</li> + * <li>wrap the response in order to provide a custom Writer</li> + * <li>use a fake servlet instance/context to setup a Stripe context (there is no servlet here)</li> + * <li>injiect any paragraph property as a parameter</li> + * </ul> + * <p> + * <strong>Todo:</strong> + * </p> + * <ul> + * <li>Handle multipart forms in request wrapper (should be easy to do)</li> + * <li>A better way of handling multivalued properties in paragraph</li> + * <li>Handle binary properties in paragraph</li> + * </ul> + * @author fgiust + * @version $Id$ + */ +public class StripesRenderer implements ParagraphRenderer, TemplateRenderer +{ + + private StripesDispatcherServlet stripesDispatcherServlet = new StripesDispatcherServlet(); + + /** + * {@inheritDoc} + */ + public void renderTemplate(Template template, HttpServletRequest request, HttpServletResponse response) + throws IOException, ServletException + { + final String templatePath = template.getPath(); + Map<String, String[]> nodeDataMap = contentToMap(MgnlContext.getAggregationState().getCurrentContent()); + + renderCommon(templatePath, nodeDataMap, response.getWriter()); + } + + /** + * {@inheritDoc} + */ + public void render(Content content, Paragraph paragraph, Writer out) throws IOException + { + // @fgiust start custom magnolia setup + + final String templatePath = paragraph.getTemplatePath(); + Map<String, String[]> nodeDataMap = contentToMap(content); + + renderCommon(templatePath, nodeDataMap, out); + } + + /** + * {@inheritDoc} + */ + protected void renderCommon(String templatePath, Map<String, String[]> nodeDataMap, Writer out) throws IOException + { + + WebContext webContext = (WebContext) MgnlContext.getInstance(); + HttpServletResponse response = new MgnlStripesResponseWrapper(webContext.getResponse(), out); + + HttpServletRequest request; + try + { + + HttpServletRequest originalreq = new MgnlStripesRequestWrapper(((WebContext) MgnlContext.getInstance()) + .getRequest(), templatePath, nodeDataMap, out); + + request = new StripesRequestWrapper(originalreq); + } + catch (StripesServletException e) + { + throw new RuntimeException(e); + } + + request.setAttribute(StripesConstants.REQ_ATTR_INCLUDE_PATH, templatePath); + + try + { + stripesDispatcherServlet.doPost(request, response); + } + catch (ServletException e) + { + throw new RuntimeException(e); + } + } + + /** + * @param content paragraph node + * @return a map of Strings (converted nodedata) + */ + @SuppressWarnings("unchecked") + protected Map<String, String[]> contentToMap(Content content) + { + Collection<NodeData> paragraphsData = content.getNodeDataCollection(); + Map<String, String[]> nodeDataMap = new HashMap<String, String[]>(); + for (NodeData nodeData : paragraphsData) + { + String name = StringUtils.replaceChars(nodeData.getName(), "{}", "[]"); + String value = nodeData.getString(); + if (StringUtils.contains(name, "multiple")) + { + nodeDataMap.put(name, StringUtils.split(value, "\n")); + } + else + { + nodeDataMap.put(name, new String[]{value }); + } + } + return nodeDataMap; + } + + /** + * just needed to make the protected doPost() accessible + * @author fgiust + * @version $Id$ + */ + protected class StripesDispatcherServlet extends DispatcherServlet + { + + /** + * Stable serialVersionUID. + */ + private static final long serialVersionUID = 42L; + + /** + * {@inheritDoc} + */ + @Override + public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException + { + super.doPost(request, response); + } + + /** + * {@inheritDoc} + */ + @Override + public ServletContext getServletContext() + { + return ((WebContext) MgnlContext.getInstance()).getServletContext(); + } + + } + +} Property changes on: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: trunk/openutils-mgnlstripes/src/main/resources/META-INF/mgnlstripes.tld =================================================================== --- trunk/openutils-mgnlstripes/src/main/resources/META-INF/mgnlstripes.tld 2008-08-18 19:37:24 UTC (rev 909) +++ trunk/openutils-mgnlstripes/src/main/resources/META-INF/mgnlstripes.tld 2008-09-15 22:06:51 UTC (rev 910) @@ -1,198 +0,0 @@ -<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - version="2.0"> - <description>mgnlstripes</description> - <display-name>mgnlstripes tags</display-name> - <tlib-version>1.0</tlib-version> - <short-name>mgnlstripes</short-name> - <uri>mgnlstripes</uri> - <tag> - <description> Stripes' HTML form tag. Provides a standard HTML form tag interface, but allows other stripes input - tags to re-populate their values. Also includes a hidden field in the form for the page name that the form is - being rendered on (to allow forwarding to the same page in the case of a validation error. </description> - <display-name>form</display-name> - <name>form</name> - <tag-class>it.openutils.magnoliastripes.tag.ExtendedFormTag</tag-class> - <body-content>JSP</body-content> - <attribute> - <description> The URL to which this form will post. Expected to be a web-app relative path - the tag will prepend - the context path to any action that begins with a slash and does not already contain the context path. Should - match a URL to which an ActionBean has been bound. Required unless 'beanclass' is provided. </description> - <name>action</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description> The fully qualified name of an ActionBean class, or alternatively a Class instance for an ActionBean - class. An alternative to the 'action' attribute, the 'beanclass' attribute will generate an action appropriate - for the ActionBean identified. Note that if an "ActionBean" that does not yet exist is identified an exception - will be thrown! </description> - <name>beanclass</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <type>java.lang.Object</type> - </attribute> - <attribute> - <description> The name of the form field that should receive focus when the page is loaded. Two special values are - recognized, 'first' and the empty string; these values cause the form to set focus on the first element in the - form. If any value is set, and the form has validation errors, the behaviour is altered and the first field with - validation errors is focused instead. </description> - <name>focus</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <type>java.lang.String</type> - </attribute> - <attribute> - <description> A comma separated list of content types that it is acceptable to submit through this form. (HTML - Pass-through) </description> - <name>accept</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description> A comma separated list of possible character sets for form data. Will be written to the page as - accept-charset. (HTML Pass-through) </description> - <name>acceptcharset</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description> The mime type used to encode the content of this form. This value will be overridden if one or more - Stripes file input tags is used within the body of the form. </description> - <name>enctype</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description> The HTTP method used for sending data to the server. Options are GET and POST. Default is GET. (HTML - Pass-through) </description> - <name>method</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>The unique name of the form. (HTML Pass-through)</description> - <name>name</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description> Where the target URL is to be opened. One of _blank, _self, _parent and _top. (HTML Pass-through) - </description> - <name>target</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>Scripting code run when the form is reset. (HTML Pass-through)</description> - <name>onreset</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>Scripting code run prior to the form being submitted to the server, (HTML Pass-through)</description> - <name>onsubmit</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <!-- Start: Standard HTML attributes --> - <attribute> - <description>The CSS class to be applied to the element. (HTML Pass-through)</description> - <name>class</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>Text direction. (HTML Pass-through)</description> - <name>dir</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>A unique identifier for the HTML tag on the pgae. (HTML Pass-through)</description> - <name>id</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>The language code of the element. (HTML Pass-through)</description> - <name>lang</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>Scripting code run on each mouse click. (HTML Pass-through)</description> - <name>onclick</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>Scripting code run on a double-click of the mouse. (HTML Pass-through)</description> - <name>ondblclick</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>Scripting code run when a key is depressed. (HTML Pass-through)</description> - <name>onkeydown</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>Scripting code run when a key is pressed and released. (HTML Pass-through)</description> - <name>onkeypress</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>Scripting code run when a key is released. (HTML Pass-through)</description> - <name>onkeyup</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>Scripting code run when a mouse button is depressed. (HTML Pass-through)</description> - <name>onmousedown</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>Scripting code run when the mouse pointer is moved. (HTML Pass-through)</description> - <name>onmousemove</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>Scripting code run when the mouse pointer moves out of the element. (HTML Pass-through)</description> - <name>onmouseout</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>Scripting code run when the mouse pointer moves over the element. (HTML Pass-through)</description> - <name>onmouseover</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>Scripting code run when a mouse button is released. (HTML Pass-through)</description> - <name>onmouseup</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>Inline CSS style fragment that applies to the element (HTML Pass-through)</description> - <name>style</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>Tool-tip text for the element. (HTML Pass-through)</description> - <name>title</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <!-- End: Standard HTML attributes --> - <dynamic-attributes>false</dynamic-attributes> - </tag> -</taglib> \ No newline at end of file Modified: trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.paragraph-renderers.stripes.xml =================================================================== --- trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.paragraph-renderers.stripes.xml 2008-08-18 19:37:24 UTC (rev 909) +++ trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.paragraph-renderers.stripes.xml 2008-09-15 22:06:51 UTC (rev 910) @@ -16,7 +16,7 @@ <sv:value>stripes</sv:value> </sv:property> <sv:property sv:name="class" sv:type="String"> - <sv:value>it.openutils.magnoliastripes.StripesParagraphRenderer</sv:value> + <sv:value>it.openutils.magnoliastripes.StripesRenderer</sv:value> </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> Added: trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.template-renderers.stripes.xml =================================================================== --- trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.template-renderers.stripes.xml (rev 0) +++ trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.template-renderers.stripes.xml 2008-09-15 22:06:51 UTC (rev 910) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="stripes" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:mgnl="http://www.magnolia.info/jcr/mgnl" + xmlns:rep="internal" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" + xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:fn_old="http://www.w3.org/2004/10/xpath-functions" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:jcrfn="http://www.jcp.org/jcr/xpath-functions/1.0"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:versionable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>42369a0d-1d6c-469b-b17d-dc5171435db0</sv:value> + </sv:property> + <sv:property sv:name="name" sv:type="String"> + <sv:value>stripes</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>it.openutils.magnoliastripes.StripesRenderer</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="jcr:uuid" sv:type="String"> + <sv:value>fd0eff1b-ba74-4c6e-ab93-b8a344175496</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>2007-04-12T03:58:33.504+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2007-07-23T22:39:14.178+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2007-07-23T22:39:40.986+01:00</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:activated" sv:type="Boolean"> + <sv:value>false</sv:value> + </sv:property> + </sv:node> +</sv:node> Property changes on: trunk/openutils-mgnlstripes/src/main/resources/mgnl-bootstrap/stripes/config.modules.stripes.template-renderers.stripes.xml ___________________________________________________________________ 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...> - 2008-08-18 19:37:19
|
Revision: 909 http://openutils.svn.sourceforge.net/openutils/?rev=909&view=rev Author: fgiust Date: 2008-08-18 19:37:24 +0000 (Mon, 18 Aug 2008) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/openutils-testing4web/pom.xml Modified: trunk/openutils-testing4web/pom.xml =================================================================== --- trunk/openutils-testing4web/pom.xml 2008-08-18 19:36:54 UTC (rev 908) +++ trunk/openutils-testing4web/pom.xml 2008-08-18 19:37:24 UTC (rev 909) @@ -8,7 +8,7 @@ </parent> <artifactId>openutils-testing4web</artifactId> <name>openutils web test utils</name> - <version>1.0</version> + <version>1.1-SNAPSHOT</version> <description>openutils test utils for webapps</description> <dependencies> <dependency> @@ -95,10 +95,4 @@ <version>1.7R1</version> </dependency> </dependencies> - - <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing4web-1.0</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing4web-1.0</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing4web-1.0</url> - </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-08-18 19:36:53
|
Revision: 908 http://openutils.svn.sourceforge.net/openutils/?rev=908&view=rev Author: fgiust Date: 2008-08-18 19:36:54 +0000 (Mon, 18 Aug 2008) Log Message: ----------- [maven-release-plugin] copy for tag openutils-testing4web-1.0 Added Paths: ----------- tags/openutils-testing4web-1.0/ tags/openutils-testing4web-1.0/pom.xml tags/openutils-testing4web-1.0/src/site/ Removed Paths: ------------- tags/openutils-testing4web-1.0/pom.xml Deleted: tags/openutils-testing4web-1.0/pom.xml =================================================================== --- trunk/openutils-testing4web/pom.xml 2008-07-01 14:10:38 UTC (rev 877) +++ tags/openutils-testing4web-1.0/pom.xml 2008-08-18 19:36:54 UTC (rev 908) @@ -1,127 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils</artifactId> - <version>7</version> - <relativePath>..</relativePath> - </parent> - <artifactId>openutils-testing4web</artifactId> - <name>openutils web test utils</name> - <version>2.0-SNAPSHOT</version> - <description>openutils test utils for webapps</description> - <dependencies> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${spring.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.0</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl104-over-slf4j</artifactId> - <version>1.5.0</version> - </dependency> - <dependency> - <groupId>httpunit</groupId> - <artifactId>httpunit</artifactId> - <version>1.6.2</version> - <exclusions> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - <exclusion> - <groupId>nekohtml</groupId> - <artifactId>nekohtml</artifactId> - </exclusion> - <exclusion> - <groupId>rhino</groupId> - <artifactId>js</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler-jdt</artifactId> - <version>5.5.12</version> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>naming-resources</artifactId> - <version>5.5.15</version> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - <version>5.5.12</version> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - <version>5.5.12</version> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>naming-factory</artifactId> - <version>5.5.15</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.1.2</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-el</groupId> - <artifactId>commons-el</artifactId> - <version>1.0</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>rhino</groupId> - <artifactId>js</artifactId> - <version>1.7R1</version> - </dependency> - </dependencies> - <properties> - <spring.version>2.5.3</spring.version> - </properties> -</project> \ No newline at end of file Copied: tags/openutils-testing4web-1.0/pom.xml (from rev 907, trunk/openutils-testing4web/pom.xml) =================================================================== --- tags/openutils-testing4web-1.0/pom.xml (rev 0) +++ tags/openutils-testing4web-1.0/pom.xml 2008-08-18 19:36:54 UTC (rev 908) @@ -0,0 +1,104 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils</artifactId> + <version>7</version> + <relativePath>..</relativePath> + </parent> + <artifactId>openutils-testing4web</artifactId> + <name>openutils web test utils</name> + <version>1.0</version> + <description>openutils test utils for webapps</description> + <dependencies> + <dependency> + <groupId>httpunit</groupId> + <artifactId>httpunit</artifactId> + <version>1.6.2</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>nekohtml</groupId> + <artifactId>nekohtml</artifactId> + </exclusion> + <exclusion> + <groupId>rhino</groupId> + <artifactId>js</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler-jdt</artifactId> + <version>5.5.12</version> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>naming-resources</artifactId> + <version>5.5.15</version> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + <version>5.5.12</version> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler</artifactId> + <version>5.5.12</version> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>naming-factory</artifactId> + <version>5.5.15</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-el</groupId> + <artifactId>commons-el</artifactId> + <version>1.0</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>rhino</groupId> + <artifactId>js</artifactId> + <version>1.7R1</version> + </dependency> + </dependencies> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing4web-1.0</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing4web-1.0</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing4web-1.0</url> + </scm> +</project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-08-18 19:36:04
|
Revision: 907 http://openutils.svn.sourceforge.net/openutils/?rev=907&view=rev Author: fgiust Date: 2008-08-18 19:36:09 +0000 (Mon, 18 Aug 2008) Log Message: ----------- [maven-release-plugin] prepare release openutils-testing4web-1.0 Modified Paths: -------------- trunk/openutils-testing4web/pom.xml Modified: trunk/openutils-testing4web/pom.xml =================================================================== --- trunk/openutils-testing4web/pom.xml 2008-08-18 19:35:10 UTC (rev 906) +++ trunk/openutils-testing4web/pom.xml 2008-08-18 19:36:09 UTC (rev 907) @@ -1,5 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>net.sourceforge.openutils</groupId> @@ -9,7 +8,7 @@ </parent> <artifactId>openutils-testing4web</artifactId> <name>openutils web test utils</name> - <version>2.0-SNAPSHOT</version> + <version>1.0</version> <description>openutils test utils for webapps</description> <dependencies> <dependency> @@ -96,4 +95,10 @@ <version>1.7R1</version> </dependency> </dependencies> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing4web-1.0</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing4web-1.0</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing4web-1.0</url> + </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-08-18 19:35:11
|
Revision: 906 http://openutils.svn.sourceforge.net/openutils/?rev=906&view=rev Author: fgiust Date: 2008-08-18 19:35:10 +0000 (Mon, 18 Aug 2008) Log Message: ----------- ready for a first release Modified Paths: -------------- trunk/openutils-testing4web/pom.xml Added Paths: ----------- trunk/openutils-testing4web/src/site/ trunk/openutils-testing4web/src/site/apt/ trunk/openutils-testing4web/src/site/apt/index.apt trunk/openutils-testing4web/src/site/changes/ trunk/openutils-testing4web/src/site/changes/changes.xml trunk/openutils-testing4web/src/site/site.xml Modified: trunk/openutils-testing4web/pom.xml =================================================================== --- trunk/openutils-testing4web/pom.xml 2008-07-29 07:58:27 UTC (rev 905) +++ trunk/openutils-testing4web/pom.xml 2008-08-18 19:35:10 UTC (rev 906) @@ -13,31 +13,6 @@ <description>openutils test utils for webapps</description> <dependencies> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${spring.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.0</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl104-over-slf4j</artifactId> - <version>1.5.0</version> - </dependency> - <dependency> <groupId>httpunit</groupId> <artifactId>httpunit</artifactId> <version>1.6.2</version> @@ -121,7 +96,4 @@ <version>1.7R1</version> </dependency> </dependencies> - <properties> - <spring.version>2.5.3</spring.version> - </properties> </project> \ No newline at end of file Added: trunk/openutils-testing4web/src/site/apt/index.apt =================================================================== --- trunk/openutils-testing4web/src/site/apt/index.apt (rev 0) +++ trunk/openutils-testing4web/src/site/apt/index.apt 2008-08-18 19:35:10 UTC (rev 906) @@ -0,0 +1,27 @@ + -------------------------- + O p e n u t i l s + -------------------------- + Fabrizio Giustina + -------------------------- + +openutils-testing4web + + openutils-testing4web is a base maven artifacts that puts together all the dependencies needed to run httpunit tests + (servletunit) with an embedded version of the tomcat servlet engine, with the ability to also test jsps compiled using + jasper. + + Since it's pretty hard to find out a working list of dependencies you can now depends on this single artifact. It will + be used by other openutils packages which may offer base testcases templates. + + + +Released versions + + openutils-testing-testng: + + {{{http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-testing4web}http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-testing4web}} + + openutils-testing-junit: + + {{{http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-testing4web}http://www.mvnrepository.com/artifact/net.sourceforge.openutils/openutils-testing4web}} + Property changes on: trunk/openutils-testing4web/src/site/apt/index.apt ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/openutils-testing4web/src/site/changes/changes.xml =================================================================== --- trunk/openutils-testing4web/src/site/changes/changes.xml (rev 0) +++ trunk/openutils-testing4web/src/site/changes/changes.xml 2008-08-18 19:35:10 UTC (rev 906) @@ -0,0 +1,15 @@ +<?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="1.0" date="2008-08-18" description="initial release"> + <!-- --> + </release> + </body> +</document> \ No newline at end of file Property changes on: trunk/openutils-testing4web/src/site/changes/changes.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/openutils-testing4web/src/site/site.xml =================================================================== --- trunk/openutils-testing4web/src/site/site.xml (rev 0) +++ trunk/openutils-testing4web/src/site/site.xml 2008-08-18 19:35:10 UTC (rev 906) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="Openutils testing"> + <publishDate position="navigation-bottom" format="yyyy-MM-dd" /> + <version position="navigation-bottom" /> + <bannerRight> + <name>Openutils</name> + <src>http://openutils.sourceforge.net/images/openutils-logo.png</src> + <href>http://openutils.sourceforge.net</href> + </bannerRight> + <bannerLeft> + <name>Sourceforge</name> + <src>http://sourceforge.net/sflogo.php?group_id=150467&amp;type=2</src> + <href>http://www.sourceforge.net/projects/openutils</href> + </bannerLeft> + <body> + <head> + <link rel="icon" href="images/favicon.ico" /> + </head> + <breadcrumbs> + <item name="openutils" href="http://openutils.sourceforge.net/" /> + <item name="openutils-testing" href="http://openutils.sourceforge.net/openutils-testing4web" /> + </breadcrumbs> + <menu name="openutils openutils-testing4web"> + <item name="About" href="index.html"></item> + </menu> + <menu ref="modules" inherit="bottom" /> + <menu ref="reports" inherit="bottom" /> + </body> + <skin> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils-maven-skin</artifactId> + <version>1.1</version> + </skin> +</project> Property changes on: trunk/openutils-testing4web/src/site/site.xml ___________________________________________________________________ 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...> - 2008-07-29 07:58:19
|
Revision: 905 http://openutils.svn.sourceforge.net/openutils/?rev=905&view=rev Author: fgiust Date: 2008-07-29 07:58:27 +0000 (Tue, 29 Jul 2008) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/openutils-mgnlcontrols/pom.xml Modified: trunk/openutils-mgnlcontrols/pom.xml =================================================================== --- trunk/openutils-mgnlcontrols/pom.xml 2008-07-29 07:58:18 UTC (rev 904) +++ trunk/openutils-mgnlcontrols/pom.xml 2008-07-29 07:58:27 UTC (rev 905) @@ -9,7 +9,7 @@ <packaging>jar</packaging> <artifactId>openutils-mgnlcontrols</artifactId> <name>openutils-mgnlcontrols</name> - <version>3.5.5</version> + <version>3.5.6-SNAPSHOT</version> <licenses> <license> <name>GPLv3</name> @@ -81,10 +81,4 @@ </exclusions> </dependency> </dependencies> - - <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcontrols-3.5.5</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcontrols-3.5.5</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlcontrols-3.5.5</url> - </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-07-29 07:58:11
|
Revision: 904 http://openutils.svn.sourceforge.net/openutils/?rev=904&view=rev Author: fgiust Date: 2008-07-29 07:58:18 +0000 (Tue, 29 Jul 2008) Log Message: ----------- [maven-release-plugin] copy for tag openutils-mgnlcontrols-3.5.5 Added Paths: ----------- tags/openutils-mgnlcontrols-3.5.5/ tags/openutils-mgnlcontrols-3.5.5/pom.xml tags/openutils-mgnlcontrols-3.5.5/src/main/resources/mgnl-resources/controls/js/PipeComboBox.js Removed Paths: ------------- tags/openutils-mgnlcontrols-3.5.5/pom.xml Deleted: tags/openutils-mgnlcontrols-3.5.5/pom.xml =================================================================== --- trunk/openutils-mgnlcontrols/pom.xml 2008-07-29 07:55:41 UTC (rev 901) +++ tags/openutils-mgnlcontrols-3.5.5/pom.xml 2008-07-29 07:58:18 UTC (rev 904) @@ -1,84 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils</artifactId> - <version>8</version> - <relativePath>..</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - <artifactId>openutils-mgnlcontrols</artifactId> - <name>openutils-mgnlcontrols</name> - <version>3.5.5-SNAPSHOT</version> - <licenses> - <license> - <name>GPLv3</name> - <url>http://www.gnu.org/licenses/gpl-3.0.txt</url> - </license> - </licenses> - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - <resource> - <filtering>true</filtering> - <directory>src/main/resources</directory> - <includes> - <include>META-INF/magnolia/*</include> - </includes> - </resource> - </resources> - </build> - <dependencies> - <dependency> - <groupId>info.magnolia</groupId> - <artifactId>magnolia-core</artifactId> - <version>3.5.8</version> - <exclusions> - <exclusion> - <groupId>servlets.com</groupId> - <artifactId>cos</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>info.magnolia</groupId> - <artifactId>magnolia-module-admininterface</artifactId> - <version>3.5.8</version> - <exclusions> - <exclusion> - <groupId>servlets.com</groupId> - <artifactId>cos</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils-mgnltasks</artifactId> - <version>3.5.3</version> - </dependency> - <dependency> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils-mgnlext</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - <version>5.1</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/openutils-mgnlcontrols-3.5.5/pom.xml (from rev 903, trunk/openutils-mgnlcontrols/pom.xml) =================================================================== --- tags/openutils-mgnlcontrols-3.5.5/pom.xml (rev 0) +++ tags/openutils-mgnlcontrols-3.5.5/pom.xml 2008-07-29 07:58:18 UTC (rev 904) @@ -0,0 +1,90 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils</artifactId> + <version>8</version> + <relativePath>..</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <packaging>jar</packaging> + <artifactId>openutils-mgnlcontrols</artifactId> + <name>openutils-mgnlcontrols</name> + <version>3.5.5</version> + <licenses> + <license> + <name>GPLv3</name> + <url>http://www.gnu.org/licenses/gpl-3.0.txt</url> + </license> + </licenses> + <build> + <resources> + <resource> + <filtering>false</filtering> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + <resource> + <filtering>true</filtering> + <directory>src/main/resources</directory> + <includes> + <include>META-INF/magnolia/*</include> + </includes> + </resource> + </resources> + </build> + <dependencies> + <dependency> + <groupId>info.magnolia</groupId> + <artifactId>magnolia-core</artifactId> + <version>3.5.8</version> + <exclusions> + <exclusion> + <groupId>servlets.com</groupId> + <artifactId>cos</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>info.magnolia</groupId> + <artifactId>magnolia-module-admininterface</artifactId> + <version>3.5.8</version> + <exclusions> + <exclusion> + <groupId>servlets.com</groupId> + <artifactId>cos</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils-mgnltasks</artifactId> + <version>3.5.3</version> + </dependency> + <dependency> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils-mgnlext</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + <version>5.1</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcontrols-3.5.5</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcontrols-3.5.5</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlcontrols-3.5.5</url> + </scm> +</project> \ No newline at end of file Copied: tags/openutils-mgnlcontrols-3.5.5/src/main/resources/mgnl-resources/controls/js/PipeComboBox.js (from rev 902, trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/PipeComboBox.js) =================================================================== --- tags/openutils-mgnlcontrols-3.5.5/src/main/resources/mgnl-resources/controls/js/PipeComboBox.js (rev 0) +++ tags/openutils-mgnlcontrols-3.5.5/src/main/resources/mgnl-resources/controls/js/PipeComboBox.js 2008-07-29 07:58:18 UTC (rev 904) @@ -0,0 +1,12 @@ +var PipeComboBox = Ext.extend(Ext.form.ComboBox, { + + getValue: function() { + var v = PipeComboBox.superclass.getValue.call(this); + return this.lastSelectionText + '|' + v; + }, + + findRecord : function(prop, value) { + return PipeComboBox.superclass.findRecord.call(this, prop, value.replace(/^.*\|(.*)$/, '$1')); + } + +}); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-07-29 07:57:51
|
Revision: 903 http://openutils.svn.sourceforge.net/openutils/?rev=903&view=rev Author: fgiust Date: 2008-07-29 07:58:00 +0000 (Tue, 29 Jul 2008) Log Message: ----------- [maven-release-plugin] prepare release openutils-mgnlcontrols-3.5.5 Modified Paths: -------------- trunk/openutils-mgnlcontrols/pom.xml Modified: trunk/openutils-mgnlcontrols/pom.xml =================================================================== --- trunk/openutils-mgnlcontrols/pom.xml 2008-07-29 07:57:30 UTC (rev 902) +++ trunk/openutils-mgnlcontrols/pom.xml 2008-07-29 07:58:00 UTC (rev 903) @@ -9,7 +9,7 @@ <packaging>jar</packaging> <artifactId>openutils-mgnlcontrols</artifactId> <name>openutils-mgnlcontrols</name> - <version>3.5.5-SNAPSHOT</version> + <version>3.5.5</version> <licenses> <license> <name>GPLv3</name> @@ -81,4 +81,10 @@ </exclusions> </dependency> </dependencies> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcontrols-3.5.5</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcontrols-3.5.5</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlcontrols-3.5.5</url> + </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-07-29 07:57:21
|
Revision: 902 http://openutils.svn.sourceforge.net/openutils/?rev=902&view=rev Author: fgiust Date: 2008-07-29 07:57:30 +0000 (Tue, 29 Jul 2008) Log Message: ----------- missing combobox js Added Paths: ----------- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/PipeComboBox.js Added: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/PipeComboBox.js =================================================================== --- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/PipeComboBox.js (rev 0) +++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/PipeComboBox.js 2008-07-29 07:57:30 UTC (rev 902) @@ -0,0 +1,12 @@ +var PipeComboBox = Ext.extend(Ext.form.ComboBox, { + + getValue: function() { + var v = PipeComboBox.superclass.getValue.call(this); + return this.lastSelectionText + '|' + v; + }, + + findRecord : function(prop, value) { + return PipeComboBox.superclass.findRecord.call(this, prop, value.replace(/^.*\|(.*)$/, '$1')); + } + +}); Property changes on: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/PipeComboBox.js ___________________________________________________________________ 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...> - 2008-07-29 07:55:32
|
Revision: 901 http://openutils.svn.sourceforge.net/openutils/?rev=901&view=rev Author: fgiust Date: 2008-07-29 07:55:41 +0000 (Tue, 29 Jul 2008) Log Message: ----------- grid control now works properly also with fields containing non-standard chars in their name Modified Paths: -------------- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl trunk/openutils-mgnlcontrols/src/site/changes/changes.xml Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java =================================================================== --- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java 2008-07-27 09:20:48 UTC (rev 900) +++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/ConfigurableFreemarkerDialog.java 2008-07-29 07:55:41 UTC (rev 901) @@ -65,6 +65,8 @@ private Map configuration; + private String uuid; + /** * {@inheritDoc} */ @@ -109,6 +111,7 @@ protected Map getSubNodes(Content node) throws RepositoryException, AccessDeniedException { + this.uuid = node.getUUID(); Map values = new LinkedHashMap(); // cycles on properties and stores them in map @@ -172,6 +175,7 @@ parameters.put("request", this.getRequest()); parameters.put("debug", SystemProperty.getBooleanProperty("magnolia.develop")); parameters.put("configuration", this.configuration); + parameters.put("uuid", this.uuid); parameters.put("alreadyrendered", getRequest().getAttribute(alreadyRenderedKey) != null); this.drawHtmlPre(out); Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl =================================================================== --- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2008-07-27 09:20:48 UTC (rev 900) +++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2008-07-29 07:55:41 UTC (rev 901) @@ -8,13 +8,19 @@ [/#if] <script type="text/javascript" src="${request.contextPath}/.resources/controls/js/LinkField.js"></script> <script type="text/javascript" src="${request.contextPath}/.resources/controls/js/CheckColumn.js"></script> + <script type="text/javascript" src="${request.contextPath}/.resources/controls/js/PipeComboBox.js"></script> <link rel="stylesheet" type="text/css" href="${request.contextPath}/.resources/ext/css/ext-all.css" /> <link rel="stylesheet" type="text/css" href="${request.contextPath}/.resources/controls/css/grid.css" /> [/#if] +[#assign key = uuid?replace("-", "")] + <input type="hidden" id="${name}" name="${name}" value="${value}"/> +<div id="grid-container-${name}"> + <div id="grid-${name}"></div> +</div> [#list configuration.columns?values as colmap] [#if (colmap.type?? && colmap.type = 'combo')] @@ -29,7 +35,7 @@ <script type="text/javascript"> // <![CDATA[ -function loadTable${name}(action) { +function loadTable${key}(action) { var numOfRows= ${configuration.rows}; var hidden = document.getElementById('${name}'); @@ -73,7 +79,7 @@ editor: new Ed(new LinkField({ })) [#elseif (colmap.type?? && colmap.type = 'combo')] - editor: new Ed(new fm.ComboBox({ + editor: new Ed(new [#if (colmap.pipe?? && colmap.pipe = 'true')]PipeComboBox[#else]fm.ComboBox[/#if]({ typeAhead: true, triggerAction: 'all', transform: 'combo-${name}', @@ -120,7 +126,7 @@ icon: '${request.contextPath}/.resources/controls/img/icon-paste.png', iconCls: 'button-paste', handler: function() { - mgnlOpenWindow('/.resources/controls/clipboard.html?name=${name}', 320, 200); + mgnlOpenWindow('/.resources/controls/clipboard.html?name=${key}', 320, 200); } }], viewConfig: { @@ -157,7 +163,7 @@ hidden._grid = grid; } -function paste${name}(text) { +function paste${key}(text) { var hidden = document.getElementById('${name}'); var grid = hidden._grid; var rows, i, I; @@ -221,10 +227,11 @@ } Ext.onReady(function(){ - loadTable${name}('load','${name}'); + loadTable${key}('load','${name}'); }); // ]]> </script> + Modified: trunk/openutils-mgnlcontrols/src/site/changes/changes.xml =================================================================== --- trunk/openutils-mgnlcontrols/src/site/changes/changes.xml 2008-07-27 09:20:48 UTC (rev 900) +++ trunk/openutils-mgnlcontrols/src/site/changes/changes.xml 2008-07-29 07:55:41 UTC (rev 901) @@ -8,6 +8,10 @@ <author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author> </properties> <body> + <release version="3.5.5" date="2008-07-29" description=""> + <action type="fix" dev="fgiust">grid control now works properly also with fields containing non-standard chars + in their name</action> + </release> <release version="3.5.4" date="2008-07-21" description=""> <action type="fix" dev="fgiust">esternal javascript are now included only once when using multiple grid controls in the same dialog</action> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-07-27 09:20:38
|
Revision: 900 http://openutils.svn.sourceforge.net/openutils/?rev=900&view=rev Author: fgiust Date: 2008-07-27 09:20:48 +0000 (Sun, 27 Jul 2008) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/openutils-mgnltasks/pom.xml Modified: trunk/openutils-mgnltasks/pom.xml =================================================================== --- trunk/openutils-mgnltasks/pom.xml 2008-07-27 09:20:38 UTC (rev 899) +++ trunk/openutils-mgnltasks/pom.xml 2008-07-27 09:20:48 UTC (rev 900) @@ -10,7 +10,7 @@ <packaging>jar</packaging> <artifactId>openutils-mgnltasks</artifactId> <name>openutils-mgnltasks</name> - <version>3.5.5</version> + <version>3.5.6-SNAPSHOT</version> <description>A collection of useful magnolia update tasks that can be reused in custom modules</description> <licenses> <license> @@ -98,10 +98,4 @@ </snapshots> </repository> </repositories> - - <scm> - <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-3.5.5</connection> - <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-3.5.5</developerConnection> - <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnltasks-3.5.5</url> - </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2008-07-27 09:20:30
|
Revision: 899 http://openutils.svn.sourceforge.net/openutils/?rev=899&view=rev Author: fgiust Date: 2008-07-27 09:20:38 +0000 (Sun, 27 Jul 2008) Log Message: ----------- [maven-release-plugin] copy for tag openutils-mgnltasks-3.5.5 Added Paths: ----------- tags/openutils-mgnltasks-3.5.5/ tags/openutils-mgnltasks-3.5.5/pom.xml tags/openutils-mgnltasks-3.5.5/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java tags/openutils-mgnltasks-3.5.5/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java tags/openutils-mgnltasks-3.5.5/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java tags/openutils-mgnltasks-3.5.5/src/site/changes/changes.xml Removed Paths: ------------- tags/openutils-mgnltasks-3.5.5/pom.xml tags/openutils-mgnltasks-3.5.5/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java tags/openutils-mgnltasks-3.5.5/src/site/changes/changes.xml Deleted: tags/openutils-mgnltasks-3.5.5/pom.xml =================================================================== --- trunk/openutils-mgnltasks/pom.xml 2008-07-24 08:30:43 UTC (rev 892) +++ tags/openutils-mgnltasks-3.5.5/pom.xml 2008-07-27 09:20:38 UTC (rev 899) @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sourceforge.openutils</groupId> - <artifactId>openutils</artifactId> - <version>8</version> - <relativePath>..</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - <artifactId>openutils-mgnltasks</artifactId> - <name>openutils-mgnltasks</name> - <version>3.5.4-SNAPSHOT</version> - <description>A collection of useful magnolia update tasks that can be reused in custom modules</description> - <licenses> - <license> - <name>GPLv3</name> - <url>http://www.gnu.org/licenses/gpl-3.0.txt</url> - </license> - </licenses> - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - <resource> - <filtering>true</filtering> - <directory>src/main/resources</directory> - <includes> - <include>META-INF/magnolia/*</include> - </includes> - </resource> - </resources> - </build> - <dependencies> - <dependency> - <groupId>info.magnolia</groupId> - <artifactId>magnolia-core</artifactId> - <version>3.5.8</version> - <exclusions> - <exclusion> - <groupId>servlets.com</groupId> - <artifactId>cos</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>info.magnolia</groupId> - <artifactId>magnolia-module-admininterface</artifactId> - <version>3.5.8</version> - <exclusions> - <exclusion> - <groupId>servlets.com</groupId> - <artifactId>cos</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - <version>5.7</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <repositories> - <repository> - <id>repository.magnolia.info</id> - <name>magnolia repository</name> - <url>http://repo.magnolia.info/m2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> -</project> \ No newline at end of file Copied: tags/openutils-mgnltasks-3.5.5/pom.xml (from rev 898, trunk/openutils-mgnltasks/pom.xml) =================================================================== --- tags/openutils-mgnltasks-3.5.5/pom.xml (rev 0) +++ tags/openutils-mgnltasks-3.5.5/pom.xml 2008-07-27 09:20:38 UTC (rev 899) @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sourceforge.openutils</groupId> + <artifactId>openutils</artifactId> + <version>8</version> + <relativePath>..</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <packaging>jar</packaging> + <artifactId>openutils-mgnltasks</artifactId> + <name>openutils-mgnltasks</name> + <version>3.5.5</version> + <description>A collection of useful magnolia update tasks that can be reused in custom modules</description> + <licenses> + <license> + <name>GPLv3</name> + <url>http://www.gnu.org/licenses/gpl-3.0.txt</url> + </license> + </licenses> + <build> + <resources> + <resource> + <filtering>false</filtering> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + <resource> + <filtering>true</filtering> + <directory>src/main/resources</directory> + <includes> + <include>META-INF/magnolia/*</include> + </includes> + </resource> + </resources> + </build> + <dependencies> + <dependency> + <groupId>info.magnolia</groupId> + <artifactId>magnolia-core</artifactId> + <version>3.5.8</version> + <exclusions> + <exclusion> + <groupId>servlets.com</groupId> + <artifactId>cos</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>info.magnolia</groupId> + <artifactId>magnolia-module-admininterface</artifactId> + <version>3.5.8</version> + <exclusions> + <exclusion> + <groupId>servlets.com</groupId> + <artifactId>cos</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + <version>5.7</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <repositories> + <repository> + <id>repository.magnolia.info</id> + <name>magnolia repository</name> + <url>http://repo.magnolia.info/m2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-3.5.5</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-3.5.5</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnltasks-3.5.5</url> + </scm> +</project> \ No newline at end of file Copied: tags/openutils-mgnltasks-3.5.5/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java (from rev 897, trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java) =================================================================== --- tags/openutils-mgnltasks-3.5.5/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java (rev 0) +++ tags/openutils-mgnltasks-3.5.5/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java 2008-07-27 09:20:38 UTC (rev 899) @@ -0,0 +1,137 @@ +/** + * Copyright Openmind http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package it.openutils.mgnltasks; + +import info.magnolia.cms.beans.config.ContentRepository; +import info.magnolia.cms.core.Content; +import info.magnolia.cms.core.HierarchyManager; +import info.magnolia.cms.core.Path; +import info.magnolia.cms.security.AccessDeniedException; +import info.magnolia.cms.util.NodeDataUtil; +import info.magnolia.module.InstallContext; +import info.magnolia.module.delta.AbstractRepositoryTask; +import info.magnolia.module.delta.Task; +import info.magnolia.module.delta.TaskExecutionException; + +import java.util.Collection; + +import javax.jcr.RepositoryException; + + +/** + * Sets or add permissions on a repository:path for a given role. + * @author fgiust + * @version $Id: $ + */ +public class AddPermissionTask extends AbstractRepositoryTask implements Task +{ + + private final String role; + + private final String repo; + + private final String path; + + private final long permission; + + public AddPermissionTask(String role, String repo, String path, long permission) + { + super("Setup permissions on " + repo + ":" + path + " for " + role, "Setup permissions on " + + repo + + ":" + + path + + " for " + + role); + this.role = role; + this.repo = repo; + this.path = path; + this.permission = permission; + + } + + /** + * {@inheritDoc} + */ + @Override + protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException + { + + HierarchyManager hm = installContext.getHierarchyManager(ContentRepository.USER_ROLES); + + Content roleNode = hm.getContent("/" + role); + + setupAcl(roleNode, repo, path, permission); + } + + /** + * @param role + * @param repository + * @param newpermissions + * @throws RepositoryException + * @throws AccessDeniedException + */ + @SuppressWarnings("unchecked") + private void setupAcl(Content role, String repository, String path, long newpermissions) + throws RepositoryException, AccessDeniedException + { + Content acls = role.getChildByName("acl_" + repository); + + if (acls == null) + { + acls = role.createContent("acl_" + repository, "mgnl:contentNode"); + } + + Collection<Content> children = acls.getChildren(); + + boolean found = false; + for (Content acl : children) + { + String aclPath = acl.getNodeData("path").getString(); + if (path.equals(aclPath)) + { + found = true; + + long permissions = acl.getNodeData("permissions").getLong(); + if (permissions != newpermissions) + { + setPermission(acl, path, newpermissions); + } + } + } + if (!found) + { + Content acl = acls.createContent(Path.getUniqueLabel(acls, "0"), "mgnl:contentNode"); + setPermission(acl, path, newpermissions); + + } + } + + /** + * @param acl + * @param newpermissions + * @throws RepositoryException + * @throws AccessDeniedException + */ + private void setPermission(Content acl, String path, long newpermissions) throws RepositoryException, + AccessDeniedException + { + log.info("Setting permissions for {} to {}", this.repo + ":" + path, this.role); + NodeDataUtil.getOrCreate(acl, "path").setValue(path); + NodeDataUtil.getOrCreate(acl, "permissions").setValue(newpermissions); + } +} Deleted: tags/openutils-mgnltasks-3.5.5/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java =================================================================== --- trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2008-07-24 08:30:43 UTC (rev 892) +++ tags/openutils-mgnltasks-3.5.5/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2008-07-27 09:20:38 UTC (rev 899) @@ -1,157 +0,0 @@ -/** - * Copyright Openmind http://www.openmindonline.it - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package it.openutils.mgnltasks; - -import info.magnolia.cms.beans.config.ContentRepository; -import info.magnolia.cms.core.Content; -import info.magnolia.cms.core.HierarchyManager; -import info.magnolia.cms.core.search.Query; -import info.magnolia.cms.core.search.QueryManager; -import info.magnolia.module.InstallContext; -import info.magnolia.module.delta.AbstractRepositoryTask; -import info.magnolia.module.delta.TaskExecutionException; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; - -import javax.jcr.RepositoryException; -import javax.jcr.query.InvalidQueryException; - -import org.apache.commons.lang.StringUtils; - - -/** - * An abstract task that check for invalid templates/paragraphs. Should not be used directly, see - * {@link CheckMissingTemplatesTask} and {@link CheckMissingParagraphsTask} instead. - * @author fgiust - * @version $Id: $ - */ -public abstract class BaseCheckMissingTask extends AbstractRepositoryTask -{ - - private final String templateOrParagraph; - - private final String nodetype; - - /** - * @param templateOrParagraph "template" or "paragraph" - * @param nodetype node type foc checked nodes - */ - public BaseCheckMissingTask(String templateOrParagraph, String nodetype) - { - super("Check " + templateOrParagraph + "s task", "Checking pages configured with missing " - + templateOrParagraph - + "s"); - this.templateOrParagraph = templateOrParagraph; - this.nodetype = nodetype; - - } - - /** - * {@inheritDoc} - */ - @SuppressWarnings("unchecked") - @Override - protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException - { - - QueryManager configQueryManager = installContext - .getHierarchyManager(ContentRepository.CONFIG) - .getQueryManager(); - - Collection<Content> templates = configQueryManager.createQuery( - "//modules/*/" + templateOrParagraph + "s/*", - Query.XPATH).execute().getContent("mgnl:contentNode"); - - List<String> templ = new ArrayList<String>(); - Iterator<Content> availableTemplates = templates.iterator(); - while (availableTemplates.hasNext()) - { - Content template = availableTemplates.next(); - templ.add(template.getName()); - } - - checkInvalidPages(installContext, templ); - - } - - /** - * @param installContext - * @param templates - * @throws RepositoryException - * @throws InvalidQueryException - */ - @SuppressWarnings("unchecked") - private void checkInvalidPages(InstallContext installContext, List<String> templates) throws RepositoryException, - InvalidQueryException - { - HierarchyManager hm = installContext.getHierarchyManager(ContentRepository.WEBSITE); - - QueryManager qm = hm.getQueryManager(); - - StringBuilder query = new StringBuilder("//*[jcr:primaryType='" - + this.nodetype - + "' and MetaData/mgnl:template and not("); - - Iterator<String> nameIterator = templates.iterator(); - while (nameIterator.hasNext()) - { - String template = nameIterator.next(); - - query.append("MetaData/mgnl:template='"); - query.append(template); - query.append("'"); - if (nameIterator.hasNext()) - { - query.append(" or "); - } - } - - query.append(")]"); - - String queryAAsString = query.toString(); - - log.debug("Running query: {}", queryAAsString); - - Collection<Content> nodes = qm.createQuery(queryAAsString, Query.XPATH).execute().getContent(this.nodetype); - - int count = 0; - StringBuilder sb = new StringBuilder(); - - for (Content page : nodes) - { - String template = page.getMetaData().getTemplate(); - - if (StringUtils.isNotEmpty(template)) - { - count++; - sb.append(page.getHandle()); - sb.append(" "); - sb.append(template); - sb.append("\n"); - } - } - - if (count > 0) - { - log.error("Found {} pages with invalid templates:\n{}", count, sb.toString()); - } - } -} Copied: tags/openutils-mgnltasks-3.5.5/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java (from rev 896, trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java) =================================================================== --- tags/openutils-mgnltasks-3.5.5/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java (rev 0) +++ tags/openutils-mgnltasks-3.5.5/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java 2008-07-27 09:20:38 UTC (rev 899) @@ -0,0 +1,157 @@ +/** + * Copyright Openmind http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package it.openutils.mgnltasks; + +import info.magnolia.cms.beans.config.ContentRepository; +import info.magnolia.cms.core.Content; +import info.magnolia.cms.core.HierarchyManager; +import info.magnolia.cms.core.search.Query; +import info.magnolia.cms.core.search.QueryManager; +import info.magnolia.module.InstallContext; +import info.magnolia.module.delta.AbstractRepositoryTask; +import info.magnolia.module.delta.TaskExecutionException; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; + +import javax.jcr.RepositoryException; +import javax.jcr.query.InvalidQueryException; + +import org.apache.commons.lang.StringUtils; + + +/** + * An abstract task that check for invalid templates/paragraphs. Should not be used directly, see + * {@link CheckMissingTemplatesTask} and {@link CheckMissingParagraphsTask} instead. + * @author fgiust + * @version $Id: $ + */ +public abstract class BaseCheckMissingTask extends AbstractRepositoryTask +{ + + private final String templateOrParagraph; + + private final String nodetype; + + /** + * @param templateOrParagraph "template" or "paragraph" + * @param nodetype node type foc checked nodes + */ + public BaseCheckMissingTask(String templateOrParagraph, String nodetype) + { + super("Check " + templateOrParagraph + "s task", "Checking pages configured with missing " + + templateOrParagraph + + "s"); + this.templateOrParagraph = templateOrParagraph; + this.nodetype = nodetype; + + } + + /** + * {@inheritDoc} + */ + @SuppressWarnings("unchecked") + @Override + protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException + { + + QueryManager configQueryManager = installContext + .getHierarchyManager(ContentRepository.CONFIG) + .getQueryManager(); + + Collection<Content> templates = configQueryManager.createQuery( + "//modules/*/" + templateOrParagraph + "s/*", + Query.XPATH).execute().getContent("mgnl:contentNode"); + + List<String> templ = new ArrayList<String>(); + Iterator<Content> availableTemplates = templates.iterator(); + while (availableTemplates.hasNext()) + { + Content template = availableTemplates.next(); + templ.add(template.getName()); + } + + checkInvalidPages(installContext, templ); + + } + + /** + * @param installContext + * @param templates + * @throws RepositoryException + * @throws InvalidQueryException + */ + @SuppressWarnings("unchecked") + private void checkInvalidPages(InstallContext installContext, List<String> templates) throws RepositoryException, + InvalidQueryException + { + HierarchyManager hm = installContext.getHierarchyManager(ContentRepository.WEBSITE); + + QueryManager qm = hm.getQueryManager(); + + StringBuilder query = new StringBuilder("//*[jcr:primaryType='" + + this.nodetype + + "' and MetaData/mgnl:template and not("); + + Iterator<String> nameIterator = templates.iterator(); + while (nameIterator.hasNext()) + { + String template = nameIterator.next(); + + query.append("MetaData/mgnl:template='"); + query.append(template); + query.append("'"); + if (nameIterator.hasNext()) + { + query.append(" or "); + } + } + + query.append(")]"); + + String queryAAsString = query.toString(); + + log.debug("Running query: {}", queryAAsString); + + Collection<Content> nodes = qm.createQuery(queryAAsString, Query.XPATH).execute().getContent(this.nodetype); + + int count = 0; + StringBuilder sb = new StringBuilder(); + + for (Content page : nodes) + { + String template = page.getMetaData().getTemplate(); + + if (StringUtils.isNotEmpty(template)) + { + count++; + sb.append(page.getHandle()); + sb.append(" "); + sb.append(template); + sb.append("\n"); + } + } + + if (count > 0) + { + log.error("Found {} pages with invalid " + templateOrParagraph + "s:\n{}", count, sb.toString()); + } + } +} Copied: tags/openutils-mgnltasks-3.5.5/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java (from rev 897, trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java) =================================================================== --- tags/openutils-mgnltasks-3.5.5/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java (rev 0) +++ tags/openutils-mgnltasks-3.5.5/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java 2008-07-27 09:20:38 UTC (rev 899) @@ -0,0 +1,93 @@ +/** + * Copyright Openmind http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package it.openutils.mgnltasks; + +import info.magnolia.cms.beans.config.ContentRepository; +import info.magnolia.cms.core.Content; +import info.magnolia.cms.core.HierarchyManager; +import info.magnolia.cms.core.ItemType; +import info.magnolia.cms.util.ContentUtil; +import info.magnolia.module.InstallContext; +import info.magnolia.module.delta.AbstractRepositoryTask; +import info.magnolia.module.delta.TaskExecutionException; + +import java.util.Collection; + +import javax.jcr.RepositoryException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * Adds a default repository permissions for all the configured users, only if there is no acl set for the given + * repository. + * @author fgiust + * @version $Id: $ + */ +public class CreateDefaultRepositoryAclForAllUsersTask extends AbstractRepositoryTask +{ + + private static Logger log = LoggerFactory.getLogger(CreateDefaultRepositoryAclForAllUsersTask.class); + + private String repository; + + private long permissions; + + public CreateDefaultRepositoryAclForAllUsersTask(String repository, long permissions) + { + super("Adding permissions on " + repository + " repository", "Adding permissions on " + + repository + + " repository"); + this.repository = repository; + this.permissions = permissions; + } + + @SuppressWarnings("unchecked") + @Override + protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException + { + HierarchyManager hm = ctx.getHierarchyManager(ContentRepository.USER_ROLES); + final Content parentNode = hm.getContent("/"); + + final Collection<Content> childNodes = ContentUtil.collectAllChildren(parentNode, ItemType.ROLE); + + for (Content content : childNodes) + { + operateOnChildNode(content, ctx); + } + } + + protected void operateOnChildNode(Content node, InstallContext ctx) throws RepositoryException, + TaskExecutionException + { + + String aclpath = "acl_" + repository; + + if (!node.hasContent(aclpath)) + { + log.info("adding permissions on {} to role {}", repository, node.getName()); + + Content aclnode = node.createContent(aclpath, ItemType.CONTENTNODE); + Content permNode = aclnode.createContent("0", ItemType.CONTENTNODE); + permNode.createNodeData("path", "/*"); + permNode.createNodeData("permissions", new Long(permissions)); + } + } + +} Deleted: tags/openutils-mgnltasks-3.5.5/src/site/changes/changes.xml =================================================================== --- trunk/openutils-mgnltasks/src/site/changes/changes.xml 2008-07-24 08:30:43 UTC (rev 892) +++ tags/openutils-mgnltasks-3.5.5/src/site/changes/changes.xml 2008-07-27 09:20:38 UTC (rev 899) @@ -1,34 +0,0 @@ -<?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="3.5.4" date="2008-07-24" description=""> - <action type="add" dev="fgiust">new tasks: CheckMissingTemplatesTask, CheckMissingParagraphsTask, - ReplaceTemplateTask</action> - </release> - <release version="3.5.3" date="2008-06-24" description=""> - <action type="add" dev="fgiust">new CheckAndCreateRoleTask and CheckAndCreateGroupTask</action> - <action type="update" dev="fgiust">AnonymousUserSetupTask now also takes care of changing - permissions on URIs</action> - </release> - <release version="3.5.2" date="2008-06-08" description=""> - <action type="add" dev="fgiust">Added [modulename].update.disabled property in SimpleModuleVersionHandler that - can be set to true in order to disable module configuration updates</action> - <action type="add" dev="fgiust">Added it.openutils.mgnltasks.DisableSubscribersTask</action> - </release> - <release version="3.5.1" date="2008-04-28" description="3.5.1"> - <action type="add" dev="fgiust">Added UpdateModuleVersionTask.</action> - <action type="add" dev="fgiust">Added SimpleModuleVersionHandler.</action> - </release> - <release version="3.5" date="2008-04-27" description="first release"> - <action type="add" dev="fgiust">First public release. The version is labeled "3.5" in order to make clear which - version of magnolia is required.</action> - </release> - </body> -</document> \ No newline at end of file Copied: tags/openutils-mgnltasks-3.5.5/src/site/changes/changes.xml (from rev 897, trunk/openutils-mgnltasks/src/site/changes/changes.xml) =================================================================== --- tags/openutils-mgnltasks-3.5.5/src/site/changes/changes.xml (rev 0) +++ tags/openutils-mgnltasks-3.5.5/src/site/changes/changes.xml 2008-07-27 09:20:38 UTC (rev 899) @@ -0,0 +1,37 @@ +<?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="3.5.5" date="2008-07-27" description=""> + <action type="add" dev="fgiust">new tasks: AddPermissionTask, CreateDefaultRepositoryAclForAllUsersTask</action> + </release> + <release version="3.5.4" date="2008-07-24" description=""> + <action type="add" dev="fgiust">new tasks: CheckMissingTemplatesTask, CheckMissingParagraphsTask, + ReplaceTemplateTask</action> + </release> + <release version="3.5.3" date="2008-06-24" description=""> + <action type="add" dev="fgiust">new CheckAndCreateRoleTask and CheckAndCreateGroupTask</action> + <action type="update" dev="fgiust">AnonymousUserSetupTask now also takes care of changing + permissions on URIs</action> + </release> + <release version="3.5.2" date="2008-06-08" description=""> + <action type="add" dev="fgiust">Added [modulename].update.disabled property in SimpleModuleVersionHandler that + can be set to true in order to disable module configuration updates</action> + <action type="add" dev="fgiust">Added it.openutils.mgnltasks.DisableSubscribersTask</action> + </release> + <release version="3.5.1" date="2008-04-28" description="3.5.1"> + <action type="add" dev="fgiust">Added UpdateModuleVersionTask.</action> + <action type="add" dev="fgiust">Added SimpleModuleVersionHandler.</action> + </release> + <release version="3.5" date="2008-04-27" description="first release"> + <action type="add" dev="fgiust">First public release. The version is labeled "3.5" in order to make clear which + version of magnolia is required.</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: <fg...@us...> - 2008-07-27 09:20:05
|
Revision: 898 http://openutils.svn.sourceforge.net/openutils/?rev=898&view=rev Author: fgiust Date: 2008-07-27 09:20:14 +0000 (Sun, 27 Jul 2008) Log Message: ----------- [maven-release-plugin] prepare release openutils-mgnltasks-3.5.5 Modified Paths: -------------- trunk/openutils-mgnltasks/pom.xml Modified: trunk/openutils-mgnltasks/pom.xml =================================================================== --- trunk/openutils-mgnltasks/pom.xml 2008-07-27 09:19:30 UTC (rev 897) +++ trunk/openutils-mgnltasks/pom.xml 2008-07-27 09:20:14 UTC (rev 898) @@ -10,7 +10,7 @@ <packaging>jar</packaging> <artifactId>openutils-mgnltasks</artifactId> <name>openutils-mgnltasks</name> - <version>3.5.5-SNAPSHOT</version> + <version>3.5.5</version> <description>A collection of useful magnolia update tasks that can be reused in custom modules</description> <licenses> <license> @@ -98,4 +98,10 @@ </snapshots> </repository> </repositories> + + <scm> + <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-3.5.5</connection> + <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnltasks-3.5.5</developerConnection> + <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnltasks-3.5.5</url> + </scm> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |