Menu
▾
▴
openutils-svn — developer list with svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
| 2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
| 2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
| 2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
| 2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
| 2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
| 2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <fg...@us...> - 2012-11-25 20:19:58
|
Revision: 4133
http://openutils.svn.sourceforge.net/openutils/?rev=4133&view=rev
Author: fgiust
Date: 2012-11-25 20:19:50 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
Blocked revisions 3780-3807,3817-3820,3823-3874,3878-3888,3914-3951,3955,3957,3959,4003-4005,4007-4010,4012-4014,4016-4018,4020-4023,4025-4028,4030-4032,4034-4035,4111 via svnmerge
........
r3780 | fgiust | 2012-03-10 22:55:32 +0100 (Sat, 10 Mar 2012) | 1 line
update dependencies to magnolia 4.5
........
r3781 | fgiust | 2012-03-10 23:22:36 +0100 (Sat, 10 Mar 2012) | 1 line
initial cleanup
........
r3782 | fgiust | 2012-03-10 23:30:37 +0100 (Sat, 10 Mar 2012) | 1 line
remove dependency from compatibility taglib
........
r3783 | fgiust | 2012-03-10 23:50:48 +0100 (Sat, 10 Mar 2012) | 1 line
fix compilation
........
r3784 | fgiust | 2012-03-13 09:20:41 +0100 (Tue, 13 Mar 2012) | 1 line
bump all versions to 5.0.0-SNAPSHOT
........
r3785 | diego_schivo | 2012-03-14 08:43:50 +0100 (Wed, 14 Mar 2012) | 1 line
magnolia-test-webapp: fix Java Build Path Problems
........
r3786 | diego_schivo | 2012-03-14 08:47:31 +0100 (Wed, 14 Mar 2012) | 1 line
AdvancedResultItemImpl: fix compile error
........
r3787 | diego_schivo | 2012-03-14 09:21:25 +0100 (Wed, 14 Mar 2012) | 1 line
AclSearchIndexTest: fix compile error
........
r3788 | diego_schivo | 2012-03-14 10:23:48 +0100 (Wed, 14 Mar 2012) | 1 line
AbstractRepositoryTestcase.initDefaultImplementations() (MgnlTestCase)
........
r3789 | diego_schivo | 2012-03-14 12:13:25 +0100 (Wed, 14 Mar 2012) | 1 line
magnolia.properties: magnolia.author.key.location
........
r3790 | diego_schivo | 2012-03-14 12:20:36 +0100 (Wed, 14 Mar 2012) | 1 line
magnolia-rendering, magnolia-module-dms
........
r3791 | diego_schivo | 2012-03-14 14:41:25 +0100 (Wed, 14 Mar 2012) | 1 line
5.0.0-SNAPSHOT
........
r3792 | diego_schivo | 2012-03-14 16:48:06 +0100 (Wed, 14 Mar 2012) | 1 line
magnolia.version=4.5.1
........
r3793 | diego_schivo | 2012-03-14 17:07:32 +0100 (Wed, 14 Mar 2012) | 1 line
fix MgnlUtilsElFunctionsTest
........
r3794 | diego_schivo | 2012-03-15 07:50:32 +0100 (Thu, 15 Mar 2012) | 1 line
MgnlUtilsElFunctions: MgnlContext.getSubject()
........
r3795 | diego_schivo | 2012-03-15 07:51:47 +0100 (Thu, 15 Mar 2012) | 1 line
openutils-mgnlcas: fix compile errors
........
r3796 | diego_schivo | 2012-03-15 07:53:34 +0100 (Thu, 15 Mar 2012) | 1 line
TagCloudManagerTest: import static
........
r3797 | diego_schivo | 2012-03-15 11:02:47 +0100 (Thu, 15 Mar 2012) | 1 line
openutils-mgnlutils: ExtendedTemplate.getTemplateAvailability()
........
r3798 | diego_schivo | 2012-03-15 11:04:44 +0100 (Thu, 15 Mar 2012) | 1 line
openutils-mgnlutils: AutoGenerateTemplateModel
........
r3799 | diego_schivo | 2012-03-15 11:21:48 +0100 (Thu, 15 Mar 2012) | 1 line
openutils-mgnlmail: EmailFromPage
........
r3800 | diego_schivo | 2012-03-15 11:32:22 +0100 (Thu, 15 Mar 2012) | 1 line
dependency: magnolia-templating-compatibility
........
r3801 | diego_schivo | 2012-03-15 11:32:49 +0100 (Thu, 15 Mar 2012) | 1 line
EmailFromPage.java: revert
........
r3802 | diego_schivo | 2012-03-15 11:34:51 +0100 (Thu, 15 Mar 2012) | 1 line
openutils-mgnlmessages: MagnoliaTemplatingUtilities
........
r3803 | diego_schivo | 2012-03-15 11:46:43 +0100 (Thu, 15 Mar 2012) | 1 line
StudentLevelListener: MgnlContext.getSubject()
........
r3804 | diego_schivo | 2012-03-15 11:48:02 +0100 (Thu, 15 Mar 2012) | 1 line
RenderingServingZipFilter
........
r3805 | diego_schivo | 2012-03-15 12:05:45 +0100 (Thu, 15 Mar 2012) | 1 line
openutils-mgnlrules: magnolia-templating-compatibility dependency
........
r3806 | diego_schivo | 2012-03-15 12:07:59 +0100 (Thu, 15 Mar 2012) | 1 line
StripesMagnoliaFilter: JCRSessionStrategy
........
r3807 | diego_schivo | 2012-03-15 12:21:19 +0100 (Thu, 15 Mar 2012) | 1 line
MgnlActionResolver
........
r3817 | diego_schivo | 2012-03-19 09:34:15 +0100 (Mon, 19 Mar 2012) | 1 line
SampleStripesActionBean
........
r3818 | diego_schivo | 2012-03-19 09:35:35 +0100 (Mon, 19 Mar 2012) | 1 line
samples-stripes jsp
........
r3819 | diego_schivo | 2012-03-19 09:37:08 +0100 (Mon, 19 Mar 2012) | 1 line
stripes mgnl-bootstrap-samples
........
r3820 | diego_schivo | 2012-03-19 09:38:37 +0100 (Mon, 19 Mar 2012) | 1 line
StripesModuleVersionHandler: SamplesExtractionTask
........
r3823 | diego_schivo | 2012-03-19 10:03:18 +0100 (Mon, 19 Mar 2012) | 1 line
StripesRenderer
........
r3824 | diego_schivo | 2012-03-19 10:18:47 +0100 (Mon, 19 Mar 2012) | 1 line
StripesConfigurationPage
........
r3825 | diego_schivo | 2012-03-19 10:41:41 +0100 (Mon, 19 Mar 2012) | 1 line
config.modules.stripes.templates.pages.samplestripes.xml
........
r3826 | diego_schivo | 2012-03-19 11:15:38 +0100 (Mon, 19 Mar 2012) | 1 line
web.xml: ActionResolver.Packages
........
r3827 | diego_schivo | 2012-03-19 11:31:31 +0100 (Mon, 19 Mar 2012) | 1 line
stripes renderer
........
r3828 | diego_schivo | 2012-03-19 11:44:33 +0100 (Mon, 19 Mar 2012) | 1 line
ItemType.PAGE
........
r3829 | diego_schivo | 2012-03-20 10:01:40 +0100 (Tue, 20 Mar 2012) | 1 line
SampleStrutsAction
........
r3830 | diego_schivo | 2012-03-20 10:04:20 +0100 (Tue, 20 Mar 2012) | 1 line
struts-config.xml
........
r3831 | diego_schivo | 2012-03-20 16:31:59 +0100 (Tue, 20 Mar 2012) | 1 line
MgnlStrutsModuleVersionHandler
........
r3832 | diego_schivo | 2012-03-20 16:33:00 +0100 (Tue, 20 Mar 2012) | 1 line
mgnl-bootstrap-samples/struts11
........
r3833 | diego_schivo | 2012-03-20 16:34:24 +0100 (Tue, 20 Mar 2012) | 1 line
mgnl-files/templates/samples-struts11
........
r3834 | diego_schivo | 2012-03-20 16:44:19 +0100 (Tue, 20 Mar 2012) | 1 line
StripesRenderer: renderingCtx.getAppendable()
........
r3835 | diego_schivo | 2012-03-20 16:50:42 +0100 (Tue, 20 Mar 2012) | 1 line
StrutsParagraph
........
r3836 | diego_schivo | 2012-03-20 16:54:18 +0100 (Tue, 20 Mar 2012) | 1 line
StrutsRenderer
........
r3837 | diego_schivo | 2012-03-20 16:58:20 +0100 (Tue, 20 Mar 2012) | 1 line
StrutsParagraphRegister
........
r3838 | diego_schivo | 2012-03-20 16:59:29 +0100 (Tue, 20 Mar 2012) | 1 line
StrutsConfigurationPage
........
r3839 | diego_schivo | 2012-03-20 17:02:42 +0100 (Tue, 20 Mar 2012) | 1 line
config.modules.struts11.renderers.struts.xml
........
r3840 | diego_schivo | 2012-03-20 17:03:16 +0100 (Tue, 20 Mar 2012) | 1 line
config.modules.struts11.templates.pages.sampleStruts.xml
........
r3841 | diego_schivo | 2012-03-20 17:09:57 +0100 (Tue, 20 Mar 2012) | 1 line
config.modules.struts11.templates.pages.samplestruts.xml
........
r3842 | diego_schivo | 2012-03-20 17:10:28 +0100 (Tue, 20 Mar 2012) | 1 line
config.modules.struts11.templates.pages.samplestruts.xml
........
r3843 | diego_schivo | 2012-03-20 17:11:17 +0100 (Tue, 20 Mar 2012) | 1 line
website.sample-struts.xml
........
r3844 | diego_schivo | 2012-03-20 17:13:42 +0100 (Tue, 20 Mar 2012) | 1 line
struts-config.xml
........
r3845 | diego_schivo | 2012-03-20 17:14:00 +0100 (Tue, 20 Mar 2012) | 1 line
web.xml: MgnlStrutsServlet
........
r3846 | diego_schivo | 2012-03-20 17:19:21 +0100 (Tue, 20 Mar 2012) | 1 line
paragraph.jsp
........
r3847 | diego_schivo | 2012-03-20 17:21:55 +0100 (Tue, 20 Mar 2012) | 1 line
website.samples-stripes.xml
........
r3848 | diego_schivo | 2012-03-20 17:27:48 +0100 (Tue, 20 Mar 2012) | 1 line
StudentLevelListener
........
r3849 | diego_schivo | 2012-03-20 17:36:29 +0100 (Tue, 20 Mar 2012) | 1 line
openutils-mgnlmail: EmailFromPage
........
r3850 | diego_schivo | 2012-03-20 17:50:46 +0100 (Tue, 20 Mar 2012) | 1 line
openutils-mgnlmessages
........
r3851 | diego_schivo | 2012-03-20 17:56:11 +0100 (Tue, 20 Mar 2012) | 1 line
openutils-mgnlrules
........
r3852 | diego_schivo | 2012-03-20 18:10:59 +0100 (Tue, 20 Mar 2012) | 1 line
magnolia-test-webapp: pom.xml
........
r3853 | diego_schivo | 2012-03-20 18:29:35 +0100 (Tue, 20 Mar 2012) | 1 line
stk.version=2.0
........
r3854 | diego_schivo | 2012-03-20 18:36:30 +0100 (Tue, 20 Mar 2012) | 1 line
magnolia-module-categorization ?
........
r3855 | diego_schivo | 2012-03-20 18:43:13 +0100 (Tue, 20 Mar 2012) | 1 line
RoleManager.addPermission
........
r3856 | diego_schivo | 2012-03-20 19:07:25 +0100 (Tue, 20 Mar 2012) | 1 line
openutils-mgnlcontextmenu components
........
r3857 | diego_schivo | 2012-03-20 19:08:02 +0100 (Tue, 20 Mar 2012) | 1 line
openutils-mgnlcontrols components
........
r3858 | diego_schivo | 2012-03-20 19:08:25 +0100 (Tue, 20 Mar 2012) | 1 line
openutils-mgnllms components
........
r3859 | diego_schivo | 2012-03-20 19:08:40 +0100 (Tue, 20 Mar 2012) | 1 line
openutils-mgnlmedia components
........
r3860 | diego_schivo | 2012-03-20 19:09:18 +0100 (Tue, 20 Mar 2012) | 1 line
openutils-mgnlmessages components
........
r3861 | diego_schivo | 2012-03-20 19:09:48 +0100 (Tue, 20 Mar 2012) | 1 line
openutils-mgnlrules components
........
r3862 | diego_schivo | 2012-03-20 19:10:03 +0100 (Tue, 20 Mar 2012) | 1 line
openutils-mgnltagcloud components
........
r3863 | diego_schivo | 2012-03-20 19:30:43 +0100 (Tue, 20 Mar 2012) | 1 line
LmsTypesManager
........
r3864 | diego_schivo | 2012-03-20 19:31:23 +0100 (Tue, 20 Mar 2012) | 1 line
ExpressionFunctionManager
........
r3865 | diego_schivo | 2012-03-20 19:36:48 +0100 (Tue, 20 Mar 2012) | 1 line
ImageProcessorsManager
........
r3866 | diego_schivo | 2012-03-20 19:39:47 +0100 (Tue, 20 Mar 2012) | 1 line
SimpleMediaAsset
........
r3867 | diego_schivo | 2012-03-20 19:42:08 +0100 (Tue, 20 Mar 2012) | 1 line
SimpleMediaContentHandler
........
r3868 | diego_schivo | 2012-03-20 19:49:02 +0100 (Tue, 20 Mar 2012) | 1 line
magnolia-module-categorization 1.2.1
........
r3869 | diego_schivo | 2012-03-20 19:49:17 +0100 (Tue, 20 Mar 2012) | 1 line
MediaUsedInManager
........
r3870 | diego_schivo | 2012-03-20 19:49:33 +0100 (Tue, 20 Mar 2012) | 1 line
JackrabbitUtil
........
r3871 | diego_schivo | 2012-03-21 06:34:36 +0100 (Wed, 21 Mar 2012) | 1 line
paragraph id
........
r3872 | diego_schivo | 2012-03-21 07:24:30 +0100 (Wed, 21 Mar 2012) | 1 line
magnolia-templating-editor
........
r3873 | diego_schivo | 2012-03-21 07:27:39 +0100 (Wed, 21 Mar 2012) | 1 line
cms, cmsfn
........
r3874 | diego_schivo | 2012-03-21 08:20:40 +0100 (Wed, 21 Mar 2012) | 1 line
template.jsp, area.jsp, paragraph.jsp
........
r3878 | diego_schivo | 2012-03-21 12:56:37 +0100 (Wed, 21 Mar 2012) | 1 line
StripesAwareParagraphManager
........
r3879 | diego_schivo | 2012-03-21 15:02:52 +0100 (Wed, 21 Mar 2012) | 1 line
config.modules.stripes.templates.pages.samplestripes.xml
........
r3880 | diego_schivo | 2012-03-21 15:07:41 +0100 (Wed, 21 Mar 2012) | 1 line
openutils-mgnlstruts11: template.jsp, area.jsp, paragraph.jsp
........
r3881 | diego_schivo | 2012-03-21 15:24:48 +0100 (Wed, 21 Mar 2012) | 1 line
fix paragraph id
........
r3882 | diego_schivo | 2012-03-21 16:01:02 +0100 (Wed, 21 Mar 2012) | 1 line
paragraph.jsp: content.text
........
r3883 | diego_schivo | 2012-03-21 16:07:52 +0100 (Wed, 21 Mar 2012) | 1 line
StrutsRenderer extends JspRenderer
........
r3884 | diego_schivo | 2012-03-21 17:15:31 +0100 (Wed, 21 Mar 2012) | 1 line
Content2BeanTest: fix NullPointerException
........
r3885 | diego_schivo | 2012-03-21 17:17:24 +0100 (Wed, 21 Mar 2012) | 1 line
JcrContainsCriteriaSearchTest: fix NullPointerException
........
r3886 | diego_schivo | 2012-03-21 17:18:34 +0100 (Wed, 21 Mar 2012) | 1 line
JcrContainsQuestionMarkTest: fix NullPointerException
........
r3887 | diego_schivo | 2012-03-21 17:19:22 +0100 (Wed, 21 Mar 2012) | 1 line
OrderingTest: fix NullPointerException
........
r3888 | diego_schivo | 2012-03-21 17:20:10 +0100 (Wed, 21 Mar 2012) | 1 line
PaginationTest: fix NullPointerException
........
r3914 | diego_schivo | 2012-04-06 11:13:57 +0200 (Fri, 06 Apr 2012) | 1 line
magnolia.version=4.5.2
........
r3915 | diego_schivo | 2012-04-06 14:04:57 +0200 (Fri, 06 Apr 2012) | 1 line
java.lang.NoSuchFieldException: accessManager
........
r3916 | diego_schivo | 2012-04-06 14:46:03 +0200 (Fri, 06 Apr 2012) | 1 line
AccessibleResultItemResultIterator: PermissionUtil.isGranted
........
r3917 | diego_schivo | 2012-04-06 15:07:00 +0200 (Fri, 06 Apr 2012) | 1 line
SecuritySupport
........
r3918 | diego_schivo | 2012-04-06 15:19:58 +0200 (Fri, 06 Apr 2012) | 1 line
MgnlUserManager
........
r3919 | diego_schivo | 2012-04-06 15:29:21 +0200 (Fri, 06 Apr 2012) | 1 line
anonymous
........
r3920 | diego_schivo | 2012-04-06 15:32:27 +0200 (Fri, 06 Apr 2012) | 1 line
SystemUserManager
........
r3921 | diego_schivo | 2012-04-06 15:36:59 +0200 (Fri, 06 Apr 2012) | 1 line
userroles.anonymous.xml
........
r3922 | diego_schivo | 2012-04-06 15:58:35 +0200 (Fri, 06 Apr 2012) | 1 line
testGetContent
........
r3923 | diego_schivo | 2012-04-06 16:00:30 +0200 (Fri, 06 Apr 2012) | 1 line
AccessibleResultItemResultIteratorTest
........
r3924 | diego_schivo | 2012-04-06 16:04:41 +0200 (Fri, 06 Apr 2012) | 1 line
XPathTextUtils
........
r3925 | diego_schivo | 2012-04-06 16:05:47 +0200 (Fri, 06 Apr 2012) | 1 line
MagnoliaCriteriaTest.java
........
r3926 | diego_schivo | 2012-04-06 16:28:06 +0200 (Fri, 06 Apr 2012) | 1 line
criteria tests
........
r3927 | diego_schivo | 2012-04-06 16:28:43 +0200 (Fri, 06 Apr 2012) | 1 line
AccessibleResultItemResultIteratorTest
........
r3928 | diego_schivo | 2012-04-06 17:16:10 +0200 (Fri, 06 Apr 2012) | 1 line
AclSearchIndexTest
........
r3929 | diego_schivo | 2012-04-06 17:27:43 +0200 (Fri, 06 Apr 2012) | 1 line
ImageUtilsTest
........
r3930 | diego_schivo | 2012-04-06 17:46:15 +0200 (Fri, 06 Apr 2012) | 1 line
jackrabbit.version=2.4.1 (https://issues.apache.org/jira/browse/JCR-3236 Can not instantiate lucene Analyzer in SearchIndex)
........
r3931 | diego_schivo | 2012-04-10 08:31:49 +0200 (Tue, 10 Apr 2012) | 1 line
bobo-browse 2.5.1
........
r3932 | diego_schivo | 2012-04-10 09:18:36 +0200 (Tue, 10 Apr 2012) | 1 line
HierarchyBoboIndexReader, TagCloudManager
........
r3933 | diego_schivo | 2012-04-10 09:20:56 +0200 (Tue, 10 Apr 2012) | 1 line
BoboSubBrowser
........
r3934 | diego_schivo | 2012-04-10 09:21:30 +0200 (Tue, 10 Apr 2012) | 1 line
useSubReaders = false
........
r3935 | diego_schivo | 2012-04-10 09:50:50 +0200 (Tue, 10 Apr 2012) | 1 line
fix testGetCachedTagCloud
........
r3936 | diego_schivo | 2012-04-10 10:07:28 +0200 (Tue, 10 Apr 2012) | 1 line
config.modules.media.templates.pages.sampleSimpleMedia.xml
........
r3937 | diego_schivo | 2012-04-10 10:14:26 +0200 (Tue, 10 Apr 2012) | 1 line
media sample paragraphs
........
r3938 | diego_schivo | 2012-04-10 10:17:30 +0200 (Tue, 10 Apr 2012) | 1 line
template.jsp
........
r3939 | diego_schivo | 2012-04-10 10:19:20 +0200 (Tue, 10 Apr 2012) | 1 line
area.jsp
........
r3940 | diego_schivo | 2012-04-10 10:26:47 +0200 (Tue, 10 Apr 2012) | 1 line
media:pages/sampleSimpleMedia
........
r3941 | diego_schivo | 2012-04-10 10:32:20 +0200 (Tue, 10 Apr 2012) | 1 line
jsp namespaces
........
r3942 | diego_schivo | 2012-04-10 10:41:44 +0200 (Tue, 10 Apr 2012) | 1 line
mgnl:component
........
r3943 | diego_schivo | 2012-04-10 10:45:03 +0200 (Tue, 10 Apr 2012) | 1 line
paragraph-grid.jsp
........
r3944 | diego_schivo | 2012-04-10 10:50:55 +0200 (Tue, 10 Apr 2012) | 1 line
taglibs
........
r3945 | diego_schivo | 2012-04-10 10:58:47 +0200 (Tue, 10 Apr 2012) | 1 line
cms, cmsfn
........
r3946 | diego_schivo | 2012-04-10 11:10:22 +0200 (Tue, 10 Apr 2012) | 1 line
cms:out, cms:setNode
........
r3947 | diego_schivo | 2012-04-10 11:19:31 +0200 (Tue, 10 Apr 2012) | 1 line
mu:canEdit()
........
r3948 | diego_schivo | 2012-04-10 11:22:13 +0200 (Tue, 10 Apr 2012) | 1 line
crop.tag
........
r3949 | diego_schivo | 2012-04-10 11:24:40 +0200 (Tue, 10 Apr 2012) | 1 line
paragraph-playlist.jsp
........
r3950 | diego_schivo | 2012-04-10 11:34:57 +0200 (Tue, 10 Apr 2012) | 1 line
paragraph-grid.jsp
........
r3951 | diego_schivo | 2012-04-10 11:45:10 +0200 (Tue, 10 Apr 2012) | 1 line
mgnl:area
........
r3955 | fgiust | 2012-05-05 19:14:37 +0200 (Sat, 05 May 2012) | 1 line
remove the mobile module from build
........
r3957 | fgiust | 2012-05-06 11:09:36 +0200 (Sun, 06 May 2012) | 1 line
update old configuration files
........
r3959 | fgiust | 2012-05-06 14:36:44 +0200 (Sun, 06 May 2012) | 1 line
update test configuration
........
r4003 | fgiust | 2012-05-06 19:05:25 +0200 (Sun, 06 May 2012) | 1 line
renaming bundle
........
r4004 | fgiust | 2012-05-06 19:07:28 +0200 (Sun, 06 May 2012) | 1 line
add "for magnolia 4.5" in bundle names
........
r4005 | fgiust | 2012-05-06 19:08:50 +0200 (Sun, 06 May 2012) | 1 line
[maven-release-plugin] prepare release openutils-mgnlcriteria-5.0.0
........
r4007 | fgiust | 2012-05-06 19:09:15 +0200 (Sun, 06 May 2012) | 1 line
[maven-release-plugin] prepare for next development iteration
........
r4008 | fgiust | 2012-05-06 19:14:40 +0200 (Sun, 06 May 2012) | 1 line
update versions
........
r4009 | fgiust | 2012-05-06 19:15:04 +0200 (Sun, 06 May 2012) | 1 line
ignores
........
r4010 | fgiust | 2012-05-06 19:16:17 +0200 (Sun, 06 May 2012) | 1 line
[maven-release-plugin] prepare release openutils-mgnltasks-5.0.0
........
r4012 | fgiust | 2012-05-06 19:16:45 +0200 (Sun, 06 May 2012) | 1 line
[maven-release-plugin] prepare for next development iteration
........
r4013 | fgiust | 2012-05-06 19:21:07 +0200 (Sun, 06 May 2012) | 1 line
update versions
........
r4014 | fgiust | 2012-05-06 19:23:12 +0200 (Sun, 06 May 2012) | 1 line
[maven-release-plugin] prepare release openutils-mgnlutils-5.0.0
........
r4016 | fgiust | 2012-05-06 19:23:39 +0200 (Sun, 06 May 2012) | 1 line
[maven-release-plugin] prepare for next development iteration
........
r4017 | fgiust | 2012-05-06 19:26:41 +0200 (Sun, 06 May 2012) | 1 line
update versions
........
r4018 | fgiust | 2012-05-06 19:27:52 +0200 (Sun, 06 May 2012) | 1 line
[maven-release-plugin] prepare release openutils-mgnlcontrols-5.0.0
........
r4020 | fgiust | 2012-05-06 19:28:18 +0200 (Sun, 06 May 2012) | 1 line
[maven-release-plugin] prepare for next development iteration
........
r4021 | fgiust | 2012-05-06 19:31:31 +0200 (Sun, 06 May 2012) | 1 line
update versions
........
r4022 | fgiust | 2012-05-06 19:36:42 +0200 (Sun, 06 May 2012) | 1 line
upgrade module dependencies
........
r4023 | fgiust | 2012-05-06 19:38:10 +0200 (Sun, 06 May 2012) | 1 line
[maven-release-plugin] prepare release openutils-mgnlmessages-5.0.0
........
r4025 | fgiust | 2012-05-06 19:38:38 +0200 (Sun, 06 May 2012) | 1 line
[maven-release-plugin] prepare for next development iteration
........
r4026 | fgiust | 2012-05-06 19:41:31 +0200 (Sun, 06 May 2012) | 1 line
update version
........
r4027 | fgiust | 2012-05-06 19:42:36 +0200 (Sun, 06 May 2012) | 1 line
fix version
........
r4028 | fgiust | 2012-05-06 19:43:06 +0200 (Sun, 06 May 2012) | 1 line
[maven-release-plugin] prepare release openutils-mgnlgroovy-5.0.0
........
r4030 | fgiust | 2012-05-06 19:43:32 +0200 (Sun, 06 May 2012) | 1 line
[maven-release-plugin] prepare for next development iteration
........
r4031 | fgiust | 2012-05-06 19:44:06 +0200 (Sun, 06 May 2012) | 1 line
update version
........
r4032 | fgiust | 2012-05-06 19:47:43 +0200 (Sun, 06 May 2012) | 1 line
[maven-release-plugin] prepare release openutils-mgnlmedia-5.0.0
........
r4034 | fgiust | 2012-05-06 19:48:10 +0200 (Sun, 06 May 2012) | 1 line
[maven-release-plugin] prepare for next development iteration
........
r4035 | fgiust | 2012-05-06 19:50:05 +0200 (Sun, 06 May 2012) | 1 line
update version
........
r4111 | diego_schivo | 2012-07-25 12:01:43 +0200 (Wed, 25 Jul 2012) | 1 line
openutils-mgnlcontextmenu dependecy on openutils-mgnlmedia: fix version
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=3780&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3781&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3782&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3783&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3784&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3785&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3786&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3787&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3788&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3789&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3790&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3791&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3792&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3793&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3794&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3795&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3796&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3797&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3798&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3799&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3800&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3801&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3802&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3803&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3804&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3805&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3806&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3807&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3817&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3818&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3819&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3820&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3823&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3824&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3825&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3826&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3827&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3828&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3829&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3830&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3831&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3832&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3833&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3834&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3835&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3836&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3837&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3838&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3839&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3840&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3841&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3842&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3843&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3844&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3845&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3846&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3847&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3848&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3849&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3850&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3851&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3852&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3853&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3854&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3855&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3856&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3857&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3858&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3859&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3860&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3861&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3862&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3863&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3864&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3865&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3866&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3867&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3868&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3869&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3870&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3871&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3872&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3873&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3874&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3878&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3879&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3880&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3881&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3882&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3883&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3884&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3885&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3886&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3887&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3888&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3914&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3915&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3916&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3917&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3918&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3919&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3920&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3921&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3922&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3923&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3924&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3925&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3926&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3927&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3928&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3929&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3930&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3931&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3932&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3933&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3934&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3935&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3936&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3937&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3938&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3939&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3940&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3941&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3942&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3943&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3944&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3945&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3946&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3947&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3948&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3949&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3950&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3951&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3955&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3957&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3959&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4003&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4004&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4005&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4007&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4008&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4009&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4010&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4012&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4013&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4014&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4016&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4017&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4018&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4020&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4021&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4022&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4023&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4025&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4026&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4027&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4028&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4030&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4031&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4032&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4034&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4035&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4111&view=rev
Property Changed:
----------------
magnoliamodules/branches/magnolia44/
Property changes on: magnoliamodules/branches/magnolia44
___________________________________________________________________
Added: svnmerge-blocked
+ /magnoliamodules/trunk:3780-3807,3817-3820,3823-3874,3878-3888,3914-3951,3955,3957,3959,4003-4005,4007-4010,4012-4014,4016-4018,4020-4023,4025-4028,4030-4032,4034-4035,4111
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-11-01 21:54:09
|
Revision: 4132
http://openutils.svn.sourceforge.net/openutils/?rev=4132&view=rev
Author: fgiust
Date: 2012-11-01 21:54:02 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2012-11-01 21:53:52 UTC (rev 4131)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2012-11-01 21:54:02 UTC (rev 4132)
@@ -12,7 +12,7 @@
<name>Stripes module for Magnolia CMS</name>
<description>A Magnolia Module that let you use Stripes Framework inside Magnolia</description>
<inceptionYear>2008</inceptionYear>
- <version>5.0.0</version>
+ <version>5.0.1-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -25,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/MGNLSTRIPES</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-5.0.0</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-5.0.0</developerConnection>
- <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-5.0.0</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlstripes</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlstripes</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlstripes</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-11-01 21:53:58
|
Revision: 4131
http://openutils.svn.sourceforge.net/openutils/?rev=4131&view=rev
Author: fgiust
Date: 2012-11-01 21:53:52 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlstripes-5.0.0
Added Paths:
-----------
tags/openutils-mgnlstripes-5.0.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-11-01 21:53:35
|
Revision: 4130
http://openutils.svn.sourceforge.net/openutils/?rev=4130&view=rev
Author: fgiust
Date: 2012-11-01 21:53:29 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlstripes-5.0.0
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2012-11-01 21:52:20 UTC (rev 4129)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml 2012-11-01 21:53:29 UTC (rev 4130)
@@ -1,6 +1,5 @@
<?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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -13,7 +12,7 @@
<name>Stripes module for Magnolia CMS</name>
<description>A Magnolia Module that let you use Stripes Framework inside Magnolia</description>
<inceptionYear>2008</inceptionYear>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -26,9 +25,9 @@
<url>http://jira.openmindlab.com/browse/MGNLSTRIPES</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlstripes</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnlstripes</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlstripes</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-5.0.0</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-5.0.0</developerConnection>
+ <url>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlstripes-5.0.0</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-11-01 21:52:27
|
Revision: 4129
http://openutils.svn.sourceforge.net/openutils/?rev=4129&view=rev
Author: fgiust
Date: 2012-11-01 21:52:20 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
update cas client version
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcas/pom.xml
magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java
Modified: magnoliamodules/trunk/openutils-mgnlcas/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2012-10-31 16:04:15 UTC (rev 4128)
+++ magnoliamodules/trunk/openutils-mgnlcas/pom.xml 2012-11-01 21:52:20 UTC (rev 4129)
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.jasig.cas.client</groupId>
<artifactId>cas-client-core</artifactId>
- <version>3.1.12</version>
+ <version>3.2.1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Modified: magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java 2012-10-31 16:04:15 UTC (rev 4128)
+++ magnoliamodules/trunk/openutils-mgnlcas/src/main/java/net/sourceforge/openutils/mgnlcas/CASAuthenticationModule.java 2012-11-01 21:52:20 UTC (rev 4129)
@@ -340,14 +340,14 @@
EntityImpl entity = new EntityImpl();
entity.addProperty(Entity.NAME, this.principal.getName());
- Map<String, String> attributes = this.principal.getAttributes();
+ Map<String, Object> attributes = this.principal.getAttributes();
- for (Map.Entry<String, String> attr : attributes.entrySet())
+ for (Map.Entry<String, Object> attr : attributes.entrySet())
{
entity.addProperty(attr.getKey(), attr.getValue());
}
- String fullName = attributes.get("title");
+ String fullName = (String) attributes.get("title");
if (fullName != null)
{
@@ -359,8 +359,8 @@
this.subject.getPrincipals().add(entity);
- String[] roles = StringUtils.split(attributes.get(rolesAttribute));
- String[] groups = StringUtils.split(attributes.get(groupsAttribute));
+ String[] roles = StringUtils.split((String) attributes.get(rolesAttribute));
+ String[] groups = StringUtils.split((String) attributes.get(groupsAttribute));
if (roles == null)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-10-31 16:04:26
|
Revision: 4128
http://openutils.svn.sourceforge.net/openutils/?rev=4128&view=rev
Author: fgiust
Date: 2012-10-31 16:04:15 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
Merged revisions 4104-4110,4112-4116,4121-4123 via svnmerge from
https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44
........
r4104 | diego_schivo | 2012-07-17 18:11:00 +0200 (Tue, 17 Jul 2012) | 1 line
MESSAGES-18 Add unit-test for RepositoryMessagesImpl
........
r4105 | diego_schivo | 2012-07-17 18:55:29 +0200 (Tue, 17 Jul 2012) | 1 line
MESSAGES-19 RepositoryMessagesImplTest.testFixIllegalArgumentExceptionOnJackrabbit2_4_1()
........
r4106 | diego_schivo | 2012-07-17 18:56:01 +0200 (Tue, 17 Jul 2012) | 1 line
MESSAGES-19 RepositoryMessagesImpl fix
........
r4107 | diego_schivo | 2012-07-18 15:38:26 +0200 (Wed, 18 Jul 2012) | 1 line
CONTROLS-51 Grid: add the possibility to store editcode columns into binary properties
........
r4108 | diego_schivo | 2012-07-18 16:34:39 +0200 (Wed, 18 Jul 2012) | 1 line
CONTROLS-51 fileNodeName
........
r4109 | diego_schivo | 2012-07-18 17:17:12 +0200 (Wed, 18 Jul 2012) | 1 line
CONTROLS-51 EditCodeGridColumnType: escapeEditCodeGridColumnValue, unescapeEditCodeGridColumnValue
........
r4110 | diego_schivo | 2012-07-18 17:28:52 +0200 (Wed, 18 Jul 2012) | 1 line
CONTROLS-51 grid-editcode.html: '
........
r4112 | diego_schivo | 2012-08-20 11:41:28 +0200 (Mon, 20 Aug 2012) | 1 line
CONTROLS-52: UUIDLinkField.js
........
r4113 | diego_schivo | 2012-08-20 12:21:41 +0200 (Mon, 20 Aug 2012) | 1 line
CONTROLS-53 Grid control: insert module version into url of column-type javascript files
........
r4114 | diego_schivo | 2012-08-23 17:55:12 +0200 (Thu, 23 Aug 2012) | 1 line
CONTROLS-53 Grid control: insert module version into url of column-type javascript files
........
r4115 | diego_schivo | 2012-09-28 18:16:33 +0200 (Fri, 28 Sep 2012) | 1 line
TAGCLOUD-19 tagcloud.tld: java.util.Map
........
r4116 | fgiust | 2012-10-05 17:37:55 +0200 (Fri, 05 Oct 2012) | 1 line
upgrade to lucene 3
........
r4121 | fgiust | 2012-10-31 15:04:49 +0100 (Wed, 31 Oct 2012) | 1 line
fix "repositories" property
........
r4122 | fgiust | 2012-10-31 15:15:59 +0100 (Wed, 31 Oct 2012) | 1 line
fix logo using new media APIs
........
r4123 | fgiust | 2012-10-31 15:19:51 +0100 (Wed, 31 Oct 2012) | 1 line
compile fix
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4104&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4105&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4106&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4107&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4108&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4109&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4110&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4112&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4113&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4114&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4115&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4116&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4121&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4122&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4123&view=rev
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-editcode.html
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml
magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld
magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml
magnoliamodules/trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/i18n/
magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/msg-bootstrap/
magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/msg-repository/
magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/test-magnolia.properties
Property Changed:
----------------
magnoliamodules/trunk/
Property changes on: magnoliamodules/trunk
___________________________________________________________________
Modified: svnmerge-integrated
- /magnoliamodules/branches/magnolia44:1-3807,3809-3812,3815-3892,3894,3899,3902,3904,3908,3912,3914-3962,3964-3965,3968,3972-3975,3977,3981,3986,3989-3991,3993,3996,3998,4001,4055-4065
+ /magnoliamodules/branches/magnolia44:1-3807,3809-3812,3815-3892,3894,3899,3902,3904,3908,3912,3914-3962,3964-3965,3968,3972-3975,3977,3981,3986,3989-3991,3993,3996,3998,4001-4035,4037-4050,4053,4055-4065,4067,4069-4127
Modified: svn:mergeinfo
- /magnoliamodules/branches/magnolia44:3809-3812,3815-3892,3952-3958,3962,3964-3965,3972-3975,3989-3991,3996,4055-4065
+ /magnoliamodules/branches/magnolia44:3809-3812,3815-3892,3952-3958,3962,3964-3965,3972-3975,3989-3991,3996,4055-4065,4104-4123
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/AbstractGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -85,7 +85,7 @@
/**
* {@inheritDoc}
*/
- public void processColumnOnLoad(String[] column, Content colConfig)
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
{
}
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -23,6 +23,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.Map;
@@ -47,7 +48,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/CheckColumn.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/CheckColumn.js\"></script>";
}
/**
@@ -83,7 +86,7 @@
/**
* {@inheritDoc}
*/
- public void processColumnOnLoad(String[] column, Content colConfig)
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
{
// TODO Auto-generated method stub
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.Map;
@@ -41,7 +42,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/ColorField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/ColorField.js\"></script>";
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.ArrayList;
import java.util.List;
@@ -46,9 +47,12 @@
StringBuilder result = new StringBuilder(super.getHeadSnippet());
result.append("<script type=\"text/javascript\" src=\"");
result.append(MgnlContext.getContextPath());
- result.append("/.resources/controls/js/PipeComboBox.js\"></script>");
+ result.append("/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/PipeComboBox.js\"></script>");
// Combobox must be patched because of a bug. For reference, see:
// http://www.sencha.com/forum/showthread.php?17465-1.1.1-Local-ComboBox-data-store-filter-not-cleared-on-call-to-setValue%28%29
+ result.append("<script type=\"text/javascript\">");
result.append("var PatchedComboBox = Ext.extend(Ext.form.ComboBox, {");
result.append(" setValue: function(v) {");
result.append(" this.store.clearFilter();");
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -19,12 +19,36 @@
package net.sourceforge.openutils.mgnlcontrols.configuration;
+import info.magnolia.cms.beans.runtime.Document;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.NodeData;
+import info.magnolia.cms.core.Path;
import info.magnolia.cms.i18n.Messages;
+import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
+import info.magnolia.module.admininterface.SaveHandlerImpl;
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
import java.util.Map;
+import javax.jcr.RepositoryException;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+import org.safehaus.uuid.UUIDGenerator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
/**
* @author diego
* @version $Id: $
@@ -32,6 +56,18 @@
public class EditCodeGridColumnType extends AbstractGridColumnType
{
+ public static String escapeEditCodeGridColumnValue(String value)
+ {
+ return StringEscapeUtils.escapeJava(StringEscapeUtils.escapeXml(value));
+ }
+
+ public static String unescapeEditCodeGridColumnValue(String value)
+ {
+ return StringEscapeUtils.unescapeXml(StringEscapeUtils.unescapeJava(value));
+ }
+
+ private Logger log = LoggerFactory.getLogger(getClass());
+
/**
* {@inheritDoc}
*/
@@ -40,13 +76,122 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/EditCodeField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/EditCodeField.js\"></script>";
}
/**
* {@inheritDoc}
*/
@Override
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
+ {
+ if (NodeDataUtil.getBoolean(colConfig, "binary", false))
+ {
+ HierarchyManager hm = storageNode.getHierarchyManager();
+ for (int index = 0; index < column.length; index++)
+ {
+ String value = StringUtils.EMPTY;
+ String link = StringUtils.trim(column[index]);
+ if (StringUtils.isNotBlank(link))
+ {
+ NodeData nodeData = null;
+ try
+ {
+ nodeData = hm.getNodeData(storageNode.getHandle()
+ + "/"
+ + StringUtils.substringBeforeLast(link, "/"));
+ }
+ catch (RepositoryException e)
+ {
+ log.warn(e.getMessage(), e);
+ }
+ if (nodeData != null)
+ {
+ try
+ {
+ value = escapeEditCodeGridColumnValue(StringUtils.join(
+ IOUtils.readLines(nodeData.getStream(), "UTF-8"),
+ '\n'));
+ }
+ catch (Exception e)
+ {
+ log.warn(e.getMessage(), e);
+ }
+ }
+ }
+ column[index] = value;
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void processColumnOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
+ throws RepositoryException, AccessDeniedException
+ {
+ if (NodeDataUtil.getBoolean(colConfig, "binary", false))
+ {
+ String filename = NodeDataUtil.getString(colConfig, "binaryFilename", "file.txt");
+ String type = NodeDataUtil.getString(colConfig, "binaryType", "text/plain");
+ HierarchyManager hm = parentNode.getHierarchyManager();
+ Content filesNode = ContentUtil.getOrCreateContent(parentNode, propertyName
+ + "_"
+ + colConfig.getName()
+ + "_files", ItemType.CONTENTNODE);
+
+ for (Iterator<NodeData> iter = filesNode.getNodeDataCollection().iterator(); iter.hasNext();)
+ {
+ NodeData fileNodeData = iter.next();
+ fileNodeData.delete();
+ }
+
+ String uuid = UUIDGenerator.getInstance().generateTimeBasedUUID().toString();
+ File tmpDir = new File(Path.getTempDirectoryPath() + "/fckeditor/" + uuid);
+ for (int index = 0; index < column.length; index++)
+ {
+ if (StringUtils.isEmpty(column[index]))
+ {
+ continue;
+ }
+ File tmpFile = new File(tmpDir, filename);
+ try
+ {
+ FileUtils.writeStringToFile(tmpFile, unescapeEditCodeGridColumnValue(column[index]), "UTF-8");
+ }
+ catch (IOException e)
+ {
+ log.error("can't write to tmp file [" + tmpFile + "]");
+ }
+ Document doc = new Document(tmpFile, type);
+ String fileNodeName = Path.getUniqueLabel(
+ hm,
+ filesNode.getHandle(),
+ String.valueOf(System.currentTimeMillis()));
+ SaveHandlerImpl.saveDocument(filesNode, doc, fileNodeName, "", "");
+ String link = filesNode.getName() + "/" + fileNodeName + "/" + doc.getFileNameWithExtension();
+ column[index] = link;
+ doc.delete();
+ }
+ try
+ {
+ FileUtils.deleteDirectory(new java.io.File(Path.getTempDirectory() + "/fckeditor/" + uuid));
+ }
+ catch (IOException e)
+ {
+ log.error("can't delete tmp file [" + Path.getTempDirectory() + "/fckeditor/" + uuid + "]");
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("rawtypes")
+ @Override
protected void addColumnData(Map<String, String> column, String propertyName, int colIndex, Map colMap,
Messages msgs)
{
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.Map;
@@ -41,7 +42,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/FckEditorField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/FckEditorField.js\"></script>";
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -30,6 +30,7 @@
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import info.magnolia.module.admininterface.SaveHandlerImpl;
import java.io.IOException;
@@ -64,7 +65,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/FileField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/FileField.js\"></script>";
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -67,8 +67,10 @@
* Possibly transforms the column values on grid load.
* @param column
* @param colConfig
+ * @param propertyName
+ * @param storageNode
*/
- public void processColumnOnLoad(String[] column, Content colConfig);
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode);
/**
* Possibly transforms the column values on grid save.
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.ArrayList;
import java.util.List;
@@ -45,7 +46,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/LinkField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/LinkField.js\"></script>";
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -25,6 +25,7 @@
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import info.magnolia.repository.RepositoryConstants;
import java.util.ArrayList;
@@ -52,7 +53,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/UUIDLinkField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/UUIDLinkField.js\"></script>";
}
/**
@@ -82,7 +85,7 @@
* {@inheritDoc}
*/
@Override
- public void processColumnOnLoad(String[] column, Content colConfig)
+ public void processColumnOnLoad(String[] column, Content colConfig, String propertyName, Content storageNode)
{
String repository = StringUtils.defaultIfEmpty(
NodeDataUtil.getString(colConfig, "repository"),
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGrid.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -105,7 +105,7 @@
GridColumnType colType = colTypeMap.get(colTypeName);
if (colType != null)
{
- colType.processColumnOnLoad(column, colConfig);
+ colType.processColumnOnLoad(column, colConfig, getName(), getStorageNode());
}
}
colIndex++;
Copied: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml (from rev 4123, magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml 2012-10-31 16:04:15 UTC (rev 4128)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="jsversion" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>e17ff712-3a80-425e-aa30-c3f90975385c</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.cms.beans.config.RegexpVirtualURIMapping</sv:value>
+ </sv:property>
+ <sv:property sv:name="fromURI" sv:type="String">
+ <sv:value>/\.resources/controls/[^/]+/js/(.*)</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="toURI" sv:type="String">
+ <sv:value>/.resources/controls/js/$1</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:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:20.479+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-08-20T12:16:53.943+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-editcode.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-editcode.html 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-editcode.html 2012-10-31 16:04:15 UTC (rev 4128)
@@ -23,7 +23,7 @@
<script type="text/javascript">
var editor;
MgnlDHTMLUtil.addOnLoad(function(){
- document.getElementById("grid").value = window.opener.getEditCodeValue().replace(/&/g, "&").replace(/"/g, "\"").replace(/</g, "<").replace(/>/g, ">").replace(/\\(.)/g, function(all, c) {
+ document.getElementById("grid").value = window.opener.getEditCodeValue().replace(/&/g, "&").replace(/"/g, "\"").replace(/'/g, "\'").replace(/</g, "<").replace(/>/g, ">").replace(/\\(.)/g, function(all, c) {
switch(c){
case "\\":
return "\\";
@@ -52,7 +52,7 @@
});
});
function getValue() {
- return editor.getCode().replace(/&/g, "&").replace(/"/g, """).replace(/</g, "<").replace(/>/g, ">").replace(/\\/g, "\\\\").replace(/\t/g, "\\t").replace(/\n/g, "\\n").replace(/\r/g, "\\r");
+ return editor.getCode().replace(/&/g, "&").replace(/"/g, """).replace(/'/g, "'").replace(/</g, "<").replace(/>/g, ">").replace(/\\/g, "\\\\").replace(/\t/g, "\\t").replace(/\n/g, "\\n").replace(/\r/g, "\\r");
}
</script>
</head>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js 2012-10-31 16:04:15 UTC (rev 4128)
@@ -1,2 +1,14 @@
-var UUIDLinkField = Ext.extend(LinkField, {
+var UUIDLinkField = Ext.extend(Ext.form.TriggerField, {
+
+ triggerClass : 'x-form-link-trigger',
+
+ repository: 'website',
+
+ // extension: undefined,
+
+ onTriggerClick : function() {
+ if (this.disabled) return;
+ mgnlDialogLinkOpenBrowser(this.el.id, this.repository, this.extension);
+ }
+
});
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -85,7 +85,7 @@
* @param handle
* @return
*/
- private String cleanHandle(String handle)
+ protected String cleanHandle(String handle)
{
if (!handle.startsWith("/"))
{
Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml 2012-10-31 16:04:15 UTC (rev 4128)
@@ -15,7 +15,7 @@
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
- <sv:property sv:name="repository" sv:type="String">
+ <sv:property sv:name="repositories" sv:type="String">
<sv:value>email</sv:value>
</sv:property>
<sv:property sv:name="templatePath" sv:type="String">
Modified: magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl 2012-10-31 16:04:15 UTC (rev 4128)
@@ -13,7 +13,7 @@
<tbody>
<tr>
<td height="101" align="center" bgcolor="#102942" style="color: #fff">
- <a href="${content.link!}" target="_blank"> [#if content.logo! != ""] ${media.url(media.node(content.logo))} [/#if]</a>
+ <a href="${content.link!}" target="_blank"> [#if content.logo! != ""] ${media.url(content.logo)} [/#if]</a>
${content.title!}
</td>
</tr>
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -112,6 +112,12 @@
{
return "???" + key + "???";
}
+ catch (IllegalArgumentException e)
+ {
+ // MESSAGES-19 Uncaught IllegalArgumentException using jackrabbit 2.4.1
+ // at org.apache.jackrabbit.core.id.NodeId.<init>(NodeId.java:129)
+ return "???" + key + "???";
+ }
}
/**
Copied: magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/test-magnolia.properties (from rev 4123, magnoliamodules/branches/magnolia44/openutils-mgnlmessages/src/test/resources/test-magnolia.properties)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/test-magnolia.properties (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/test/resources/test-magnolia.properties 2012-10-31 16:04:15 UTC (rev 4128)
@@ -0,0 +1,41 @@
+magnolia.basedir=target/magnolia-test-data
+magnolia.cache.startdir=${magnolia.basedir}/cache
+magnolia.upload.tmpdir=${magnolia.basedir}/tmp
+magnolia.exchange.history=${magnolia.basedir}/history
+
+magnolia.app.rootdir=.
+
+magnolia.repositories.home=target/test-repositories
+# points to the classpath resources, but will be extracted and the property reset
+
+magnolia.repositories.config=/test-repositories.xml
+magnolia.repositories.jackrabbit.config=/jackrabbit-test-configuration.xml
+
+log4j.config=WEB-INF/config/default/log4j.xml
+magnolia.logs.dir=${magnolia.base}/logs
+
+# The directories in which the bootstrap files are searched
+magnolia.bootstrap.dir=WEB-INF/bootstrap/author WEB-INF/bootstrap/common
+
+
+magnolia.bootstrap.authorInstance=true
+magnolia.bootstrap.samples=false
+magnolia.develop=true
+
+magnolia.connection.jcr.userId = admin
+magnolia.connection.jcr.password = admin
+
+magnolia.update.auto=true
+
+magnolia.defaultpage = /sapere.html
+
+####### solo per test #####
+info.magnolia.logging.AuditLoggingManager=info.magnolia.logging.AuditLoggingManager
+info.magnolia.link.LinkTransformerManager=info.magnolia.link.LinkTransformerManager
+#######
+
+info.magnolia.cms.i18n.I18nContentSupport=info.magnolia.cms.i18n.DefaultI18nContentSupport
+
+info.magnolia.cms.core.search.SearchFactory=info.magnolia.cms.core.search.DefaultSearchFactory
+
+info.magnolia.cms.i18n.MessagesManager=net.sourceforge.openutils.mgnlmessages.i18n.MultiBundleMgnlMessagesManager
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2012-10-31 16:04:15 UTC (rev 4128)
@@ -48,7 +48,7 @@
*/
protected HierarchyBoboIndexReader(
IndexReader indexReader,
- Collection<FacetHandler<?>> facetHandlers,
+ Collection<FacetHandler< ? >> facetHandlers,
WorkArea workArea) throws IOException
{
super(indexReader, facetHandlers, null, workArea, false);
@@ -62,7 +62,7 @@
* @return wrapped Bobo index reader instance
* @throws IOException i/o exception reading indexes
*/
- public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler<?>> facetHandlers)
+ public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers)
throws IOException
{
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld 2012-10-31 16:04:15 UTC (rev 4128)
@@ -174,7 +174,7 @@
<description>Get a tag cloud configured in adminCentral (which caches values and updates on repository operations)</description>
<name>named</name>
<function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
- <function-signature>info.util.Map named(java.lang.String)</function-signature>
+ <function-signature>java.util.Map named(java.lang.String)</function-signature>
<example>
<![CDATA[
<c:set var="tagCloud" value="${tagcloud:named('articles')}" />
@@ -188,7 +188,7 @@
<description>Create a tag cloud, cache it, and link it to repository events for updates</description>
<name>cached</name>
<function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
- <function-signature>info.util.Map cached(java.lang.String, java.lang.String, java.lang.String, int)</function-signature>
+ <function-signature>java.util.Map cached(java.lang.String, java.lang.String, java.lang.String, int)</function-signature>
<example>
<![CDATA[
<c:set var="tagCloud" value="${tagcloud:cached('website', '/site/contens/articles', 'tags', 20)}" />
@@ -202,7 +202,7 @@
<description>Calculate tag cloud, without caching it. Each call to notcached will calculate tags from lucene indicies</description>
<name>notcached</name>
<function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
- <function-signature>info.util.Map notcached(java.lang.String, java.lang.String, java.lang.String, int)</function-signature>
+ <function-signature>java.util.Map notcached(java.lang.String, java.lang.String, java.lang.String, int)</function-signature>
<example>
<![CDATA[
<c:set var="tagCloud" value="${tagcloud:notcached('website', '/site/contens/articles', 'tags', 20)}" />
@@ -216,7 +216,7 @@
<description>Get a map with some properties of passed tag cloud: min which holds the number of hits for the less used tag, max which holds the number of hits for the most used tag. Could be useful for normalization work.</description>
<name>props</name>
<function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
- <function-signature>info.util.Map props(java.util.Map)</function-signature>
+ <function-signature>java.util.Map props(java.util.Map)</function-signature>
<example>
<![CDATA[
<c:set var="tagCloud" value="${tagcloud:cached('website', '/site/contens/articles', 'tags', 20)}" />
@@ -230,7 +230,7 @@
<description>Sort a tag cloud by tag names. If the second parameter is true, the sort order is ascending otherwise descending. </description>
<name>sortbyname</name>
<function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
- <function-signature>info.util.Map sortbyname(java.util.Map, boolean)</function-signature>
+ <function-signature>java.util.Map sortbyname(java.util.Map, boolean)</function-signature>
<example>
<![CDATA[
<c:set var="tagCloud" value="${tagcloud:cached('website', '/site/contens/articles', 'tags', 20)}" />
@@ -242,7 +242,7 @@
<description>Sort a tag cloud by tag count. If the second parameter is true, the sort order is ascending otherwise descending. </description>
<name>sortbycount</name>
<function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
- <function-signature>info.util.Map sortbycount(java.util.Map, boolean)</function-signature>
+ <function-signature>java.util.Map sortbycount(java.util.Map, boolean)</function-signature>
<example>
<![CDATA[
<c:set var="tagCloud" value="${tagcloud:cached('website', '/site/contens/articles', 'tags', 20)}" />
Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml 2012-10-31 15:13:06 UTC (rev 4127)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml 2012-10-31 16:04:15 UTC (rev 4128)
@@ -31,7 +31,6 @@
<param name="cacheSize" value="1000" />
<param name="forceConsistencyCheck" value="false" />
<param name="autoRepair" value="true" />
- <param name="analyzer" value="org.apache.lucene.analysis.standard.StandardAnalyzer" />
<param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
<param name="respectDocumentOrder" value="true" />
<param name="resultFetchSize" value="2147483647" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-10-31 15:13:16
|
Revision: 4127
http://openutils.svn.sourceforge.net/openutils/?rev=4127&view=rev
Author: fgiust
Date: 2012-10-31 15:13:06 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
Blocked revisions 4066,4068 via svnmerge
........
r4066 | fgiust | 2012-06-12 14:54:05 +0200 (Tue, 12 Jun 2012) | 1 line
[maven-release-plugin] prepare release openutils-mgnlmedia-4.5.3
........
r4068 | fgiust | 2012-06-12 14:55:08 +0200 (Tue, 12 Jun 2012) | 1 line
[maven-release-plugin] prepare for next development iteration
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4066&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4068&view=rev
Property Changed:
----------------
magnoliamodules/trunk/
Property changes on: magnoliamodules/trunk
___________________________________________________________________
Modified: svnmerge-blocked
- /magnoliamodules/branches/magnolia44:3808,3813-3814,3893,3895-3898,3900-3901,3903,3905-3907,3909-3911,3913,3963,3966-3967,3969-3971,3976,3978-3980,3982-3985,3987-3988,3992,3994-3995,3997,3999-4000,4036,4051-4052,4054
+ /magnoliamodules/branches/magnolia44:3808,3813-3814,3893,3895-3898,3900-3901,3903,3905-3907,3909-3911,3913,3963,3966-3967,3969-3971,3976,3978-3980,3982-3985,3987-3988,3992,3994-3995,3997,3999-4000,4036,4051-4052,4054,4066,4068
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-10-31 15:05:11
|
Revision: 4126
http://openutils.svn.sourceforge.net/openutils/?rev=4126&view=rev
Author: fgiust
Date: 2012-10-31 15:04:57 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
Merged revisions 4055,4064-4065 via svnmerge from
https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44
........
r4055 | diego_schivo | 2012-05-28 15:52:12 +0200 (Mon, 28 May 2012) | 1 line
CONTROLS-49 Paste from spreadsheet: javascript error
........
r4064 | fgiust | 2012-06-12 10:50:52 +0200 (Tue, 12 Jun 2012) | 1 line
MEDIA-281 Support wildcards in search
........
r4065 | fgiust | 2012-06-12 14:52:53 +0200 (Tue, 12 Jun 2012) | 1 line
update pdfbox version
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4055&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4064&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4065&view=rev
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/clipboard.html
magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.handler.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.filters.query.subfilters.searchin.options.filename.xml
Property Changed:
----------------
magnoliamodules/trunk/
magnoliamodules/trunk/openutils-mgnlmedia/
Property changes on: magnoliamodules/trunk
___________________________________________________________________
Modified: svnmerge-integrated
- /magnoliamodules/branches/magnolia44:1-3807,3809-3812,3815-3892,3894,3899,3902,3904,3908,3912,3914-3962,3964-3965,3968,3972-3975,3977,3981,3986,3989-3991,3993,3996,3998,4001
+ /magnoliamodules/branches/magnolia44:1-3807,3809-3812,3815-3892,3894,3899,3902,3904,3908,3912,3914-3962,3964-3965,3968,3972-3975,3977,3981,3986,3989-3991,3993,3996,3998,4001,4055-4065
Modified: svn:mergeinfo
- /magnoliamodules/branches/magnolia44:3809-3812,3815-3892,3952-3958,3962,3964-3965,3972-3975,3989-3991,3996
+ /magnoliamodules/branches/magnolia44:3809-3812,3815-3892,3952-3958,3962,3964-3965,3972-3975,3989-3991,3996,4055-4065
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/clipboard.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/clipboard.html 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/clipboard.html 2012-10-31 15:04:57 UTC (rev 4126)
@@ -22,7 +22,7 @@
<textarea id="clipboard" name="clipboard" rows="4" cols="20" style="width: 100%;border: 1px solid #999"></textarea>
</p>
<div class="mgnlDialogTabsetSaveBar">
- <span class="mgnlControlButton" onclick="opener.window.gridPaste(urlParams['name'], urlParams['expand'] == 'true'), document.getElementById('clipboard').value); mgnlShiftPushButtonClick(this); window.top.close();" onmouseout="mgnlShiftPushButtonOut(this);"
+ <span class="mgnlControlButton" onclick="opener.window.gridPaste(urlParams['name'], document.getElementById('clipboard').value, (urlParams['expand'] == 'true')); mgnlShiftPushButtonClick(this); window.top.close();" onmouseout="mgnlShiftPushButtonOut(this);"
onmousedown="mgnlShiftPushButtonDown(this);">
OK
</span>
Property changes on: magnoliamodules/trunk/openutils-mgnlmedia
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/openutils-mgnlmedia-3.6.x:1004
/magnoliamodules/branches/magnolia44/openutils-mgnlmedia:3809-3812,3815-3892,3952-3958,3972-3975,3996
+ /branches/openutils-mgnlmedia-3.6.x:1004
/magnoliamodules/branches/magnolia44/openutils-mgnlmedia:3809-3812,3815-3892,3952-3958,3972-3975,3996,4055-4065
Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml 2012-10-31 15:04:57 UTC (rev 4126)
@@ -196,7 +196,7 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -245,6 +245,10 @@
<groupId>org.freehep</groupId>
<artifactId>freehep-graphicsio-tests</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterOptionProvider.java 2012-10-31 15:04:57 UTC (rev 4126)
@@ -29,6 +29,8 @@
import javax.jcr.RepositoryException;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
/**
@@ -140,4 +142,20 @@
}
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString()
+ {
+ return new ToStringBuilder(this, ToStringStyle.SIMPLE_STYLE)
+ .append("reference", this.reference)
+ .append("addempty", this.addempty)
+ .append("options", this.options)
+ .append("control", this.getControl())
+ .append("subfilters", this.getSubfilters())
+ .append("label", this.getLabel())
+ .toString();
+ }
+
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.java 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterText.java 2012-10-31 15:04:57 UTC (rev 4126)
@@ -38,6 +38,8 @@
public class SearchFilterText extends SearchFilterAbstract
{
+ private boolean wildcards;
+
/**
* {@inheritDoc}
*/
@@ -52,16 +54,50 @@
if (values != null && values.length > 0)
{
fullTextSearch = values[0];
+
+ if (wildcards)
+ {
+ fullTextSearch = StringUtils.replace(fullTextSearch, "*", "%");
+
+ fullTextSearch = StringUtils.stripStart(StringUtils.stripEnd(fullTextSearch, "%"), "%");
+ }
+
if (MapUtils.isNotEmpty(getSubfilters()) && StringUtils.isNotBlank(fullTextSearch))
{
+
for (String key : getSubfilters().keySet())
{
values = request.getParameterValues(key);
- if (values != null)
+
+ if (wildcards && (values == null || values.length == 0))
{
+
+ SearchFilterOptionProvider infilter = (SearchFilterOptionProvider) getSubfilters().get(key);
+
+ if (infilter != null)
+ {
+ List<Option> options = infilter.getOptions();
+ List<String> optionparams = new ArrayList<String>();
+ for (Option option : options)
+ {
+ optionparams.add(option.getValue());
+ }
+ values = optionparams.toArray(new String[optionparams.size()]);
+ }
+ }
+
+ if (values != null && values.length != 0)
+ {
for (String name : values)
{
- criterionList.add(Restrictions.contains("@" + name, fullTextSearch));
+ if (wildcards)
+ {
+ criterionList.add(Restrictions.like("@" + name, fullTextSearch));
+ }
+ else
+ {
+ criterionList.add(Restrictions.contains("@" + name, fullTextSearch));
+ }
}
if (criterionList.size() > 1)
{
@@ -80,9 +116,28 @@
if (StringUtils.isNotBlank(fullTextSearch))
{
- criterionList.add(Restrictions.contains(".", fullTextSearch));
+ if (wildcards && criterionList.size() > 0)
+ {
+ // jcr:like doesn't work on fulltext, but put criterionList on or
+ Criterion c = Restrictions.or(criterionList.get(0), Restrictions.contains(".", fullTextSearch));
+ criterionList.remove(0);
+ criterionList.add(0, c);
+ }
+ else
+ {
+ criterionList.add(Restrictions.contains(".", fullTextSearch));
+ }
}
}
return criterionList;
}
+
+ /**
+ * Sets the wildcards.
+ * @param wildcards the wildcards to set
+ */
+ public void setWildcards(boolean wildcards)
+ {
+ this.wildcards = wildcards;
+ }
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2012-10-31 15:04:57 UTC (rev 4126)
@@ -169,13 +169,22 @@
c.setPaging(itemsPerPage, pageNumberStartingFromOne);
}
- AdvancedResult result = c.execute();
- if (log.isDebugEnabled())
+ try
{
- log.debug("Executing {} -> {} results", c.toXpathExpression(), result.getTotalSize());
+ AdvancedResult result = c.execute();
+
+ if (log.isDebugEnabled())
+ {
+ log.debug("Executing {} -> {} results", c.toXpathExpression(), result.getTotalSize());
+ }
+ return result;
}
+ catch (Throwable e)
+ {
+ log.error("Error running query " + c.toXpathExpression(), e);
+ }
- return result;
+ return AdvancedResult.EMPTY_RESULT;
}
}
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java 2012-10-31 15:04:57 UTC (rev 4126)
@@ -130,8 +130,8 @@
// change "external video" handler
tasks.add(new ChangeExistingPropertyTask(
ContentRepository.CONFIG,
- "/modules/media/mediatypes/youtube",
- "menuIcon",
+ "/modules/media/mediatypes/youtube/handler",
+ "class",
"net.sourceforge.openutils.mgnlmedia.media.types.impl.YouTubeVideoTypeHandler",
ExternalVideoTypeHandler.class.getName()));
@@ -231,6 +231,12 @@
"Playlists",
"media.menu.playlists"));
+ tasks.add(new CreateMissingPropertyTask(
+ ContentRepository.CONFIG,
+ "/modules/media/config/search/filters/query",
+ "wildcards",
+ Boolean.TRUE));
+
return tasks;
}
Copied: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.filters.query.subfilters.searchin.options.filename.xml (from rev 4065, magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.filters.query.subfilters.searchin.options.filename.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.filters.query.subfilters.searchin.options.filename.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.filters.query.subfilters.searchin.options.filename.xml 2012-10-31 15:04:57 UTC (rev 4126)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="filename" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>65cc5316-dca7-43ba-901c-c705a39eccd9</sv:value>
+ </sv:property>
+ <sv:property sv:name="enabled" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>config.search.filters.options.filename</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="String">
+ <sv:value>media_name</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:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-18T15:38:57.738+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-06-11T22:06:52.791+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2012-10-31 15:04:57 UTC (rev 4126)
@@ -3,7 +3,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -13,7 +13,7 @@
<sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration</sv:value>
</sv:property>
<sv:property sv:name="defaultBasePath" sv:type="String">
- <sv:value>/mediagallery</sv:value>
+ <sv:value>/</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
@@ -42,7 +42,7 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:content</sv:value>
</sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -72,7 +72,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -90,6 +90,9 @@
<sv:property sv:name="label" sv:type="String">
<sv:value>config.search.filters.text</sv:value>
</sv:property>
+ <sv:property sv:name="wildcards" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
@@ -104,14 +107,14 @@
<sv:value>2010-02-15T17:07:44.717+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-03-22T10:21:19.449+01:00</sv:value>
+ <sv:value>2012-06-11T21:58:59.300+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="subfilters">
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -141,7 +144,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -180,7 +183,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -210,7 +213,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -247,7 +250,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -291,7 +294,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -333,7 +336,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -365,7 +368,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -407,7 +410,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -440,7 +443,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -483,7 +486,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -523,7 +526,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -565,7 +568,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -607,7 +610,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -640,7 +643,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -685,7 +688,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -728,7 +731,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -771,7 +774,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -814,7 +817,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -856,7 +859,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -889,7 +892,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -929,7 +932,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -969,7 +972,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -1009,7 +1012,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -1049,7 +1052,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.handler.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.handler.xml 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.handler.xml 2012-10-31 15:04:57 UTC (rev 4126)
@@ -3,19 +3,28 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>9ab64dfc-9f0d-44a6-83ff-5fc1a6adf634</sv:value>
</sv:property>
<sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.media.types.impl.YouTubeVideoTypeHandler</sv:value>
+ <sv:value>net.sourceforge.openutils.mgnlmedia.media.types.impl.ExternalVideoTypeHandler</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="parseremotefiles" sv:type="Boolean">
+ <sv:value>true</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:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -30,16 +39,22 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
<sv:value>72c87fc6-7506-405e-b396-1e6090fc993a</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</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:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:activated" sv:type="Boolean">
<sv:value>false</sv:value>
</sv:property>
@@ -57,7 +72,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -69,10 +84,16 @@
<sv:property sv:name="enabled" sv:type="String">
<sv:value>true</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</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:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:activated" sv:type="Boolean">
<sv:value>false</sv:value>
</sv:property>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.xml 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.mediatypes.youtube.xml 2012-10-31 15:04:57 UTC (rev 4126)
@@ -3,7 +3,7 @@
<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:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
@@ -18,6 +18,9 @@
<sv:property sv:name="i18nBasename" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.media.lang.messages</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>media.types.youtube</sv:value>
</sv:property>
@@ -31,6 +34,9 @@
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
</sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
<sv:property sv:name="mgnl:activated" sv:type="Boolean">
<sv:value>false</sv:value>
</sv:property>
@@ -50,97 +56,4 @@
<sv:value>2010-03-11T16:13:12.672+01:00</sv:value>
</sv:property>
</sv:node>
- <sv:node sv:name="handler">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>9ab64dfc-9f0d-44a6-83ff-5fc1a6adf634</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.media.types.impl.ExternalVideoTypeHandler</sv:value>
- </sv:property>
- <sv:property sv:name="parseremotefiles" sv:type="Boolean">
- <sv:value>true</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-14T21:25:50.277+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-14T21:26:04.623+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="videoSupportHandlers">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>72c87fc6-7506-405e-b396-1e6090fc993a</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-14T20:45:51.843+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-14T21:26:08.988+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="youtube">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>9d7010da-0448-477e-952e-4433cba91661</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.media.types.externals.YoutubeSupport</sv:value>
- </sv:property>
- <sv:property sv:name="enabled" sv:type="String">
- <sv:value>true</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-14T20:46:10.804+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-02-14T21:26:08.989+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- </sv:node>
- </sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2012-10-31 15:04:57 UTC (rev 4126)
@@ -158,6 +158,7 @@
config.search.filters.date.from=Created from
config.search.filters.date.until=Until
config.search.filters.options.title=Title
+config.search.filters.options.filename=Filename
config.search.filters.options.description=Description
config.search.filters.options.all=All
config.search.filters.options.published=Published
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2012-10-31 14:44:53 UTC (rev 4125)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2012-10-31 15:04:57 UTC (rev 4126)
@@ -161,6 +161,7 @@
config.search.filters.date.from=Creazione da
config.search.filters.date.until=Fino a
config.search.filters.options.title=Titolo
+config.search.filters.options.filename=Nome file
config.search.filters.options.description=Descrizione
config.search.filters.options.all=Tutti
config.search.filters.options.published=Pubblicati
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-10-31 14:45:03
|
Revision: 4125
http://openutils.svn.sourceforge.net/openutils/?rev=4125&view=rev
Author: fgiust
Date: 2012-10-31 14:44:53 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
Blocked revisions 4036,4051-4052,4054 via svnmerge
........
r4036 | fgiust | 2012-05-15 21:48:16 +0200 (Tue, 15 May 2012) | 1 line
hasChildren -> hasContent
........
r4051 | dfghi | 2012-05-25 18:16:57 +0200 (Fri, 25 May 2012) | 1 line
CONTROLS-48 Backport 4049: Disabled insert/remove icons when the add rows is disabled (it means the number of rows is fixed).
........
r4052 | dfghi | 2012-05-25 18:24:35 +0200 (Fri, 25 May 2012) | 1 line
CONTROLS-47 Backport of r4050: Extended combobox to prevent value display in some cases.
........
r4054 | dfghi | 2012-05-28 10:37:33 +0200 (Mon, 28 May 2012) | 1 line
CONTROLS-38 Backport of r4053: "Paste form excel" and "clear all" now can be disabled.
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=4036&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4051&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4052&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4050&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4054&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=4053&view=rev
Property Changed:
----------------
magnoliamodules/trunk/
Property changes on: magnoliamodules/trunk
___________________________________________________________________
Modified: svnmerge-blocked
- /magnoliamodules/branches/magnolia44:3808,3813-3814,3893,3895-3898,3900-3901,3903,3905-3907,3909-3911,3913,3963,3966-3967,3969-3971,3976,3978-3980,3982-3985,3987-3988,3992,3994-3995,3997,3999-4000
+ /magnoliamodules/branches/magnolia44:3808,3813-3814,3893,3895-3898,3900-3901,3903,3905-3907,3909-3911,3913,3963,3966-3967,3969-3971,3976,3978-3980,3982-3985,3987-3988,3992,3994-3995,3997,3999-4000,4036,4051-4052,4054
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-10-31 14:24:21
|
Revision: 4124
http://openutils.svn.sourceforge.net/openutils/?rev=4124&view=rev
Author: fgiust
Date: 2012-10-31 14:24:12 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
Initialized merge tracking via "svnmerge" with revisions "1-3778" from
https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk
Property Changed:
----------------
magnoliamodules/branches/magnolia44/
Property changes on: magnoliamodules/branches/magnolia44
___________________________________________________________________
Added: svnmerge-integrated
+ /magnoliamodules/trunk:1-3778
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4123
http://openutils.svn.sourceforge.net/openutils/?rev=4123&view=rev
Author: fgiust
Date: 2012-10-31 14:19:51 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
compile fix
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
Modified: magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java 2012-10-31 14:15:59 UTC (rev 4122)
+++ magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java 2012-10-31 14:19:51 UTC (rev 4123)
@@ -85,7 +85,7 @@
* @param handle
* @return
*/
- private String cleanHandle(String handle)
+ protected String cleanHandle(String handle)
{
if (!handle.startsWith("/"))
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-10-31 14:16:11
|
Revision: 4122
http://openutils.svn.sourceforge.net/openutils/?rev=4122&view=rev
Author: fgiust
Date: 2012-10-31 14:15:59 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
fix logo using new media APIs
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl 2012-10-31 14:04:49 UTC (rev 4121)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmail/src/main/resources/simplemail/simple.ftl 2012-10-31 14:15:59 UTC (rev 4122)
@@ -13,7 +13,7 @@
<tbody>
<tr>
<td height="101" align="center" bgcolor="#102942" style="color: #fff">
- <a href="${content.link!}" target="_blank"> [#if content.logo! != ""] ${media.url(media.node(content.logo))} [/#if]</a>
+ <a href="${content.link!}" target="_blank"> [#if content.logo! != ""] ${media.url(content.logo)} [/#if]</a>
${content.title!}
</td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4121
http://openutils.svn.sourceforge.net/openutils/?rev=4121&view=rev
Author: fgiust
Date: 2012-10-31 14:04:49 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
fix "repositories" property
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml 2012-10-29 20:20:23 UTC (rev 4120)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmail/src/main/resources/mgnl-bootstrap/simplemail-nooverwrite/config.modules.simplemail.templates.simplemail-simple.xml 2012-10-31 14:04:49 UTC (rev 4121)
@@ -15,7 +15,7 @@
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
- <sv:property sv:name="repository" sv:type="String">
+ <sv:property sv:name="repositories" sv:type="String">
<sv:value>email</sv:value>
</sv:property>
<sv:property sv:name="templatePath" sv:type="String">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2012-10-29 21:39:34
|
See <https://hudson.openmindonline.it/job/openutils-dbmigration/38/changes> |
|
From: <fg...@us...> - 2012-10-29 20:20:30
|
Revision: 4120
http://openutils.svn.sourceforge.net/openutils/?rev=4120&view=rev
Author: fgiust
Date: 2012-10-29 20:20:23 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-dbmigration/pom.xml
Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2012-10-29 20:20:09 UTC (rev 4119)
+++ trunk/openutils-dbmigration/pom.xml 2012-10-29 20:20:23 UTC (rev 4120)
@@ -14,7 +14,7 @@
With DBMigration you can bundle upgrade scripts in you application. Its purpose
is to manage db updates consistently both for development than for production releases.
]]></description>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -28,9 +28,9 @@
</issueManagement>
<inceptionYear>2007</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-2.1.0</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-2.1.0</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-dbmigration-2.1.0</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-dbmigration</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-dbmigration</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-dbmigration</url>
</scm>
<dependencies>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-10-29 20:20:15
|
Revision: 4119
http://openutils.svn.sourceforge.net/openutils/?rev=4119&view=rev
Author: fgiust
Date: 2012-10-29 20:20:09 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-dbmigration-2.1.0
Added Paths:
-----------
tags/openutils-dbmigration-2.1.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-10-29 20:19:50
|
Revision: 4118
http://openutils.svn.sourceforge.net/openutils/?rev=4118&view=rev
Author: fgiust
Date: 2012-10-29 20:19:41 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-dbmigration-2.1.0
Modified Paths:
--------------
trunk/openutils-dbmigration/pom.xml
Modified: trunk/openutils-dbmigration/pom.xml
===================================================================
--- trunk/openutils-dbmigration/pom.xml 2012-10-29 20:16:17 UTC (rev 4117)
+++ trunk/openutils-dbmigration/pom.xml 2012-10-29 20:19:41 UTC (rev 4118)
@@ -14,7 +14,7 @@
With DBMigration you can bundle upgrade scripts in you application. Its purpose
is to manage db updates consistently both for development than for production releases.
]]></description>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.1.0</version>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -28,9 +28,9 @@
</issueManagement>
<inceptionYear>2007</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-dbmigration</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-dbmigration</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-dbmigration</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-2.1.0</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-dbmigration-2.1.0</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-dbmigration-2.1.0</url>
</scm>
<dependencies>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-10-29 20:16:28
|
Revision: 4117
http://openutils.svn.sourceforge.net/openutils/?rev=4117&view=rev
Author: fgiust
Date: 2012-10-29 20:16:17 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
DBMIGRATION-11 Missing performSubsistution from generic task
Modified Paths:
--------------
trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java
Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java 2012-10-05 15:37:55 UTC (rev 4116)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/generic/JdbcObjectCreationTask.java 2012-10-29 20:16:17 UTC (rev 4117)
@@ -134,6 +134,7 @@
{
is = script.getInputStream();
scriptContent = IOUtils.toString(is, "UTF8");
+ scriptContent = performSubstitution(scriptContent);
}
catch (IOException e)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2012-10-05 15:38:01
|
Revision: 4116
http://openutils.svn.sourceforge.net/openutils/?rev=4116&view=rev
Author: fgiust
Date: 2012-10-05 15:37:55 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
upgrade to lucene 3
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml 2012-09-28 16:16:33 UTC (rev 4115)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml 2012-10-05 15:37:55 UTC (rev 4116)
@@ -118,7 +118,7 @@
<dependency>
<groupId>com.browseengine.bobo</groupId>
<artifactId>bobo-browse</artifactId>
- <version>2.0.7</version>
+ <version>2.5.1</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -172,6 +172,6 @@
</dependencies>
<properties>
<magnolia.version>4.4.2</magnolia.version>
- <jackrabbit.version>2.2.5</jackrabbit.version>
+ <jackrabbit.version>2.4.0</jackrabbit.version>
</properties>
</project>
\ No newline at end of file
Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2012-09-28 16:16:33 UTC (rev 4115)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java 2012-10-05 15:37:55 UTC (rev 4116)
@@ -48,10 +48,11 @@
*/
protected HierarchyBoboIndexReader(
IndexReader indexReader,
- Collection<FacetHandler> facetHandlers,
+ Collection<FacetHandler< ? >> facetHandlers,
WorkArea workArea) throws IOException
{
- super(indexReader, facetHandlers, workArea);
+ super(indexReader, facetHandlers, null, workArea);
+
resolver = (HierarchyResolver) indexReader;
}
@@ -62,7 +63,7 @@
* @return wrapped Bobo index reader instance
* @throws IOException i/o exception reading indexes
*/
- public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler> facetHandlers)
+ public static HierarchyBoboIndexReader getInstance(IndexReader reader, Collection<FacetHandler< ? >> facetHandlers)
throws IOException
{
Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2012-09-28 16:16:33 UTC (rev 4115)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java 2012-10-05 15:37:55 UTC (rev 4116)
@@ -186,7 +186,7 @@
// configure bobo for faceted search
MultiValueFacetHandler tagsHandler = new MultiValueFacetHandler(propertyName);
- List<FacetHandler> handlerList = Arrays.asList(new FacetHandler[]{tagsHandler });
+ List<FacetHandler<?>> handlerList = Arrays.asList(new FacetHandler<?>[]{tagsHandler });
BoboIndexReader boboReader = HierarchyBoboIndexReader.getInstance(ir, handlerList);
// get query
Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml 2012-09-28 16:16:33 UTC (rev 4115)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/resources/repo-conf/jackrabbit-memory-search.xml 2012-10-05 15:37:55 UTC (rev 4116)
@@ -31,7 +31,6 @@
<param name="cacheSize" value="1000" />
<param name="forceConsistencyCheck" value="false" />
<param name="autoRepair" value="true" />
- <param name="analyzer" value="org.apache.lucene.analysis.standard.StandardAnalyzer" />
<param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl" />
<param name="respectDocumentOrder" value="true" />
<param name="resultFetchSize" value="2147483647" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2012-09-28 16:16:42
|
Revision: 4115
http://openutils.svn.sourceforge.net/openutils/?rev=4115&view=rev
Author: diego_schivo
Date: 2012-09-28 16:16:33 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
TAGCLOUD-19 tagcloud.tld: java.util.Map
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld
Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld 2012-08-23 15:55:12 UTC (rev 4114)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/resources/META-INF/tagcloud.tld 2012-09-28 16:16:33 UTC (rev 4115)
@@ -174,7 +174,7 @@
<description>Get a tag cloud configured in adminCentral (which caches values and updates on repository operations)</description>
<name>named</name>
<function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
- <function-signature>info.util.Map named(java.lang.String)</function-signature>
+ <function-signature>java.util.Map named(java.lang.String)</function-signature>
<example>
<![CDATA[
<c:set var="tagCloud" value="${tagcloud:named('articles')}" />
@@ -188,7 +188,7 @@
<description>Create a tag cloud, cache it, and link it to repository events for updates</description>
<name>cached</name>
<function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
- <function-signature>info.util.Map cached(java.lang.String, java.lang.String, java.lang.String, int)</function-signature>
+ <function-signature>java.util.Map cached(java.lang.String, java.lang.String, java.lang.String, int)</function-signature>
<example>
<![CDATA[
<c:set var="tagCloud" value="${tagcloud:cached('website', '/site/contens/articles', 'tags', 20)}" />
@@ -202,7 +202,7 @@
<description>Calculate tag cloud, without caching it. Each call to notcached will calculate tags from lucene indicies</description>
<name>notcached</name>
<function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
- <function-signature>info.util.Map notcached(java.lang.String, java.lang.String, java.lang.String, int)</function-signature>
+ <function-signature>java.util.Map notcached(java.lang.String, java.lang.String, java.lang.String, int)</function-signature>
<example>
<![CDATA[
<c:set var="tagCloud" value="${tagcloud:notcached('website', '/site/contens/articles', 'tags', 20)}" />
@@ -216,7 +216,7 @@
<description>Get a map with some properties of passed tag cloud: min which holds the number of hits for the less used tag, max which holds the number of hits for the most used tag. Could be useful for normalization work.</description>
<name>props</name>
<function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
- <function-signature>info.util.Map props(java.util.Map)</function-signature>
+ <function-signature>java.util.Map props(java.util.Map)</function-signature>
<example>
<![CDATA[
<c:set var="tagCloud" value="${tagcloud:cached('website', '/site/contens/articles', 'tags', 20)}" />
@@ -230,7 +230,7 @@
<description>Sort a tag cloud by tag names. If the second parameter is true, the sort order is ascending otherwise descending. </description>
<name>sortbyname</name>
<function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
- <function-signature>info.util.Map sortbyname(java.util.Map, boolean)</function-signature>
+ <function-signature>java.util.Map sortbyname(java.util.Map, boolean)</function-signature>
<example>
<![CDATA[
<c:set var="tagCloud" value="${tagcloud:cached('website', '/site/contens/articles', 'tags', 20)}" />
@@ -242,7 +242,7 @@
<description>Sort a tag cloud by tag count. If the second parameter is true, the sort order is ascending otherwise descending. </description>
<name>sortbycount</name>
<function-class>net.sourceforge.openutils.mgnltagcloud.el.TagCloudElFunctions</function-class>
- <function-signature>info.util.Map sortbycount(java.util.Map, boolean)</function-signature>
+ <function-signature>java.util.Map sortbycount(java.util.Map, boolean)</function-signature>
<example>
<![CDATA[
<c:set var="tagCloud" value="${tagcloud:cached('website', '/site/contens/articles', 'tags', 20)}" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4114
http://openutils.svn.sourceforge.net/openutils/?rev=4114&view=rev
Author: diego_schivo
Date: 2012-08-23 15:55:12 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
CONTROLS-53 Grid control: insert module version into url of column-type javascript files
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml 2012-08-20 10:21:41 UTC (rev 4113)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml 2012-08-23 15:55:12 UTC (rev 4114)
@@ -10,13 +10,13 @@
<sv:value>info.magnolia.cms.beans.config.RegexpVirtualURIMapping</sv:value>
</sv:property>
<sv:property sv:name="fromURI" sv:type="String">
- <sv:value>/.resources/controls/[^/]+/js/(.*)</sv:value>
+ <sv:value>/\.resources/controls/[^/]+/js/(.*)</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="toURI" sv:type="String">
- <sv:value>forward:/.resources/controls/js/$1</sv:value>
+ <sv:value>/.resources/controls/js/$1</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2012-08-20 10:21:48
|
Revision: 4113
http://openutils.svn.sourceforge.net/openutils/?rev=4113&view=rev
Author: diego_schivo
Date: 2012-08-20 10:21:41 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
CONTROLS-53 Grid control: insert module version into url of column-type javascript files
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
Added Paths:
-----------
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java 2012-08-20 09:41:28 UTC (rev 4112)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/CheckboxGridColumnType.java 2012-08-20 10:21:41 UTC (rev 4113)
@@ -23,6 +23,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.Map;
@@ -47,7 +48,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/CheckColumn.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/CheckColumn.js\"></script>";
}
/**
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java 2012-08-20 09:41:28 UTC (rev 4112)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ColorGridColumnType.java 2012-08-20 10:21:41 UTC (rev 4113)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.Map;
@@ -41,7 +42,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/ColorField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/ColorField.js\"></script>";
}
/**
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-08-20 09:41:28 UTC (rev 4112)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-08-20 10:21:41 UTC (rev 4113)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.ArrayList;
import java.util.List;
@@ -46,7 +47,9 @@
StringBuilder result = new StringBuilder(super.getHeadSnippet());
result.append("<script type=\"text/javascript\" src=\"");
result.append(MgnlContext.getContextPath());
- result.append("/.resources/controls/js/PipeComboBox.js\"></script>");
+ result.append("/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/PipeComboBox.js\"></script>");
// Combobox must be patched because of a bug. For reference, see:
// http://www.sencha.com/forum/showthread.php?17465-1.1.1-Local-ComboBox-data-store-filter-not-cleared-on-call-to-setValue%28%29
result.append("<script type=\"text/javascript\">");
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java 2012-08-20 09:41:28 UTC (rev 4112)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/EditCodeGridColumnType.java 2012-08-20 10:21:41 UTC (rev 4113)
@@ -30,6 +30,7 @@
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import info.magnolia.module.admininterface.SaveHandlerImpl;
import java.io.File;
@@ -75,7 +76,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/EditCodeField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/EditCodeField.js\"></script>";
}
/**
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2012-08-20 09:41:28 UTC (rev 4112)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2012-08-20 10:21:41 UTC (rev 4113)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.Map;
@@ -41,7 +42,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/FckEditorField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/FckEditorField.js\"></script>";
}
/**
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java 2012-08-20 09:41:28 UTC (rev 4112)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java 2012-08-20 10:21:41 UTC (rev 4113)
@@ -30,6 +30,7 @@
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import info.magnolia.module.admininterface.SaveHandlerImpl;
import java.io.IOException;
@@ -64,7 +65,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/FileField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/FileField.js\"></script>";
}
/**
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java 2012-08-20 09:41:28 UTC (rev 4112)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java 2012-08-20 10:21:41 UTC (rev 4113)
@@ -21,6 +21,7 @@
import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.ArrayList;
import java.util.List;
@@ -45,7 +46,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/LinkField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/LinkField.js\"></script>";
}
/**
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2012-08-20 09:41:28 UTC (rev 4112)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2012-08-20 10:21:41 UTC (rev 4113)
@@ -26,6 +26,7 @@
import info.magnolia.cms.util.ContentUtil;
import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
import java.util.ArrayList;
import java.util.List;
@@ -52,7 +53,9 @@
{
return "<script type=\"text/javascript\" src=\""
+ MgnlContext.getContextPath()
- + "/.resources/controls/js/UUIDLinkField.js\"></script>";
+ + "/.resources/controls/"
+ + ModuleRegistry.Factory.getInstance().getDefinition("controls").getVersion()
+ + "/js/UUIDLinkField.js\"></script>";
}
/**
Added: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml (rev 0)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.virtualURIMapping.jsversion.xml 2012-08-20 10:21:41 UTC (rev 4113)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="jsversion" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>e17ff712-3a80-425e-aa30-c3f90975385c</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>info.magnolia.cms.beans.config.RegexpVirtualURIMapping</sv:value>
+ </sv:property>
+ <sv:property sv:name="fromURI" sv:type="String">
+ <sv:value>/.resources/controls/[^/]+/js/(.*)</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="toURI" sv:type="String">
+ <sv:value>forward:/.resources/controls/js/$1</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:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="String">
+ <sv:value>2004-11-02T15:34:20.479+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2012-08-20T12:16:53.943+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2012-08-20 09:41:34
|
Revision: 4112
http://openutils.svn.sourceforge.net/openutils/?rev=4112&view=rev
Author: diego_schivo
Date: 2012-08-20 09:41:28 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
CONTROLS-52: UUIDLinkField.js
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js 2012-07-25 10:01:43 UTC (rev 4111)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js 2012-08-20 09:41:28 UTC (rev 4112)
@@ -1,2 +1,14 @@
-var UUIDLinkField = Ext.extend(LinkField, {
+var UUIDLinkField = Ext.extend(Ext.form.TriggerField, {
+
+ triggerClass : 'x-form-link-trigger',
+
+ repository: 'website',
+
+ // extension: undefined,
+
+ onTriggerClick : function() {
+ if (this.disabled) return;
+ mgnlDialogLinkOpenBrowser(this.el.id, this.repository, this.extension);
+ }
+
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2012-07-25 10:01:49
|
Revision: 4111
http://openutils.svn.sourceforge.net/openutils/?rev=4111&view=rev
Author: diego_schivo
Date: 2012-07-25 10:01:43 +0000 (Wed, 25 Jul 2012)
Log Message:
-----------
openutils-mgnlcontextmenu dependecy on openutils-mgnlmedia: fix version
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2012-07-18 15:28:52 UTC (rev 4110)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml 2012-07-25 10:01:43 UTC (rev 4111)
@@ -127,7 +127,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmedia</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.0</version>
<optional>true</optional>
</dependency>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2012-07-18 15:29:02
|
Revision: 4110
http://openutils.svn.sourceforge.net/openutils/?rev=4110&view=rev
Author: diego_schivo
Date: 2012-07-18 15:28:52 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
CONTROLS-51 grid-editcode.html: '
Modified Paths:
--------------
magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-editcode.html
Modified: magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-editcode.html
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-editcode.html 2012-07-18 15:17:12 UTC (rev 4109)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-editcode.html 2012-07-18 15:28:52 UTC (rev 4110)
@@ -23,7 +23,7 @@
<script type="text/javascript">
var editor;
MgnlDHTMLUtil.addOnLoad(function(){
- document.getElementById("grid").value = window.opener.getEditCodeValue().replace(/&/g, "&").replace(/"/g, "\"").replace(/</g, "<").replace(/>/g, ">").replace(/\\(.)/g, function(all, c) {
+ document.getElementById("grid").value = window.opener.getEditCodeValue().replace(/&/g, "&").replace(/"/g, "\"").replace(/'/g, "\'").replace(/</g, "<").replace(/>/g, ">").replace(/\\(.)/g, function(all, c) {
switch(c){
case "\\":
return "\\";
@@ -52,7 +52,7 @@
});
});
function getValue() {
- return editor.getCode().replace(/&/g, "&").replace(/"/g, """).replace(/</g, "<").replace(/>/g, ">").replace(/\\/g, "\\\\").replace(/\t/g, "\\t").replace(/\n/g, "\\n").replace(/\r/g, "\\r");
+ return editor.getCode().replace(/&/g, "&").replace(/"/g, """).replace(/'/g, "'").replace(/</g, "<").replace(/>/g, ">").replace(/\\/g, "\\\\").replace(/\t/g, "\\t").replace(/\n/g, "\\n").replace(/\r/g, "\\r");
}
</script>
</head>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
