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: <hu...@op...> - 2011-08-26 10:01:21
|
See <https://hudson.openmindonline.it/job/openutils-log4j/36/changes> |
|
From: <die...@us...> - 2011-08-26 09:35:10
|
Revision: 3663
http://openutils.svn.sourceforge.net/openutils/?rev=3663&view=rev
Author: diego_schivo
Date: 2011-08-26 09:35:03 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
mvn license:format
Modified Paths:
--------------
trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/DwrTestContext.java
trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/JsException.java
trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/XMLHttpRequest.java
trunk/openutils-testing4dwr-junit/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java
trunk/openutils-testing4dwr-testng/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java
Modified: trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/DwrTestContext.java
===================================================================
--- trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/DwrTestContext.java 2011-08-26 09:17:30 UTC (rev 3662)
+++ trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/DwrTestContext.java 2011-08-26 09:35:03 UTC (rev 3663)
@@ -1,7 +1,7 @@
/**
*
* openutils dwr test utils (http://openutils.sourceforge.net/openutils-testing4dwr)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/JsException.java
===================================================================
--- trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/JsException.java 2011-08-26 09:17:30 UTC (rev 3662)
+++ trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/JsException.java 2011-08-26 09:35:03 UTC (rev 3663)
@@ -1,7 +1,7 @@
/**
*
* openutils dwr test utils (http://openutils.sourceforge.net/openutils-testing4dwr)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/XMLHttpRequest.java
===================================================================
--- trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/XMLHttpRequest.java 2011-08-26 09:17:30 UTC (rev 3662)
+++ trunk/openutils-testing4dwr/src/main/java/it/openutils/testing/dwr/XMLHttpRequest.java 2011-08-26 09:35:03 UTC (rev 3663)
@@ -1,7 +1,7 @@
/**
*
* openutils dwr test utils (http://openutils.sourceforge.net/openutils-testing4dwr)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-testing4dwr-junit/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java
===================================================================
--- trunk/openutils-testing4dwr-junit/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java 2011-08-26 09:17:30 UTC (rev 3662)
+++ trunk/openutils-testing4dwr-junit/src/main/java/it/openutils/testing/junit/dwr/DwrTestCase.java 2011-08-26 09:35:03 UTC (rev 3663)
@@ -1,7 +1,7 @@
/**
*
* openutils testing4dwr (junit) (http://openutils.sourceforge.net/openutils-testing4dwr-junit)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-testing4dwr-testng/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java
===================================================================
--- trunk/openutils-testing4dwr-testng/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java 2011-08-26 09:17:30 UTC (rev 3662)
+++ trunk/openutils-testing4dwr-testng/src/main/java/it/openutils/testing/testng/dwr/DwrTestCase.java 2011-08-26 09:35:03 UTC (rev 3663)
@@ -1,7 +1,7 @@
/**
*
* openutils testing4dwr (testng) (http://openutils.sourceforge.net/openutils-testing4dwr-testng)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 09:17:37
|
Revision: 3662
http://openutils.svn.sourceforge.net/openutils/?rev=3662&view=rev
Author: diego_schivo
Date: 2011-08-26 09:17:30 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
mvn license:format
Modified Paths:
--------------
trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextHolder.java
trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextListener.java
trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSetPropertyEditor.java
trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSinglePropertyEditor.java
trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java
trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java
trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java
trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java
trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java
trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java
trunk/openutils-spring/src/main/java/it/openutils/web/spring/BaseFormController.java
trunk/openutils-spring/src/main/java/it/openutils/web/spring/EasyDoubleCustomEditor.java
trunk/openutils-spring/src/main/java/it/openutils/web/spring/MultiController.java
trunk/openutils-spring/src/main/java/it/openutils/web/spring/ParamNameUrlHandlerMapping.java
trunk/openutils-spring/src/main/java/it/openutils/web/spring/SimpleController.java
trunk/openutils-spring/src/main/java/it/openutils/web/util/MessageUtils.java
Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextHolder.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextHolder.java 2011-08-26 09:14:42 UTC (rev 3661)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextHolder.java 2011-08-26 09:17:30 UTC (rev 3662)
@@ -1,7 +1,7 @@
/**
*
* openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextListener.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextListener.java 2011-08-26 09:14:42 UTC (rev 3661)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/context/WebApplicationContextListener.java 2011-08-26 09:17:30 UTC (rev 3662)
@@ -1,7 +1,7 @@
/**
*
* openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSetPropertyEditor.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSetPropertyEditor.java 2011-08-26 09:14:42 UTC (rev 3661)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSetPropertyEditor.java 2011-08-26 09:17:30 UTC (rev 3662)
@@ -1,7 +1,7 @@
/**
*
* openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSinglePropertyEditor.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSinglePropertyEditor.java 2011-08-26 09:14:42 UTC (rev 3661)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/editors/GenericSinglePropertyEditor.java 2011-08-26 09:17:30 UTC (rev 3662)
@@ -1,7 +1,7 @@
/**
*
* openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java 2011-08-26 09:14:42 UTC (rev 3661)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/FileMessageStore.java 2011-08-26 09:17:30 UTC (rev 3662)
@@ -1,7 +1,7 @@
/**
*
* openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java 2011-08-26 09:14:42 UTC (rev 3661)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/MessageStore.java 2011-08-26 09:17:30 UTC (rev 3662)
@@ -1,7 +1,7 @@
/**
*
* openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java 2011-08-26 09:14:42 UTC (rev 3661)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSender.java 2011-08-26 09:17:30 UTC (rev 3662)
@@ -1,7 +1,7 @@
/**
*
* openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java 2011-08-26 09:14:42 UTC (rev 3661)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/email/TemplatedMailSenderImpl.java 2011-08-26 09:17:30 UTC (rev 3662)
@@ -1,7 +1,7 @@
/**
*
* openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java 2011-08-26 09:14:42 UTC (rev 3661)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/remoting/exporters/JSONServiceExporter.java 2011-08-26 09:17:30 UTC (rev 3662)
@@ -1,7 +1,7 @@
/**
*
* openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java 2011-08-26 09:14:42 UTC (rev 3661)
+++ trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java 2011-08-26 09:17:30 UTC (rev 3662)
@@ -1,7 +1,7 @@
/**
*
* openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-spring/src/main/java/it/openutils/web/spring/BaseFormController.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/spring/BaseFormController.java 2011-08-26 09:14:42 UTC (rev 3661)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/spring/BaseFormController.java 2011-08-26 09:17:30 UTC (rev 3662)
@@ -1,7 +1,7 @@
/**
*
* openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-spring/src/main/java/it/openutils/web/spring/EasyDoubleCustomEditor.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/spring/EasyDoubleCustomEditor.java 2011-08-26 09:14:42 UTC (rev 3661)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/spring/EasyDoubleCustomEditor.java 2011-08-26 09:17:30 UTC (rev 3662)
@@ -1,7 +1,7 @@
/**
*
* openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-spring/src/main/java/it/openutils/web/spring/MultiController.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/spring/MultiController.java 2011-08-26 09:14:42 UTC (rev 3661)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/spring/MultiController.java 2011-08-26 09:17:30 UTC (rev 3662)
@@ -1,7 +1,7 @@
/**
*
* openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-spring/src/main/java/it/openutils/web/spring/ParamNameUrlHandlerMapping.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/spring/ParamNameUrlHandlerMapping.java 2011-08-26 09:14:42 UTC (rev 3661)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/spring/ParamNameUrlHandlerMapping.java 2011-08-26 09:17:30 UTC (rev 3662)
@@ -1,7 +1,7 @@
/**
*
* openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-spring/src/main/java/it/openutils/web/spring/SimpleController.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/spring/SimpleController.java 2011-08-26 09:14:42 UTC (rev 3661)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/spring/SimpleController.java 2011-08-26 09:17:30 UTC (rev 3662)
@@ -1,7 +1,7 @@
/**
*
* openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-spring/src/main/java/it/openutils/web/util/MessageUtils.java
===================================================================
--- trunk/openutils-spring/src/main/java/it/openutils/web/util/MessageUtils.java 2011-08-26 09:14:42 UTC (rev 3661)
+++ trunk/openutils-spring/src/main/java/it/openutils/web/util/MessageUtils.java 2011-08-26 09:17:30 UTC (rev 3662)
@@ -1,7 +1,7 @@
/**
*
* openutils spring tools (http://openutils.sourceforge.net/openutils-spring)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 09:14:48
|
Revision: 3661
http://openutils.svn.sourceforge.net/openutils/?rev=3661&view=rev
Author: diego_schivo
Date: 2011-08-26 09:14:42 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
mvn license:format
Modified Paths:
--------------
trunk/openutils-log4j/src/main/java/it/openutils/log4j/AlternateSMTPAppender.java
trunk/openutils-log4j/src/main/java/it/openutils/log4j/DynamicSubjectSMTPAppender.java
trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java
trunk/openutils-log4j/src/main/java/it/openutils/log4j/FilteredPatternLayout.java
trunk/openutils-log4j/src/main/java/it/openutils/log4j/Log4jConfigurationServlet.java
trunk/openutils-log4j/src/test/java/it/openutils/log4j/FilteredPatternLayoutTest.java
Modified: trunk/openutils-log4j/src/main/java/it/openutils/log4j/AlternateSMTPAppender.java
===================================================================
--- trunk/openutils-log4j/src/main/java/it/openutils/log4j/AlternateSMTPAppender.java 2011-08-26 09:02:21 UTC (rev 3660)
+++ trunk/openutils-log4j/src/main/java/it/openutils/log4j/AlternateSMTPAppender.java 2011-08-26 09:14:42 UTC (rev 3661)
@@ -1,7 +1,7 @@
/**
*
* openutils for Log4j (http://www.openmindlab.com/lab/products/openutilslog4j.html)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-log4j/src/main/java/it/openutils/log4j/DynamicSubjectSMTPAppender.java
===================================================================
--- trunk/openutils-log4j/src/main/java/it/openutils/log4j/DynamicSubjectSMTPAppender.java 2011-08-26 09:02:21 UTC (rev 3660)
+++ trunk/openutils-log4j/src/main/java/it/openutils/log4j/DynamicSubjectSMTPAppender.java 2011-08-26 09:14:42 UTC (rev 3661)
@@ -1,7 +1,7 @@
/**
*
* openutils for Log4j (http://www.openmindlab.com/lab/products/openutilslog4j.html)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java
===================================================================
--- trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java 2011-08-26 09:02:21 UTC (rev 3660)
+++ trunk/openutils-log4j/src/main/java/it/openutils/log4j/EnhancedDailyRollingFileAppender.java 2011-08-26 09:14:42 UTC (rev 3661)
@@ -1,7 +1,7 @@
/**
*
* openutils for Log4j (http://www.openmindlab.com/lab/products/openutilslog4j.html)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-log4j/src/main/java/it/openutils/log4j/FilteredPatternLayout.java
===================================================================
--- trunk/openutils-log4j/src/main/java/it/openutils/log4j/FilteredPatternLayout.java 2011-08-26 09:02:21 UTC (rev 3660)
+++ trunk/openutils-log4j/src/main/java/it/openutils/log4j/FilteredPatternLayout.java 2011-08-26 09:14:42 UTC (rev 3661)
@@ -1,7 +1,7 @@
/**
*
* openutils for Log4j (http://www.openmindlab.com/lab/products/openutilslog4j.html)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-log4j/src/main/java/it/openutils/log4j/Log4jConfigurationServlet.java
===================================================================
--- trunk/openutils-log4j/src/main/java/it/openutils/log4j/Log4jConfigurationServlet.java 2011-08-26 09:02:21 UTC (rev 3660)
+++ trunk/openutils-log4j/src/main/java/it/openutils/log4j/Log4jConfigurationServlet.java 2011-08-26 09:14:42 UTC (rev 3661)
@@ -1,7 +1,7 @@
/**
*
* openutils for Log4j (http://www.openmindlab.com/lab/products/openutilslog4j.html)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: trunk/openutils-log4j/src/test/java/it/openutils/log4j/FilteredPatternLayoutTest.java
===================================================================
--- trunk/openutils-log4j/src/test/java/it/openutils/log4j/FilteredPatternLayoutTest.java 2011-08-26 09:02:21 UTC (rev 3660)
+++ trunk/openutils-log4j/src/test/java/it/openutils/log4j/FilteredPatternLayoutTest.java 2011-08-26 09:14:42 UTC (rev 3661)
@@ -1,7 +1,7 @@
/**
*
* openutils for Log4j (http://www.openmindlab.com/lab/products/openutilslog4j.html)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) null-2011, Openmind S.r.l. http://www.openmindonline.it
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 09:02:27
|
Revision: 3660
http://openutils.svn.sourceforge.net/openutils/?rev=3660&view=rev
Author: diego_schivo
Date: 2011-08-26 09:02:21 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
magnolia-test-webapp dependencies
Modified Paths:
--------------
trunk/magnolia-test-webapp/pom.xml
Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml 2011-08-26 08:37:01 UTC (rev 3659)
+++ trunk/magnolia-test-webapp/pom.xml 2011-08-26 09:02:21 UTC (rev 3660)
@@ -142,7 +142,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmessages</artifactId>
- <version>4.2.3-SNAPSHOT</version>
+ <version>4.2.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-08-26 08:37:07
|
Revision: 3659
http://openutils.svn.sourceforge.net/openutils/?rev=3659&view=rev
Author: fgiust
Date: 2011-08-26 08:37:01 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlmessages/pom.xml
Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2011-08-26 08:36:54 UTC (rev 3658)
+++ trunk/openutils-mgnlmessages/pom.xml 2011-08-26 08:37:01 UTC (rev 3659)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlmessages</artifactId>
<name>Messages Module for Magnolia CMS</name>
<description>Manage your translations from the Magnolia admin interface</description>
- <version>4.2.3</version>
+ <version>4.2.4-SNAPSHOT</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -24,9 +24,9 @@
</issueManagement>
<inceptionYear>2008</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.2.3</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.2.3</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmessages-4.2.3</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmessages</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmessages</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmessages</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...> - 2011-08-26 08:37:00
|
Revision: 3658
http://openutils.svn.sourceforge.net/openutils/?rev=3658&view=rev
Author: fgiust
Date: 2011-08-26 08:36:54 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmessages-4.2.3
Added Paths:
-----------
tags/openutils-mgnlmessages-4.2.3/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-08-26 08:36:42
|
Revision: 3657
http://openutils.svn.sourceforge.net/openutils/?rev=3657&view=rev
Author: fgiust
Date: 2011-08-26 08:36:36 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmessages-4.2.3
Modified Paths:
--------------
trunk/openutils-mgnlmessages/pom.xml
Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2011-08-26 08:34:56 UTC (rev 3656)
+++ trunk/openutils-mgnlmessages/pom.xml 2011-08-26 08:36:36 UTC (rev 3657)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -11,7 +10,7 @@
<artifactId>openutils-mgnlmessages</artifactId>
<name>Messages Module for Magnolia CMS</name>
<description>Manage your translations from the Magnolia admin interface</description>
- <version>4.2.3-SNAPSHOT</version>
+ <version>4.2.3</version>
<licenses>
<license>
<name>GPLv3</name>
@@ -25,9 +24,9 @@
</issueManagement>
<inceptionYear>2008</inceptionYear>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmessages</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmessages</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmessages</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.2.3</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmessages-4.2.3</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmessages-4.2.3</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...> - 2011-08-26 08:35:02
|
Revision: 3656
http://openutils.svn.sourceforge.net/openutils/?rev=3656&view=rev
Author: fgiust
Date: 2011-08-26 08:34:56 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
removed dependency from taglib-cms
Modified Paths:
--------------
trunk/openutils-mgnlmessages/pom.xml
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2011-08-26 08:32:49 UTC (rev 3655)
+++ trunk/openutils-mgnlmessages/pom.xml 2011-08-26 08:34:56 UTC (rev 3656)
@@ -78,11 +78,6 @@
<version>${magnolia.version}</version>
</dependency>
<dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-taglib-cms</artifactId>
- <version>${magnolia.version}</version>
- </dependency>
- <dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltasks</artifactId>
<version>4.1.2</version>
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java 2011-08-26 08:32:49 UTC (rev 3655)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java 2011-08-26 08:34:56 UTC (rev 3656)
@@ -21,7 +21,7 @@
import info.magnolia.cms.i18n.I18nContentSupportFactory;
import info.magnolia.cms.i18n.MessagesManager;
-import info.magnolia.cms.taglibs.CmsFunctions;
+import info.magnolia.cms.security.Permission;
import info.magnolia.context.MgnlContext;
import info.magnolia.module.templating.MagnoliaTemplatingUtilities;
@@ -72,7 +72,8 @@
{
if (MgnlContext.getAggregationState().getMainContent() != null
&& MagnoliaTemplatingUtilities.getInstance().isEditMode()
- && CmsFunctions.canEdit())
+ && MgnlContext.getAggregationState().getMainContent().isGranted(Permission.WRITE)) // equivalent of
+ // CmsFunctions.canEdit()
{
String keyCssClass = StringUtils.replace(key, ".", "_");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-08-26 08:32:56
|
Revision: 3655
http://openutils.svn.sourceforge.net/openutils/?rev=3655&view=rev
Author: fgiust
Date: 2011-08-26 08:32:49 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
update deps and formatting (no tabs!)
Modified Paths:
--------------
trunk/openutils-mgnlmessages/pom.xml
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2011-08-26 08:11:17 UTC (rev 3654)
+++ trunk/openutils-mgnlmessages/pom.xml 2011-08-26 08:32:49 UTC (rev 3655)
@@ -1,145 +1,132 @@
-<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>
- <relativePath>../openutils-parent</relativePath>
- <version>1.9</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
- <artifactId>openutils-mgnlmessages</artifactId>
- <name>Messages Module for Magnolia CMS</name>
- <description>Manage your translations from the Magnolia admin interface</description>
- <version>4.2.3-SNAPSHOT</version>
- <licenses>
- <license>
- <name>GPLv3</name>
- <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
- </license>
- </licenses>
- <url>http://www.openmindlab.com/lab/products/messages.html</url>
- <issueManagement>
- <system>jira</system>
- <url>http://jira.openmindlab.com/browse/MESSAGES</url>
- </issueManagement>
- <inceptionYear>2008</inceptionYear>
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmessages</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmessages</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmessages</url>
- </scm>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>META-INF/magnolia/*</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>${basedir}/src/main/assembly/assembly-bundle.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-core</artifactId>
- <version>${magnolia.version}</version>
- </dependency>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-admininterface</artifactId>
- <version>${magnolia.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnltasks</artifactId>
- <version>4.1.2</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlext</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-mgnlcriteria</artifactId>
- <version>3.3.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-elfunctions</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-taglib-cms</artifactId>
- <version>4.3.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>3.6</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <repositories>
- <repository>
- <id>repository.magnolia.info</id>
- <name>magnolia repository</name>
- <url>http://nexus.magnolia-cms.com/content/groups/public</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <properties>
- <magnolia.version>4.4.1</magnolia.version>
- </properties>
+<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>
+ <relativePath>../openutils-parent</relativePath>
+ <version>1.9</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+ <artifactId>openutils-mgnlmessages</artifactId>
+ <name>Messages Module for Magnolia CMS</name>
+ <description>Manage your translations from the Magnolia admin interface</description>
+ <version>4.2.3-SNAPSHOT</version>
+ <licenses>
+ <license>
+ <name>GPLv3</name>
+ <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
+ </license>
+ </licenses>
+ <url>http://www.openmindlab.com/lab/products/messages.html</url>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.openmindlab.com/browse/MESSAGES</url>
+ </issueManagement>
+ <inceptionYear>2008</inceptionYear>
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmessages</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmessages</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmessages</url>
+ </scm>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>META-INF/magnolia/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/assembly-bundle.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-core</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-admininterface</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-taglib-cms</artifactId>
+ <version>${magnolia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnltasks</artifactId>
+ <version>4.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlext</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlcriteria</artifactId>
+ <version>3.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-elfunctions</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.0.1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <properties>
+ <magnolia.version>4.4.4</magnolia.version>
+ </properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java 2011-08-26 08:11:17 UTC (rev 3654)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java 2011-08-26 08:32:49 UTC (rev 3655)
@@ -32,117 +32,127 @@
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
-public class MessagesEl {
- /*
- * Per rendere editabili i messaggi complessi con argomenti e link è
- * necessario: - scrivere nel tag il message non formattato in default e
- * locale corrente - modificare msg-global.tag per recuperare e visualizzare
- * correttamente i dati passati al tag - per i messaggi con link e
- * necessario non raddoppiare gli apici o poter discrimininare nel
- * salvataggio o far inserire i doppi apici a chi modifica le label in
- * pagina
- */
- public static String message(String key, boolean fallback,
- boolean defaultLocale, Object[] arguments) {
- if (defaultLocale) {
- return MessagesManager.getMessages(
- I18nContentSupportFactory.getI18nSupport()
- .getFallbackLocale()).get(key, arguments);
- } else {
- String value = MessagesManager.getMessages(
- I18nContentSupportFactory.getI18nSupport().getLocale())
- .get(key, arguments);
- if (fallback
- && (StringUtils.isBlank(value) || StringUtils.startsWith(
- value, "???"))) {
- return MessagesManager.getMessages(
- I18nContentSupportFactory.getI18nSupport()
- .getFallbackLocale()).get(key, arguments);
- }
- return value;
- }
- }
+public class MessagesEl
+{
- private static final String MSGS_TPL = "<span class=\"msgEdit {0}\" data-msgkey=\"{1}\" data-msglocale=\"{2}\" data-msgdefaultlocale=\"{3}\" data-msgdefault=\"{4}\">{5}</span>";
+ /*
+ * Per rendere editabili i messaggi complessi con argomenti e link è necessario: - scrivere nel tag il message non
+ * formattato in default e locale corrente - modificare msg-global.tag per recuperare e visualizzare correttamente i
+ * dati passati al tag - per i messaggi con link e necessario non raddoppiare gli apici o poter discrimininare nel
+ * salvataggio o far inserire i doppi apici a chi modifica le label in pagina
+ */
- public static String messageSimple(String key, Object[] arguments) {
- if (MgnlContext.getAggregationState().getMainContent() != null
- && MagnoliaTemplatingUtilities.getInstance().isEditMode()
- && CmsFunctions.canEdit()) {
- String keyCssClass = StringUtils.replace(key, ".", "_");
+ public static String message(String key, boolean fallback, boolean defaultLocale, Object[] arguments)
+ {
+ if (defaultLocale)
+ {
+ return MessagesManager.getMessages(I18nContentSupportFactory.getI18nSupport().getFallbackLocale()).get(
+ key,
+ arguments);
+ }
+ else
+ {
+ String value = MessagesManager.getMessages(I18nContentSupportFactory.getI18nSupport().getLocale()).get(
+ key,
+ arguments);
+ if (fallback && (StringUtils.isBlank(value) || StringUtils.startsWith(value, "???")))
+ {
+ return MessagesManager.getMessages(I18nContentSupportFactory.getI18nSupport().getFallbackLocale()).get(
+ key,
+ arguments);
+ }
+ return value;
+ }
+ }
- String tag = MessageFormat.format(MSGS_TPL, keyCssClass, key,
- I18nContentSupportFactory.getI18nSupport().getLocale(),
- I18nContentSupportFactory.getI18nSupport()
- .getFallbackLocale(),
- // evito di sostituire i placeholder quando sono in
- // edit-mode
- // StringEscapeUtils.escapeHtml(message(key, false, true,
- // arguments)),
- StringEscapeUtils.escapeHtml(message(key, false, true)),
- // evito di sostituire i placeholder quando sono in
- // edit-mode
- // message(key, false, false, arguments));
- message(key, false, false));
- return tag;
- }
- return message(key, true, false, arguments);
- }
+ private static final String MSGS_TPL = "<span class=\"msgEdit {0}\" data-msgkey=\"{1}\" data-msglocale=\"{2}\" data-msgdefaultlocale=\"{3}\" data-msgdefault=\"{4}\">{5}</span>";
- public static String messagePlain(String key, Object[] arguments) {
- return message(key, true, false, arguments);
- }
+ public static String messageSimple(String key, Object[] arguments)
+ {
+ if (MgnlContext.getAggregationState().getMainContent() != null
+ && MagnoliaTemplatingUtilities.getInstance().isEditMode()
+ && CmsFunctions.canEdit())
+ {
+ String keyCssClass = StringUtils.replace(key, ".", "_");
- public static String messageSimple(String key) {
- return messageSimple(key, null);
- }
+ String tag = MessageFormat.format(MSGS_TPL, keyCssClass, key, I18nContentSupportFactory
+ .getI18nSupport()
+ .getLocale(), I18nContentSupportFactory.getI18nSupport().getFallbackLocale(),
+ // evito di sostituire i placeholder quando sono in
+ // edit-mode
+ // StringEscapeUtils.escapeHtml(message(key, false, true,
+ // arguments)),
+ StringEscapeUtils.escapeHtml(message(key, false, true)),
+ // evito di sostituire i placeholder quando sono in
+ // edit-mode
+ // message(key, false, false, arguments));
+ message(key, false, false));
+ return tag;
+ }
+ return message(key, true, false, arguments);
+ }
- public static String message(String key, boolean fallback,
- boolean defaultLocale) {
- return message(key, fallback, defaultLocale, null);
- }
+ public static String messagePlain(String key, Object[] arguments)
+ {
+ return message(key, true, false, arguments);
+ }
- public static String messagePlain(String key) {
- return messagePlain(key, null);
- }
+ public static String messageSimple(String key)
+ {
+ return messageSimple(key, null);
+ }
- public static String messageSimple(String key, Object argument) {
- return messageSimple(key, new Object[] { argument });
- }
+ public static String message(String key, boolean fallback, boolean defaultLocale)
+ {
+ return message(key, fallback, defaultLocale, null);
+ }
- public static String message(String key, boolean fallback,
- boolean defaultLocale, Object argument) {
- return message(key, fallback, defaultLocale, new Object[] { argument });
- }
+ public static String messagePlain(String key)
+ {
+ return messagePlain(key, null);
+ }
- public static String messagePlain(String key, Object argument) {
- return messagePlain(key, new Object[] { argument });
- }
+ public static String messageSimple(String key, Object argument)
+ {
+ return messageSimple(key, new Object[]{argument });
+ }
- public static String messageSimple(String key, Object arg1, Object arg2) {
- return messageSimple(key, new Object[] { arg1, arg2 });
- }
+ public static String message(String key, boolean fallback, boolean defaultLocale, Object argument)
+ {
+ return message(key, fallback, defaultLocale, new Object[]{argument });
+ }
- public static String message(String key, boolean fallback,
- boolean defaultLocale, Object arg1, Object arg2) {
- return message(key, fallback, defaultLocale,
- new Object[] { arg1, arg2 });
- }
+ public static String messagePlain(String key, Object argument)
+ {
+ return messagePlain(key, new Object[]{argument });
+ }
- public static String messagePlain(String key, Object arg1, Object arg2) {
- return messagePlain(key, new Object[] { arg1, arg2 });
- }
+ public static String messageSimple(String key, Object arg1, Object arg2)
+ {
+ return messageSimple(key, new Object[]{arg1, arg2 });
+ }
- public static String messagePlain(String key, Object arg1, Object arg2,
- Object arg3) {
- return messagePlain(key, new Object[] { arg1, arg2, arg3 });
- }
+ public static String message(String key, boolean fallback, boolean defaultLocale, Object arg1, Object arg2)
+ {
+ return message(key, fallback, defaultLocale, new Object[]{arg1, arg2 });
+ }
- public static String escapeJs(String msg) {
- return StringEscapeUtils.escapeJavaScript(msg);
- }
-
+ public static String messagePlain(String key, Object arg1, Object arg2)
+ {
+ return messagePlain(key, new Object[]{arg1, arg2 });
+ }
+
+ public static String messagePlain(String key, Object arg1, Object arg2, Object arg3)
+ {
+ return messagePlain(key, new Object[]{arg1, arg2, arg3 });
+ }
+
+ public static String escapeJs(String msg)
+ {
+ return StringEscapeUtils.escapeJavaScript(msg);
+ }
+
public static boolean messageTextContains(String str, String searchStr)
{
return StringUtils.containsIgnoreCase(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 08:11:23
|
Revision: 3654
http://openutils.svn.sourceforge.net/openutils/?rev=3654&view=rev
Author: diego_schivo
Date: 2011-08-26 08:11:17 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-16 Newline in json response
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 07:59:18 UTC (rev 3653)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 08:11:17 UTC (rev 3654)
@@ -150,7 +150,9 @@
MgnlContext.setLocale(newLoc);
json = "rootObj = {value: '"
- + StringUtils.defaultString(StringUtils.replace(MgnlContext.getMessages().get(key), "'", "\\'"))
+ + StringUtils.defaultString(StringUtils.replaceEach(MgnlContext.getMessages().get(key), new String[]{
+ "'",
+ "\n" }, new String[]{"\\'", "\\n" }))
+ "'}";
MgnlContext.setLocale(locBk);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:59:24
|
Revision: 3653
http://openutils.svn.sourceforge.net/openutils/?rev=3653&view=rev
Author: diego_schivo
Date: 2011-08-26 07:59:18 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
magnolia-test-webapp dependencies
Modified Paths:
--------------
trunk/magnolia-test-webapp/pom.xml
Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml 2011-08-26 07:58:21 UTC (rev 3652)
+++ trunk/magnolia-test-webapp/pom.xml 2011-08-26 07:59:18 UTC (rev 3653)
@@ -117,7 +117,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcriteria</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -137,7 +137,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmedia</artifactId>
- <version>4.4.2-SNAPSHOT</version>
+ <version>4.4.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -157,7 +157,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlstripes</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -176,7 +176,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlutils</artifactId>
- <version>1.0.9-SNAPSHOT</version>
+ <version>1.0.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:58:27
|
Revision: 3652
http://openutils.svn.sourceforge.net/openutils/?rev=3652&view=rev
Author: diego_schivo
Date: 2011-08-26 07:58:21 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 isBlank
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 07:55:43 UTC (rev 3651)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 07:58:21 UTC (rev 3652)
@@ -227,26 +227,29 @@
@SuppressWarnings("unchecked")
public String search()
{
- Locale locBk = MgnlContext.getLocale();
- Set<String> set = new HashSet<String>();
- for (Locale newLoc : MessagesConfigurationManager.getAvaiableLocales())
+ Set<String> keySet = new HashSet<String>();
+ if (!StringUtils.isBlank(text))
{
- MgnlContext.setLocale(newLoc);
- Messages messages = MgnlContext.getMessages();
- Iterator<String> it = messages.keys();
- while (it.hasNext())
+ Locale locBk = MgnlContext.getLocale();
+ for (Locale newLoc : MessagesConfigurationManager.getAvaiableLocales())
{
- String curKey = it.next();
- String curText = messages.get(curKey);
- if (MessagesEl.messageTextContains(curText, text))
+ MgnlContext.setLocale(newLoc);
+ Messages messages = MgnlContext.getMessages();
+ Iterator<String> it = messages.keys();
+ while (it.hasNext())
{
- set.add(curKey);
+ String curKey = it.next();
+ String curText = messages.get(curKey);
+ if (MessagesEl.messageTextContains(curText, text))
+ {
+ keySet.add(curKey);
+ }
}
}
+ MgnlContext.setLocale(locBk);
}
- MgnlContext.setLocale(locBk);
- keys = new ArrayList<String>(set);
+ keys = new ArrayList<String>(keySet);
Collections.sort(keys);
StringBuilder sb = new StringBuilder("[ ");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:55:49
|
Revision: 3651
http://openutils.svn.sourceforge.net/openutils/?rev=3651&view=rev
Author: diego_schivo
Date: 2011-08-26 07:55:43 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 null/empty test
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java
Modified: trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java
===================================================================
--- trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java 2011-08-26 07:54:18 UTC (rev 3650)
+++ trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java 2011-08-26 07:55:43 UTC (rev 3651)
@@ -32,6 +32,11 @@
{
Assert.assertTrue(MessagesEl.messageTextContains("L'impostazione non è stata salvata", "impostazione"));
Assert.assertFalse(MessagesEl.messageTextContains("L'impostazione non è stata salvata", "impostazioni"));
+ }
+
+ @Test
+ public void testMessageTextContainsEmpty()
+ {
Assert.assertFalse(MessagesEl.messageTextContains(null, null));
Assert.assertFalse(MessagesEl.messageTextContains(StringUtils.EMPTY, StringUtils.EMPTY));
Assert.assertFalse(MessagesEl.messageTextContains(null, "impostazioni"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:54:25
|
Revision: 3650
http://openutils.svn.sourceforge.net/openutils/?rev=3650&view=rev
Author: diego_schivo
Date: 2011-08-26 07:54:18 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 null/empty test
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java
Modified: trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java
===================================================================
--- trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java 2011-08-26 07:51:04 UTC (rev 3649)
+++ trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java 2011-08-26 07:54:18 UTC (rev 3650)
@@ -32,8 +32,12 @@
{
Assert.assertTrue(MessagesEl.messageTextContains("L'impostazione non è stata salvata", "impostazione"));
Assert.assertFalse(MessagesEl.messageTextContains("L'impostazione non è stata salvata", "impostazioni"));
+ Assert.assertFalse(MessagesEl.messageTextContains(null, null));
+ Assert.assertFalse(MessagesEl.messageTextContains(StringUtils.EMPTY, StringUtils.EMPTY));
Assert.assertFalse(MessagesEl.messageTextContains(null, "impostazioni"));
Assert.assertFalse(MessagesEl.messageTextContains(StringUtils.EMPTY, "impostazioni"));
+ Assert.assertFalse(MessagesEl.messageTextContains("L'impostazione non è stata salvata", null));
+ Assert.assertTrue(MessagesEl.messageTextContains("L'impostazione non è stata salvata", StringUtils.EMPTY));
}
@Test
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:51:10
|
Revision: 3649
http://openutils.svn.sourceforge.net/openutils/?rev=3649&view=rev
Author: diego_schivo
Date: 2011-08-26 07:51:04 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 null/empty test
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java
Modified: trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java
===================================================================
--- trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java 2011-08-26 07:50:01 UTC (rev 3648)
+++ trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java 2011-08-26 07:51:04 UTC (rev 3649)
@@ -19,6 +19,7 @@
package net.sourceforge.openutils.mgnlmessages.el;
+import org.apache.commons.lang.StringUtils;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -31,6 +32,8 @@
{
Assert.assertTrue(MessagesEl.messageTextContains("L'impostazione non è stata salvata", "impostazione"));
Assert.assertFalse(MessagesEl.messageTextContains("L'impostazione non è stata salvata", "impostazioni"));
+ Assert.assertFalse(MessagesEl.messageTextContains(null, "impostazioni"));
+ Assert.assertFalse(MessagesEl.messageTextContains(StringUtils.EMPTY, "impostazioni"));
}
@Test
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:50:07
|
Revision: 3648
http://openutils.svn.sourceforge.net/openutils/?rev=3648&view=rev
Author: diego_schivo
Date: 2011-08-26 07:50:01 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 fix html tags test
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java 2011-08-26 07:46:43 UTC (rev 3647)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java 2011-08-26 07:50:01 UTC (rev 3648)
@@ -27,6 +27,8 @@
import java.text.MessageFormat;
+import net.sourceforge.openutils.elfunctions.ElStringUtils;
+
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
@@ -143,6 +145,8 @@
public static boolean messageTextContains(String str, String searchStr)
{
- return StringUtils.containsIgnoreCase(StringEscapeUtils.unescapeHtml(str), searchStr);
+ return StringUtils.containsIgnoreCase(
+ ElStringUtils.stripHtmlTags(StringEscapeUtils.unescapeHtml(str)),
+ searchStr);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:46:49
|
Revision: 3647
http://openutils.svn.sourceforge.net/openutils/?rev=3647&view=rev
Author: diego_schivo
Date: 2011-08-26 07:46:43 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 openutils-elfunctions
Modified Paths:
--------------
trunk/openutils-mgnlmessages/pom.xml
Modified: trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- trunk/openutils-mgnlmessages/pom.xml 2011-08-26 07:43:35 UTC (rev 3646)
+++ trunk/openutils-mgnlmessages/pom.xml 2011-08-26 07:46:43 UTC (rev 3647)
@@ -92,6 +92,11 @@
<version>3.3.1</version>
</dependency>
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-elfunctions</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
<groupId>info.magnolia</groupId>
<artifactId>magnolia-taglib-cms</artifactId>
<version>4.3.5</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:43:41
|
Revision: 3646
http://openutils.svn.sourceforge.net/openutils/?rev=3646&view=rev
Author: diego_schivo
Date: 2011-08-26 07:43:35 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 html tags test
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java
Modified: trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java
===================================================================
--- trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java 2011-08-26 07:41:47 UTC (rev 3645)
+++ trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java 2011-08-26 07:43:35 UTC (rev 3646)
@@ -29,15 +29,23 @@
@Test
public void testMessageTextContains()
{
- Assert.assertTrue(MessagesEl.messageTextContains("L'impostazione è stata salvata", "impostazione"));
- Assert.assertFalse(MessagesEl.messageTextContains("L'impostazione è stata salvata", "impostazioni"));
+ Assert.assertTrue(MessagesEl.messageTextContains("L'impostazione non è stata salvata", "impostazione"));
+ Assert.assertFalse(MessagesEl.messageTextContains("L'impostazione non è stata salvata", "impostazioni"));
}
@Test
public void testMessageTextContainsHtmlEntities()
{
Assert.assertTrue(MessagesEl.messageTextContains(
- "L'impostazione è stata salvata",
- "L'impostazione è"));
+ "L'impostazione non è stata salvata",
+ "L'impostazione non è"));
}
+
+ @Test
+ public void testMessageTextContainsHtmlTags()
+ {
+ Assert.assertTrue(MessagesEl.messageTextContains(
+ "L'impostazione <strong>non</strong> è stata salvata",
+ "L'impostazione non è"));
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:41:53
|
Revision: 3645
http://openutils.svn.sourceforge.net/openutils/?rev=3645&view=rev
Author: diego_schivo
Date: 2011-08-26 07:41:47 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 fix html entities test
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java 2011-08-26 07:38:27 UTC (rev 3644)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java 2011-08-26 07:41:47 UTC (rev 3645)
@@ -141,8 +141,8 @@
return StringEscapeUtils.escapeJavaScript(msg);
}
- public static boolean messageTextContains(String str, String searchStr)
- {
- return StringUtils.containsIgnoreCase(str, searchStr);
- }
+ public static boolean messageTextContains(String str, String searchStr)
+ {
+ return StringUtils.containsIgnoreCase(StringEscapeUtils.unescapeHtml(str), searchStr);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:38:33
|
Revision: 3644
http://openutils.svn.sourceforge.net/openutils/?rev=3644&view=rev
Author: diego_schivo
Date: 2011-08-26 07:38:27 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 html entities test
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java
Modified: trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java
===================================================================
--- trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java 2011-08-26 07:34:31 UTC (rev 3643)
+++ trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java 2011-08-26 07:38:27 UTC (rev 3644)
@@ -32,4 +32,12 @@
Assert.assertTrue(MessagesEl.messageTextContains("L'impostazione è stata salvata", "impostazione"));
Assert.assertFalse(MessagesEl.messageTextContains("L'impostazione è stata salvata", "impostazioni"));
}
+
+ @Test
+ public void testMessageTextContainsHtmlEntities()
+ {
+ Assert.assertTrue(MessagesEl.messageTextContains(
+ "L'impostazione è stata salvata",
+ "L'impostazione è"));
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:34:37
|
Revision: 3643
http://openutils.svn.sourceforge.net/openutils/?rev=3643&view=rev
Author: diego_schivo
Date: 2011-08-26 07:34:31 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 MessagesElTest
Added Paths:
-----------
trunk/openutils-mgnlmessages/src/test/java/net/
trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/
trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/
trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/
trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/
trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java
Property Changed:
----------------
trunk/openutils-mgnlmessages/
Property changes on: trunk/openutils-mgnlmessages
___________________________________________________________________
Modified: svn:ignore
- target
.settings
.checkstyle
.classpath
.project
pom.xml.releaseBackup
release.properties
+ target
.settings
.checkstyle
.classpath
.project
pom.xml.releaseBackup
release.properties
test-output
Added: trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java
===================================================================
--- trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java (rev 0)
+++ trunk/openutils-mgnlmessages/src/test/java/net/sourceforge/openutils/mgnlmessages/el/MessagesElTest.java 2011-08-26 07:34:31 UTC (rev 3643)
@@ -0,0 +1,35 @@
+/**
+ *
+ * Messages Module for Magnolia CMS (http://www.openmindlab.com/lab/products/messages.html)
+ * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmessages.el;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class MessagesElTest
+{
+
+ @Test
+ public void testMessageTextContains()
+ {
+ Assert.assertTrue(MessagesEl.messageTextContains("L'impostazione è stata salvata", "impostazione"));
+ Assert.assertFalse(MessagesEl.messageTextContains("L'impostazione è stata salvata", "impostazioni"));
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:23:06
|
Revision: 3642
http://openutils.svn.sourceforge.net/openutils/?rev=3642&view=rev
Author: diego_schivo
Date: 2011-08-26 07:23:00 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 MessagesEl.messageTextContains
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java 2011-08-26 07:19:52 UTC (rev 3641)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java 2011-08-26 07:23:00 UTC (rev 3642)
@@ -140,4 +140,9 @@
public static String escapeJs(String msg) {
return StringEscapeUtils.escapeJavaScript(msg);
}
+
+ public static boolean messageTextContains(String str, String searchStr)
+ {
+ return StringUtils.containsIgnoreCase(str, searchStr);
+ }
}
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 07:19:52 UTC (rev 3641)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 07:23:00 UTC (rev 3642)
@@ -42,6 +42,7 @@
import javax.servlet.http.HttpServletResponse;
import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
+import net.sourceforge.openutils.mgnlmessages.el.MessagesEl;
import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
import org.apache.commons.lang.StringUtils;
@@ -237,7 +238,7 @@
{
String curKey = it.next();
String curText = messages.get(curKey);
- if (StringUtils.containsIgnoreCase(curText, text))
+ if (MessagesEl.messageTextContains(curText, text))
{
set.add(curKey);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:19:58
|
Revision: 3641
http://openutils.svn.sourceforge.net/openutils/?rev=3641&view=rev
Author: diego_schivo
Date: 2011-08-26 07:19:52 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 containsIgnoreCase
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 07:13:45 UTC (rev 3640)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 07:19:52 UTC (rev 3641)
@@ -237,7 +237,7 @@
{
String curKey = it.next();
String curText = messages.get(curKey);
- if (StringUtils.contains(curText, text))
+ if (StringUtils.containsIgnoreCase(curText, text))
{
set.add(curKey);
}
@@ -246,7 +246,6 @@
MgnlContext.setLocale(locBk);
keys = new ArrayList<String>(set);
-
Collections.sort(keys);
StringBuilder sb = new StringBuilder("[ ");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:13:51
|
Revision: 3640
http://openutils.svn.sourceforge.net/openutils/?rev=3640&view=rev
Author: diego_schivo
Date: 2011-08-26 07:13:45 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-15 refactoring
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 07:11:59 UTC (rev 3639)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 07:13:45 UTC (rev 3640)
@@ -149,10 +149,8 @@
MgnlContext.setLocale(newLoc);
json = "rootObj = {value: '"
- + ((MgnlContext.getMessages().get(key) != null) ? StringUtils.replace(
- MgnlContext.getMessages().get(key),
- "'",
- "\\'") : "") + "'}";
+ + StringUtils.defaultString(StringUtils.replace(MgnlContext.getMessages().get(key), "'", "\\'"))
+ + "'}";
MgnlContext.setLocale(locBk);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
