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-01-14 10:36:20
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/333/changes> Changes: [diego_schivo] PIRMEDIA-208 always show mgnlTreeControlAddressBar ------------------------------------------ Started by an SCM change Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia U src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl A src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddressBar.ftl At revision 3244 Parsing POMs [openutils-mgnlmedia] $ /usr/local/jdk1.6.0_20/bin/java -cp /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.386.jar:/usr/local/maven/boot/classworlds-1.1.jar hudson.maven.agent.Main /usr/local/maven /data/webapps/hudson/WEB-INF/lib/remoting-1.386.jar /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.386.jar 40549 /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar <===[HUDSON REMOTING CAPACITY]===> channel started Executing Maven: -B -f <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/pom.xml> install [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Building Magnolia SimpleMedia Module [INFO] task-segment: [install] [INFO] ------------------------------------------------------------------------ [INFO] [resources:resources {execution: default-resources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 265 resources [INFO] Copying 1 resource [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [INFO] [compiler:compile {execution: default-compile}] [INFO] Nothing to compile - all classes are up to date [INFO] [resources:testResources {execution: default-testResources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] [compiler:testCompile {execution: default-testCompile}] [INFO] Nothing to compile - all classes are up to date [INFO] [surefire:test {execution: default-test}] [INFO] Surefire report directory: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/surefire-reports> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running TestSuite Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.938 sec Results : Tests run: 8, Failures: 0, Errors: 0, Skipped: 0 [HUDSON] Recording test results [INFO] [jar:jar {execution: default-jar}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar> [INFO] Preparing source:jar [WARNING] Removing: jar from forked lifecycle, to prevent recursive invocation. [INFO] No goals needed for project - skipping [INFO] [source:jar {execution: attach-sources}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar> [INFO] [assembly:single {execution: bundle}] [INFO] Reading assembly descriptor: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml> [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [INFO] Building zip: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip> [INFO] [license:check {execution: default}] [INFO] Checking licenses... [INFO] Missing header in: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java> [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/pom.xml> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-14_11-21-59/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/pom.xml [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-14_11-21-59/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-14_11-21-59/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-14_11-21-59/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Some files do not have the expected license header [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 1 minute 25 seconds [INFO] Finished at: Fri Jan 14 11:23:29 CET 2011 [INFO] Final Memory: 40M/295M [INFO] ------------------------------------------------------------------------ Waiting for Hudson to finish collecting data Sending e-mails to: ope...@li... channel stopped |
From: <hu...@op...> - 2011-01-14 10:36:17
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/333/changes> Changes: [diego_schivo] PIRMEDIA-208 always show mgnlTreeControlAddressBar ------------------------------------------ <===[HUDSON REMOTING CAPACITY]===> channel started Executing Maven: -B -f <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/pom.xml> install [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Building Magnolia SimpleMedia Module [INFO] task-segment: [install] [INFO] ------------------------------------------------------------------------ [INFO] [resources:resources {execution: default-resources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 265 resources [INFO] Copying 1 resource [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [INFO] [compiler:compile {execution: default-compile}] [INFO] Nothing to compile - all classes are up to date [INFO] [resources:testResources {execution: default-testResources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] [compiler:testCompile {execution: default-testCompile}] [INFO] Nothing to compile - all classes are up to date [INFO] [surefire:test {execution: default-test}] [INFO] Surefire report directory: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/surefire-reports> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running TestSuite Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.938 sec Results : Tests run: 8, Failures: 0, Errors: 0, Skipped: 0 [HUDSON] Recording test results [INFO] [jar:jar {execution: default-jar}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar> [INFO] Preparing source:jar [WARNING] Removing: jar from forked lifecycle, to prevent recursive invocation. [INFO] No goals needed for project - skipping [INFO] [source:jar {execution: attach-sources}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar> [INFO] [assembly:single {execution: bundle}] [INFO] Reading assembly descriptor: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/src/main/assembly/assembly-bundle.xml> [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [INFO] Building zip: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip> [INFO] [license:check {execution: default}] [INFO] Checking licenses... [INFO] Missing header in: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java> [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/pom.xml> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-14_11-21-59/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/pom.xml [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-14_11-21-59/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-14_11-21-59/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-14_11-21-59/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Some files do not have the expected license header [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 1 minute 25 seconds [INFO] Finished at: Fri Jan 14 11:23:29 CET 2011 [INFO] Final Memory: 40M/295M [INFO] ------------------------------------------------------------------------ Waiting for Hudson to finish collecting data |
From: <die...@us...> - 2011-01-14 10:04:27
|
Revision: 3244 http://openutils.svn.sourceforge.net/openutils/?rev=3244&view=rev Author: diego_schivo Date: 2011-01-14 10:04:21 +0000 (Fri, 14 Jan 2011) Log Message: ----------- PIRMEDIA-208 always show mgnlTreeControlAddressBar Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl Added Paths: ----------- trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddressBar.ftl Added: trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddressBar.ftl =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddressBar.ftl (rev 0) +++ trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeAddressBar.ftl 2011-01-14 10:04:21 UTC (rev 3244) @@ -0,0 +1,3 @@ +<img src="${contextPath}/.resources/0.gif" height="3px"/> + +<input id="${tree.javascriptTree}AddressBar" type="text" onkeydown="if (mgnlIsKeyEnter(event)) mgnlTreeControl.expandNode(this.value);" class="mgnlDialogControlEdit" style="bottom: 45px; left: 0; position: absolute; width: 222px;" value="" /> Modified: trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl 2011-01-14 08:54:00 UTC (rev 3243) +++ trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl 2011-01-14 10:04:21 UTC (rev 3244) @@ -25,12 +25,14 @@ <#include "MediaTreeAddress.ftl"/> </#if> --> -<#if tree.browseMode || tree.class.name == 'net.sourceforge.openutils.mgnlmedia.media.tree.MediaModuleTree'> +<#if tree.browseMode> <#include "TreeAddressBar.ftl"/> +<#else> + <#include "MediaTreeAddressBar.ftl"/> </#if> <#if !tree.browseMode && tree.functionBar?exists> ${tree.functionBar.html} </#if> -<#include "TreeJavascript.ftl"/> \ No newline at end of file +<#include "TreeJavascript.ftl"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hu...@op...> - 2011-01-14 09:36:22
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/332/changes> Changes: [diego_schivo] PIRMEDIA-208 always show mgnlTreeControlAddressBar ------------------------------------------ Started by an SCM change Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia U src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl At revision 3243 Parsing POMs [openutils-mgnlmedia] $ /usr/local/jdk1.6.0_20/bin/java -cp /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.386.jar:/usr/local/maven/boot/classworlds-1.1.jar hudson.maven.agent.Main /usr/local/maven /data/webapps/hudson/WEB-INF/lib/remoting-1.386.jar /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.386.jar 38841 /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar <===[HUDSON REMOTING CAPACITY]===> channel started Executing Maven: -B -f <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/pom.xml> install [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Building Magnolia SimpleMedia Module [INFO] task-segment: [install] [INFO] ------------------------------------------------------------------------ [INFO] [resources:resources {execution: default-resources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 264 resources [INFO] Copying 1 resource [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [INFO] [compiler:compile {execution: default-compile}] [INFO] Nothing to compile - all classes are up to date [INFO] [resources:testResources {execution: default-testResources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] [compiler:testCompile {execution: default-testCompile}] [INFO] Nothing to compile - all classes are up to date [INFO] [surefire:test {execution: default-test}] [INFO] Surefire report directory: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/surefire-reports> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running TestSuite Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 15.183 sec Results : Tests run: 8, Failures: 0, Errors: 0, Skipped: 0 [HUDSON] Recording test results [INFO] [jar:jar {execution: default-jar}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar> [INFO] Preparing source:jar [WARNING] Removing: jar from forked lifecycle, to prevent recursive invocation. [INFO] No goals needed for project - skipping [INFO] [source:jar {execution: attach-sources}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar> [INFO] [assembly:single {execution: bundle}] [INFO] Reading assembly descriptor: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml> [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [INFO] Building zip: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip> [INFO] [license:check {execution: default}] [INFO] Checking licenses... [INFO] Missing header in: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java> [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/pom.xml> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-14_10-21-49/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/pom.xml [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-14_10-21-49/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-14_10-21-49/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-14_10-21-49/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Some files do not have the expected license header [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 1 minute 37 seconds [INFO] Finished at: Fri Jan 14 10:23:30 CET 2011 [INFO] Final Memory: 40M/297M [INFO] ------------------------------------------------------------------------ Waiting for Hudson to finish collecting data Sending e-mails to: ope...@li... channel stopped |
From: <hu...@op...> - 2011-01-14 09:36:11
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/332/changes> Changes: [diego_schivo] PIRMEDIA-208 always show mgnlTreeControlAddressBar ------------------------------------------ <===[HUDSON REMOTING CAPACITY]===> channel started Executing Maven: -B -f <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/pom.xml> install [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Building Magnolia SimpleMedia Module [INFO] task-segment: [install] [INFO] ------------------------------------------------------------------------ [INFO] [resources:resources {execution: default-resources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 264 resources [INFO] Copying 1 resource [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [INFO] [compiler:compile {execution: default-compile}] [INFO] Nothing to compile - all classes are up to date [INFO] [resources:testResources {execution: default-testResources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] [compiler:testCompile {execution: default-testCompile}] [INFO] Nothing to compile - all classes are up to date [INFO] [surefire:test {execution: default-test}] [INFO] Surefire report directory: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/surefire-reports> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running TestSuite Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 15.183 sec Results : Tests run: 8, Failures: 0, Errors: 0, Skipped: 0 [HUDSON] Recording test results [INFO] [jar:jar {execution: default-jar}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar> [INFO] Preparing source:jar [WARNING] Removing: jar from forked lifecycle, to prevent recursive invocation. [INFO] No goals needed for project - skipping [INFO] [source:jar {execution: attach-sources}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar> [INFO] [assembly:single {execution: bundle}] [INFO] Reading assembly descriptor: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/src/main/assembly/assembly-bundle.xml> [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [INFO] Building zip: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip> [INFO] [license:check {execution: default}] [INFO] Checking licenses... [INFO] Missing header in: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java> [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/pom.xml> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-14_10-21-49/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/pom.xml [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-14_10-21-49/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-14_10-21-49/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-14_10-21-49/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Some files do not have the expected license header [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 1 minute 37 seconds [INFO] Finished at: Fri Jan 14 10:23:30 CET 2011 [INFO] Final Memory: 40M/297M [INFO] ------------------------------------------------------------------------ Waiting for Hudson to finish collecting data |
From: <die...@us...> - 2011-01-14 08:54:06
|
Revision: 3243 http://openutils.svn.sourceforge.net/openutils/?rev=3243&view=rev Author: diego_schivo Date: 2011-01-14 08:54:00 +0000 (Fri, 14 Jan 2011) Log Message: ----------- PIRMEDIA-208 always show mgnlTreeControlAddressBar Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl Modified: trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl 2011-01-13 18:10:08 UTC (rev 3242) +++ trunk/openutils-mgnlmedia/src/main/resources/info/magnolia/cms/gui/control/MediaTreeFooter.ftl 2011-01-14 08:54:00 UTC (rev 3243) @@ -25,7 +25,7 @@ <#include "MediaTreeAddress.ftl"/> </#if> --> -<#if tree.browseMode> +<#if tree.browseMode || tree.class.name == 'net.sourceforge.openutils.mgnlmedia.media.tree.MediaModuleTree'> <#include "TreeAddressBar.ftl"/> </#if> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hu...@op...> - 2011-01-13 18:35:07
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/331/changes> Changes: [diego_schivo] PIRMEDIA-207 show media handle in dialog [diego_schivo] PIRMEDIA-202 sorting [diego_schivo] PIRMEDIA-202 sorting ------------------------------------------ <channel started ===[HUDSON REMOTING CAPACITY]===> Executing Maven: -B -f <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/pom.xml> install [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Building Magnolia SimpleMedia Module [INFO] task-segment: [install] [INFO] ------------------------------------------------------------------------ [INFO] [resources:resources {execution: default-resources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 264 resources [INFO] Copying 1 resource [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [INFO] [compiler:compile {execution: default-compile}] [INFO] Compiling 5 source files to <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/classes> [INFO] [resources:testResources {execution: default-testResources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] [compiler:testCompile {execution: default-testCompile}] [INFO] Nothing to compile - all classes are up to date [INFO] [surefire:test {execution: default-test}] [INFO] Surefire report directory: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/surefire-reports> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running TestSuite Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.505 sec Results : Tests run: 8, Failures: 0, Errors: 0, Skipped: 0 [HUDSON] Recording test results [INFO] [jar:jar {execution: default-jar}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar> [INFO] Preparing source:jar [WARNING] Removing: jar from forked lifecycle, to prevent recursive invocation. [INFO] No goals needed for project - skipping [INFO] [source:jar {execution: attach-sources}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar> [INFO] [assembly:single {execution: bundle}] [INFO] Reading assembly descriptor: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/src/main/assembly/assembly-bundle.xml> [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [INFO] Building zip: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip> [INFO] [license:check {execution: default}] [INFO] Checking licenses... [INFO] Missing header in: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java> [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/pom.xml> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-13_19-21-44/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/pom.xml [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-13_19-21-44/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-13_19-21-44/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/ws/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-13_19-21-44/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Some files do not have the expected license header [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 34 seconds [INFO] Finished at: Thu Jan 13 19:22:22 CET 2011 [INFO] Final Memory: 45M/292M [INFO] ------------------------------------------------------------------------ Waiting for Hudson to finish collecting data |
From: <hu...@op...> - 2011-01-13 18:34:53
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/331/changes> Changes: [diego_schivo] PIRMEDIA-207 show media handle in dialog [diego_schivo] PIRMEDIA-202 sorting [diego_schivo] PIRMEDIA-202 sorting ------------------------------------------ Started by an SCM change Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia U src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java U src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java A src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java U src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java U src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java U src/main/resources/dialog/selectMedia.ftl U src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties U src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties U src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml At revision 3242 Parsing POMs [openutils-mgnlmedia] $ /usr/local/jdk1.6.0_20/bin/java -cp /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.386.jar:/usr/local/maven/boot/classworlds-1.1.jar hudson.maven.agent.Main /usr/local/maven /data/webapps/hudson/WEB-INF/lib/remoting-1.386.jar /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.386.jar 50198 /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar <channel started ===[HUDSON REMOTING CAPACITY]===> Executing Maven: -B -f <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/pom.xml> install [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Building Magnolia SimpleMedia Module [INFO] task-segment: [install] [INFO] ------------------------------------------------------------------------ [INFO] [resources:resources {execution: default-resources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 264 resources [INFO] Copying 1 resource [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [INFO] [compiler:compile {execution: default-compile}] [INFO] Compiling 5 source files to <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/classes> [INFO] [resources:testResources {execution: default-testResources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] [compiler:testCompile {execution: default-testCompile}] [INFO] Nothing to compile - all classes are up to date [INFO] [surefire:test {execution: default-test}] [INFO] Surefire report directory: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/surefire-reports> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running TestSuite Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.505 sec Results : Tests run: 8, Failures: 0, Errors: 0, Skipped: 0 [HUDSON] Recording test results [INFO] [jar:jar {execution: default-jar}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar> [INFO] Preparing source:jar [WARNING] Removing: jar from forked lifecycle, to prevent recursive invocation. [INFO] No goals needed for project - skipping [INFO] [source:jar {execution: attach-sources}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar> [INFO] [assembly:single {execution: bundle}] [INFO] Reading assembly descriptor: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml> [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [INFO] Building zip: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip> [INFO] [license:check {execution: default}] [INFO] Checking licenses... [INFO] Missing header in: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java> [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/pom.xml> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-13_19-21-44/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/pom.xml [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-13_19-21-44/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-13_19-21-44/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-13_19-21-44/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Some files do not have the expected license header [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 34 seconds [INFO] Finished at: Thu Jan 13 19:22:22 CET 2011 [INFO] Final Memory: 45M/292M [INFO] ------------------------------------------------------------------------ Waiting for Hudson to finish collecting data Sending e-mails to: ope...@li... channel stopped |
From: <die...@us...> - 2011-01-13 18:10:14
|
Revision: 3242 http://openutils.svn.sourceforge.net/openutils/?rev=3242&view=rev Author: diego_schivo Date: 2011-01-13 18:10:08 +0000 (Thu, 13 Jan 2011) Log Message: ----------- PIRMEDIA-207 show media handle in dialog Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2011-01-13 17:57:33 UTC (rev 3241) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogSelectMedia.java 2011-01-13 18:10:08 UTC (rev 3242) @@ -151,6 +151,7 @@ parameters.put("thumbnailUrl", this.getThumbnailUrl(media, nd)); parameters.put("msgs", this.getMessages()); parameters.put("filename", this.getFilename(media, nd)); + parameters.put("handle", media != null ? media.getHandle() : null); if ("true".equals(this.getConfigValue("resizing"))) { Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2011-01-13 17:57:33 UTC (rev 3241) +++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl 2011-01-13 18:10:08 UTC (rev 3242) @@ -108,7 +108,7 @@ <div> - <div id="dispRem${name}Txt" style="height: 18px; overflow: hidden">${filename!''}</div> + <div id="dispRem${name}Txt" style="height: 18px; overflow: hidden">${filename!''}[#if handle?exists && handle?length > 0] (${handle})[/#if]</div> <div id="dispResize${name}" style="display:${dispResize}"> <table> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-01-13 17:57:40
|
Revision: 3241 http://openutils.svn.sourceforge.net/openutils/?rev=3241&view=rev Author: diego_schivo Date: 2011-01-13 17:57:33 +0000 (Thu, 13 Jan 2011) Log Message: ----------- PIRMEDIA-202 sorting Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java 2011-01-13 17:41:29 UTC (rev 3240) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java 2011-01-13 17:57:33 UTC (rev 3241) @@ -21,11 +21,17 @@ public SortMode getSorting(String parameter, HttpServletRequest request) { String[] values = (String[]) request.getParameterMap().get(parameter); - SortMode sortMode = null; if (values != null && values.length > 0 && StringUtils.isNotBlank(values[0])) { - sortMode = SortMode.valueOf(values[0]); + try + { + return SortMode.valueOf(values[0]); + } + catch (IllegalArgumentException e) + { + // ignore + } } - return sortMode; + return super.getSorting(parameter, request); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-01-13 17:41:36
|
Revision: 3240 http://openutils.svn.sourceforge.net/openutils/?rev=3240&view=rev Author: diego_schivo Date: 2011-01-13 17:41:29 +0000 (Thu, 13 Jan 2011) Log Message: ----------- PIRMEDIA-202 sorting Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties Added Paths: ----------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java 2011-01-13 15:22:33 UTC (rev 3239) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java 2011-01-13 17:41:29 UTC (rev 3240) @@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRequest; import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion; +import net.sourceforge.openutils.mgnlmedia.media.pages.SortMode; /** @@ -36,4 +37,6 @@ String getBasePath(String parameter, HttpServletRequest request); List<Criterion> getCriterionList(String parameter, HttpServletRequest request); + + SortMode getSorting(String parameter, HttpServletRequest request); } Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java 2011-01-13 15:22:33 UTC (rev 3239) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java 2011-01-13 17:41:29 UTC (rev 3240) @@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletRequest; import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion; +import net.sourceforge.openutils.mgnlmedia.media.pages.SortMode; import org.apache.commons.collections.ListUtils; import org.apache.commons.lang.StringUtils; @@ -83,6 +84,14 @@ } /** + * {@inheritDoc} + */ + public SortMode getSorting(String parameter, HttpServletRequest request) + { + return null; + } + + /** * Returns the type. * @return the type */ Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java (rev 0) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterSorting.java 2011-01-13 17:41:29 UTC (rev 3240) @@ -0,0 +1,31 @@ +package net.sourceforge.openutils.mgnlmedia.media.advancedsearch; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang.StringUtils; + +import net.sourceforge.openutils.mgnlmedia.media.pages.SortMode; + + +/** + * @author ADMIN + * @version $Id: $ + */ +public class SearchFilterSorting extends SearchFilterOptionProvider +{ + + /** + * {@inheritDoc} + */ + @Override + public SortMode getSorting(String parameter, HttpServletRequest request) + { + String[] values = (String[]) request.getParameterMap().get(parameter); + SortMode sortMode = null; + if (values != null && values.length > 0 && StringUtils.isNotBlank(values[0])) + { + sortMode = SortMode.valueOf(values[0]); + } + return sortMode; + } +} Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-01-13 15:22:33 UTC (rev 3239) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-01-13 17:41:29 UTC (rev 3240) @@ -132,6 +132,11 @@ { c.add(criterion); } + SortMode s = filter.getSorting(key, request); + if (s != null) + { + sorting = s; + } } // base path Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 15:22:33 UTC (rev 3239) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 17:41:29 UTC (rev 3240) @@ -810,5 +810,285 @@ </sv:property> </sv:node> </sv:node> + <sv:node sv:name="sorting"> + <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>35660c98-836b-4b9b-afc9-e4c81188102d</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilterSorting</sv:value> + </sv:property> + <sv:property sv:name="control" sv:type="String"> + <sv:value>radio</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.sorting</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-15T17:07:44.717+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2011-01-13T18:24:03.324+01:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="options"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>04df9407-4a4f-4ae3-84b3-485a0d1447a9</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> + <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:47.391+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2011-01-13T18:16:55.733+01:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="score"> + <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>4fb64a66-fd01-4b2a-a3b5-b77384928c92</sv:value> + </sv:property> + <sv:property sv:name="defaultValue" 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>media.sorting.score</sv:value> + </sv:property> + <sv:property sv:name="value" sv:type="String"> + <sv:value>score</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>2011-01-13T18:27:45.480+01:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="dateasc"> + <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>e90110b7-088a-4e4c-a442-3b6a5dc08c05</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.sorting.date.asc</sv:value> + </sv:property> + <sv:property sv:name="value" sv:type="String"> + <sv:value>CREATIONDATE_ASC</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>2011-01-13T18:29:34.076+01:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="datedesc"> + <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>ff93da80-13b1-4540-a986-88e1d00f9910</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.sorting.date.desc</sv:value> + </sv:property> + <sv:property sv:name="value" sv:type="String"> + <sv:value>CREATIONDATE_DESC</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>2011-01-13T18:29:57.510+01:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="nameasc"> + <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>c4403c34-da6e-4f94-96e2-ae335c0dbe28</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.sorting.name.asc</sv:value> + </sv:property> + <sv:property sv:name="value" sv:type="String"> + <sv:value>FILENAME_ASC</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>2011-01-13T18:30:23.868+01:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="namedesc"> + <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>ba28c1d8-5fe5-4ad6-b981-1c114200ae4f</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.sorting.name.desc</sv:value> + </sv:property> + <sv:property sv:name="value" sv:type="String"> + <sv:value>FILENAME_DESC</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>2011-01-13T18:30:40.241+01:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + </sv:node> + </sv:node> </sv:node> </sv:node> Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 15:22:33 UTC (rev 3239) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 17:41:29 UTC (rev 3240) @@ -156,3 +156,4 @@ config.search.filters.uuid=UUID config.search.filters.modified=Modified since config.search.filters.path=Path +config.search.filters.sorting=Sorting Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 15:22:33 UTC (rev 3239) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 17:41:29 UTC (rev 3240) @@ -159,3 +159,4 @@ config.search.filters.uuid=UUID config.search.filters.modified=Modificato dal config.search.filters.path=Percorso +config.search.filters.sorting=Ordinamento This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-01-13 15:22:39
|
Revision: 3239 http://openutils.svn.sourceforge.net/openutils/?rev=3239&view=rev Author: diego_schivo Date: 2011-01-13 15:22:33 +0000 (Thu, 13 Jan 2011) Log Message: ----------- PIRMEDIA-202 path search Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 15:18:29 UTC (rev 3238) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 15:22:33 UTC (rev 3239) @@ -781,13 +781,13 @@ <sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilterPath</sv:value> </sv:property> <sv:property sv:name="control" sv:type="String"> - <sv:value>input</sv:value> + <sv:value>path</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.basePath</sv:value> + <sv:value>config.search.filters.path</sv:value> </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> @@ -806,7 +806,7 @@ <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>2011-01-13T12:15:37.701+01:00</sv:value> + <sv:value>2011-01-13T16:19:54.870+01:00</sv:value> </sv:property> </sv:node> </sv:node> Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 15:18:29 UTC (rev 3238) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 15:22:33 UTC (rev 3239) @@ -155,4 +155,4 @@ config.search.filters.options.notpublished=Not published config.search.filters.uuid=UUID config.search.filters.modified=Modified since -config.search.filters.basePath=Base path +config.search.filters.path=Path Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 15:18:29 UTC (rev 3238) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 15:22:33 UTC (rev 3239) @@ -158,4 +158,4 @@ config.search.filters.options.notpublished=Non pubblicati config.search.filters.uuid=UUID config.search.filters.modified=Modificato dal -config.search.filters.basePath=Path base +config.search.filters.path=Percorso This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-01-13 15:18:36
|
Revision: 3238 http://openutils.svn.sourceforge.net/openutils/?rev=3238&view=rev Author: diego_schivo Date: 2011-01-13 15:18:29 +0000 (Thu, 13 Jan 2011) Log Message: ----------- PIRMEDIA-202 path search Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/advancedSearch.css trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html Added Paths: ----------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterPath.java trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/path.ftl Removed Paths: ------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBasePath.java Deleted: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBasePath.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBasePath.java 2011-01-13 11:58:42 UTC (rev 3237) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBasePath.java 2011-01-13 15:18:29 UTC (rev 3238) @@ -1,54 +0,0 @@ -/** - * - * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html) - * Copyright (C)2008 - 2010, 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.mgnlmedia.media.advancedsearch; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang.StringUtils; - - -/** - * @author ADMIN - * @version $Id: $ - */ -public class SearchFilterBasePath extends SearchFilterAbstract -{ - - /** - * {@inheritDoc} - */ - @Override - public String getBasePath(String parameter, HttpServletRequest request) - { - String[] values = (String[]) request.getParameterMap().get(parameter); - - String basePath = super.getBasePath(parameter, request); - - if (values != null && values.length > 0) - { - String value = values[0]; - if (StringUtils.isNotBlank(value)) - { - basePath = value; - } - } - return basePath; - } -} Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterPath.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterPath.java (rev 0) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterPath.java 2011-01-13 15:18:29 UTC (rev 3238) @@ -0,0 +1,54 @@ +/** + * + * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html) + * Copyright (C)2008 - 2010, 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.mgnlmedia.media.advancedsearch; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang.StringUtils; + + +/** + * @author ADMIN + * @version $Id: $ + */ +public class SearchFilterPath extends SearchFilterAbstract +{ + + /** + * {@inheritDoc} + */ + @Override + public String getBasePath(String parameter, HttpServletRequest request) + { + String[] values = (String[]) request.getParameterMap().get(parameter); + + String basePath = super.getBasePath(parameter, request); + + if (values != null && values.length > 0) + { + String value = values[0]; + if (StringUtils.isNotBlank(value)) + { + basePath = value; + } + } + return basePath; + } +} Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 11:58:42 UTC (rev 3237) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 15:18:29 UTC (rev 3238) @@ -767,7 +767,7 @@ </sv:property> </sv:node> </sv:node> - <sv:node sv:name="basePath"> + <sv:node sv:name="path"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>mgnl:contentNode</sv:value> </sv:property> @@ -778,7 +778,7 @@ <sv:value>83d5b5a1-a66f-4c25-a9ed-c83c0d3ad61c</sv:value> </sv:property> <sv:property sv:name="class" sv:type="String"> - <sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilterBasePath</sv:value> + <sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilterPath</sv:value> </sv:property> <sv:property sv:name="control" sv:type="String"> <sv:value>input</sv:value> Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/advancedSearch.css =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/advancedSearch.css 2011-01-13 11:58:42 UTC (rev 3237) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/advancedSearch.css 2011-01-13 15:18:29 UTC (rev 3238) @@ -4,7 +4,7 @@ line-height: 14px; } -input.text,input.input-date,select { +input.text,input.input-date,input.input-path,select { padding: 2px; border: solid 1px #999; width: 97%; @@ -45,6 +45,10 @@ width: 70%; } +.row .input-path { + width: 60%; +} + .row .inner-row input { float: left; display: inline; Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 11:58:42 UTC (rev 3237) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 15:18:29 UTC (rev 3238) @@ -82,6 +82,7 @@ buttons.cancel=Cancel buttons.date=Date buttons.search=Search +buttons.select=Select dialog.filenopreview.extensions=Valid file extensions: dialog.filenopreview.error.extension=File extension for field {0} not valid Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 11:58:42 UTC (rev 3237) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 15:18:29 UTC (rev 3238) @@ -83,6 +83,7 @@ buttons.cancel=Annulla buttons.date=Data buttons.search=Cerca +buttons.select=Seleziona dialog.filenopreview.extensions=Estensioni valide: dialog.filenopreview.error.extension=Estensione del file per il campo {0} non valida Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-01-13 11:58:42 UTC (rev 3237) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-01-13 15:18:29 UTC (rev 3238) @@ -4,6 +4,8 @@ <link href="${this.request.contextPath}/.resources/admin-css/admin-all.css" type="text/css" rel="stylesheet" /> <link title="Aqua" href="${this.request.contextPath}/.resources/calendar/skins/aqua/theme.css" media="all" type="text/css" rel="stylesheet" /> <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/advancedSearch.css" /> + <script type="text/javascript" src="${this.request.contextPath}/.magnolia/pages/javascript.js"></script> + <script type="text/javascript" src="${this.request.contextPath}/.resources/admin-js/dialogs/dialogs.js"></script> <script type="text/javascript" src="${this.request.contextPath}/.resources/calendar/calendar.js"></script> <script src="${this.request.contextPath}/.resources/calendar/lang/calendar-en.js" type="text/javascript"></script> <script src="${this.request.contextPath}/.resources/calendar/calendar-setup.js" type="text/javascript"></script> Added: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/path.ftl =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/path.ftl (rev 0) +++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/path.ftl 2011-01-13 15:18:29 UTC (rev 3238) @@ -0,0 +1,10 @@ +<div class="row"> + [#if filter.label??] + <label for="${filterKey}">[@msgIfAvail filter.label /]</label> + [/#if] + + <input type="text" name="${filterKey}" id="${filterKey}" value="" class="input-path" /> + <span class="mgnlControlButton" id="butt_${filterKey}" onclick="mgnlDialogLinkOpenBrowser('${filterKey}', 'media', '')">${this.msgs['buttons.select']}</span> + + [@rendersFilter filter.subfilters /] +</div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mol...@us...> - 2011-01-13 11:58:48
|
Revision: 3237 http://openutils.svn.sourceforge.net/openutils/?rev=3237&view=rev Author: molaschi Date: 2011-01-13 11:58:42 +0000 (Thu, 13 Jan 2011) Log Message: ----------- MEDIA-201 Added stop method to MediaTypeHandler, called on all media types handler instances when media module is stopping Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2011-01-13 11:17:19 UTC (rev 3236) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2011-01-13 11:58:42 UTC (rev 3237) @@ -23,6 +23,7 @@ import info.magnolia.module.ModuleLifecycleContext; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -30,6 +31,7 @@ import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration; import net.sourceforge.openutils.mgnlmedia.media.configuration.ImageProcessorsManager; import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager; +import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration; import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaUsedInManager; import net.sourceforge.openutils.mgnlmedia.media.zip.ZipImporter; import net.sourceforge.openutils.mgnlmedia.playlist.pages.PlaylistTrackExtensionContributor; @@ -98,6 +100,17 @@ public void stop(ModuleLifecycleContext ctx) { log.info("Stopping module media"); + Collection<MediaTypeConfiguration> mtcs = MediaConfigurationManager.getInstance().getTypes().values(); + if (mtcs != null) + { + for (MediaTypeConfiguration mtc : mtcs) + { + if (mtc.getHandler() != null) + { + mtc.getHandler().stop(); + } + } + } } /** Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2011-01-13 11:17:19 UTC (rev 3236) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java 2011-01-13 11:58:42 UTC (rev 3237) @@ -203,4 +203,9 @@ */ void saveFromZipFile(Content media, File f, String cleanFileName, String extension) throws AccessDeniedException, RepositoryException; + + /** + * Notify module stopping to handler + */ + void stop(); } Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2011-01-13 11:17:19 UTC (rev 3236) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2011-01-13 11:58:42 UTC (rev 3237) @@ -365,4 +365,14 @@ } } + + /** + * {@inheritDoc} + */ + public void stop() + { + // Do nothing + } + + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-01-13 11:17:26
|
Revision: 3236 http://openutils.svn.sourceforge.net/openutils/?rev=3236&view=rev Author: diego_schivo Date: 2011-01-13 11:17:19 +0000 (Thu, 13 Jan 2011) Log Message: ----------- PIRMEDIA-202 base path search Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties Added Paths: ----------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBasePath.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java 2011-01-13 11:09:27 UTC (rev 3235) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java 2011-01-13 11:17:19 UTC (rev 3236) @@ -28,6 +28,7 @@ import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion; import org.apache.commons.collections.ListUtils; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -69,7 +70,7 @@ */ public String getBasePath(String parameter, HttpServletRequest request) { - return null; + return StringUtils.EMPTY; } /** Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBasePath.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBasePath.java (rev 0) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBasePath.java 2011-01-13 11:17:19 UTC (rev 3236) @@ -0,0 +1,54 @@ +/** + * + * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html) + * Copyright (C)2008 - 2010, 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.mgnlmedia.media.advancedsearch; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang.StringUtils; + + +/** + * @author ADMIN + * @version $Id: $ + */ +public class SearchFilterBasePath extends SearchFilterAbstract +{ + + /** + * {@inheritDoc} + */ + @Override + public String getBasePath(String parameter, HttpServletRequest request) + { + String[] values = (String[]) request.getParameterMap().get(parameter); + + String basePath = super.getBasePath(parameter, request); + + if (values != null && values.length > 0) + { + String value = values[0]; + if (StringUtils.isNotBlank(value)) + { + basePath = value; + } + } + return basePath; + } +} Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-01-13 11:09:27 UTC (rev 3235) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-01-13 11:17:19 UTC (rev 3236) @@ -127,7 +127,7 @@ continue; } SearchFilter filter = filters.get(key); - path = StringUtils.defaultString(filter.getBasePath(key, request), path); + path = StringUtils.defaultIfEmpty(filter.getBasePath(key, request), path); for (Criterion criterion : filter.getCriterionList(key, request)) { c.add(criterion); Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 11:09:27 UTC (rev 3235) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 11:17:19 UTC (rev 3236) @@ -724,5 +724,91 @@ </sv:property> </sv:node> </sv:node> + <sv:node sv:name="modified"> + <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>7bafbc22-e0b7-46f3-b511-bfb4f82e5f2d</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilterStatusModified</sv:value> + </sv:property> + <sv:property sv:name="control" sv:type="String"> + <sv:value>date</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.modified</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-15T17:07:44.717+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2011-01-13T11:40:20.066+01:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="basePath"> + <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>83d5b5a1-a66f-4c25-a9ed-c83c0d3ad61c</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilterBasePath</sv:value> + </sv:property> + <sv:property sv:name="control" sv:type="String"> + <sv:value>input</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.basePath</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-15T17:07:44.717+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2011-01-13T12:15:37.701+01:00</sv:value> + </sv:property> + </sv:node> + </sv:node> </sv:node> </sv:node> Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 11:09:27 UTC (rev 3235) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 11:17:19 UTC (rev 3236) @@ -154,3 +154,4 @@ config.search.filters.options.notpublished=Not published config.search.filters.uuid=UUID config.search.filters.modified=Modified since +config.search.filters.basePath=Base path Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 11:09:27 UTC (rev 3235) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 11:17:19 UTC (rev 3236) @@ -157,3 +157,4 @@ config.search.filters.options.notpublished=Non pubblicati config.search.filters.uuid=UUID config.search.filters.modified=Modificato dal +config.search.filters.basePath=Path base This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-01-13 11:09:33
|
Revision: 3235 http://openutils.svn.sourceforge.net/openutils/?rev=3235&view=rev Author: diego_schivo Date: 2011-01-13 11:09:27 +0000 (Thu, 13 Jan 2011) Log Message: ----------- PIRMEDIA-202 base path search Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java 2011-01-13 11:01:09 UTC (rev 3234) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java 2011-01-13 11:09:27 UTC (rev 3235) @@ -33,5 +33,7 @@ public interface SearchFilter { + String getBasePath(String parameter, HttpServletRequest request); + List<Criterion> getCriterionList(String parameter, HttpServletRequest request); } Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java 2011-01-13 11:01:09 UTC (rev 3234) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java 2011-01-13 11:09:27 UTC (rev 3235) @@ -67,6 +67,14 @@ /** * {@inheritDoc} */ + public String getBasePath(String parameter, HttpServletRequest request) + { + return null; + } + + /** + * {@inheritDoc} + */ @SuppressWarnings("unchecked") public List<Criterion> getCriterionList(String parameter, HttpServletRequest request) { Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-01-13 11:01:09 UTC (rev 3234) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-01-13 11:09:27 UTC (rev 3235) @@ -110,19 +110,14 @@ .setWorkspace(MediaModule.REPO) .add(Restrictions.eq("@jcr:primaryType", MediaConfigurationManager.MEDIA.getSystemName())); - // base path - String searchPath = StringUtils.removeEnd(StringUtils.defaultString(path, defaultBasePath), "/") - + "/" - + (descendants ? "/" : StringUtils.EMPTY) - + "*"; - c.setBasePath("/jcr:root/" + StringUtils.removeStart(searchPath, "/")); - // media type if (!StringUtils.isEmpty(mediaType)) { c.add(Restrictions.eq("@type", mediaType)); } + path = StringUtils.defaultString(path, defaultBasePath); + // filters for (String key : filters.keySet()) { @@ -131,13 +126,21 @@ // restriction on type already set continue; } - List<Criterion> criterionList = filters.get(key).getCriterionList(key, request); - for (Criterion criterion : criterionList) + SearchFilter filter = filters.get(key); + path = StringUtils.defaultString(filter.getBasePath(key, request), path); + for (Criterion criterion : filter.getCriterionList(key, request)) { c.add(criterion); } } + // base path + String searchPath = StringUtils.removeEnd(path, "/") + + "/" + + (descendants ? "/" : StringUtils.EMPTY) + + "*"; + c.setBasePath("/jcr:root/" + StringUtils.removeStart(searchPath, "/")); + // sorting if (sorting == SortMode.SCORE) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 3234 http://openutils.svn.sourceforge.net/openutils/?rev=3234&view=rev Author: diego_schivo Date: 2011-01-13 11:01:09 +0000 (Thu, 13 Jan 2011) Log Message: ----------- unnecessary initialization Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-01-13 10:52:25 UTC (rev 3233) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-01-13 11:01:09 UTC (rev 3234) @@ -124,7 +124,6 @@ } // filters - List<Criterion> criterionList = new ArrayList<Criterion>(); for (String key : filters.keySet()) { if ("type".equals(key) && !StringUtils.isEmpty(mediaType)) @@ -132,7 +131,7 @@ // restriction on type already set continue; } - criterionList = filters.get(key).getCriterionList(key, request); + List<Criterion> criterionList = filters.get(key).getCriterionList(key, request); for (Criterion criterion : criterionList) { c.add(criterion); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 3233 http://openutils.svn.sourceforge.net/openutils/?rev=3233&view=rev Author: diego_schivo Date: 2011-01-13 10:52:25 +0000 (Thu, 13 Jan 2011) Log Message: ----------- MEDIA-200 date parsing fixed Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.java 2011-01-13 10:47:41 UTC (rev 3232) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterBeetweenCreationDate.java 2011-01-13 10:52:25 UTC (rev 3233) @@ -91,7 +91,7 @@ { cal.set( Integer.parseInt(dateMatcher.group(1)), - Integer.parseInt(dateMatcher.group(2)), + Integer.parseInt(dateMatcher.group(2)) - 1, Integer.parseInt(dateMatcher.group(3))); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-01-13 10:47:48
|
Revision: 3232 http://openutils.svn.sourceforge.net/openutils/?rev=3232&view=rev Author: diego_schivo Date: 2011-01-13 10:47:41 +0000 (Thu, 13 Jan 2011) Log Message: ----------- PIRMEDIA-202 modified status search Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java 2011-01-13 10:21:11 UTC (rev 3231) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java 2011-01-13 10:47:41 UTC (rev 3232) @@ -80,7 +80,7 @@ { cal.set( Integer.parseInt(dateMatcher.group(1)), - Integer.parseInt(dateMatcher.group(2)), + Integer.parseInt(dateMatcher.group(2)) - 1, Integer.parseInt(dateMatcher.group(3))); } } Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 10:21:11 UTC (rev 3231) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 10:47:41 UTC (rev 3232) @@ -153,3 +153,4 @@ config.search.filters.options.published=Published config.search.filters.options.notpublished=Not published config.search.filters.uuid=UUID +config.search.filters.modified=Modified since Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 10:21:11 UTC (rev 3231) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 10:47:41 UTC (rev 3232) @@ -156,3 +156,4 @@ config.search.filters.options.published=Pubblicati config.search.filters.options.notpublished=Non pubblicati config.search.filters.uuid=UUID +config.search.filters.modified=Modificato dal This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hu...@op...> - 2011-01-13 10:35:04
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/326/changes> |
From: <hu...@op...> - 2011-01-13 10:35:02
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/326/changes> |
From: <die...@us...> - 2011-01-13 10:21:18
|
Revision: 3231 http://openutils.svn.sourceforge.net/openutils/?rev=3231&view=rev Author: diego_schivo Date: 2011-01-13 10:21:11 +0000 (Thu, 13 Jan 2011) Log Message: ----------- PIRMEDIA-202 modified status search Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java Added Paths: ----------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java (rev 0) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java 2011-01-13 10:21:11 UTC (rev 3231) @@ -0,0 +1,94 @@ +/** + * + * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html) + * Copyright (C)2008 - 2010, 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.mgnlmedia.media.advancedsearch; + +import info.magnolia.cms.core.MetaData; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.servlet.http.HttpServletRequest; + +import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion; +import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions; + +import org.apache.commons.lang.StringUtils; + + +/** + * @author ADMIN + * @version $Id: $ + */ +public class SearchFilterStatusModified extends SearchFilterAbstract +{ + private static final String META_DATA_MGNL_ACTIVATED = "MetaData/@mgnl:" + MetaData.ACTIVATED; + + private static final String META_DATA_MGNL_LAST_ACTION = "MetaData/@mgnl:" + MetaData.LAST_ACTION; + + private static final String META_DATA_MGNL_LAST_MODIFIED = "MetaData/@mgnl:" + MetaData.LAST_MODIFIED; + + /** + * {@inheritDoc} + */ + @Override + public List<Criterion> getCriterionList(String parameter, HttpServletRequest request) + { + String[] values = (String[]) request.getParameterMap().get(parameter); + List<Criterion> criterionList = new ArrayList<Criterion>(); + + if (values != null && values.length > 0 && StringUtils.isNotBlank(values[0])) + { + criterionList.add(Restrictions.eq(META_DATA_MGNL_ACTIVATED, "true")); + + Calendar date = getDate(values[0]); + criterionList.add(Restrictions.le(META_DATA_MGNL_LAST_ACTION, date)); + criterionList.add(Restrictions.gt(META_DATA_MGNL_LAST_MODIFIED, date)); + } + return criterionList; + } + + private Calendar getDate(String date) + { + Calendar cal = Calendar.getInstance(); + + Pattern datePattern = Pattern.compile("(\\d{4})-(\\d{2})-(\\d{2})"); + Matcher dateMatcher = datePattern.matcher(date); + + try + { + if (dateMatcher.find()) + { + cal.set( + Integer.parseInt(dateMatcher.group(1)), + Integer.parseInt(dateMatcher.group(2)), + Integer.parseInt(dateMatcher.group(3))); + } + } + catch (Exception e) + { + log.error("Invalid date: {}", date); + } + + return cal; + } +} Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java 2011-01-13 10:05:42 UTC (rev 3230) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java 2011-01-13 10:21:11 UTC (rev 3231) @@ -1,3 +1,22 @@ +/** + * + * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html) + * Copyright (C)2008 - 2010, 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.mgnlmedia.media.advancedsearch; import java.util.ArrayList; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-01-13 10:05:49
|
Revision: 3230 http://openutils.svn.sourceforge.net/openutils/?rev=3230&view=rev Author: diego_schivo Date: 2011-01-13 10:05:42 +0000 (Thu, 13 Jan 2011) Log Message: ----------- PIRMEDIA-202 revert: modified status search (does not work) Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties Property Changed: ---------------- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/ Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java 2011-01-13 09:48:58 UTC (rev 3229) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java 2011-01-13 10:05:42 UTC (rev 3230) @@ -58,12 +58,6 @@ { criterionList.add(Restrictions.eq(META_DATA_MGNL_ACTIVATED, false)); } - if (!values[0].equals("ALL") && "MOD".equals(values[0])) - { - criterionList.add(Restrictions.eq(META_DATA_MGNL_ACTIVATED, "true")); - // https://issues.apache.org/jira/browse/JCR-2271 - criterionList.add(Restrictions.gt("MetaData/@mgnl:lastmodified", "MetaData/@mgnl:lastaction")); - } } return criterionList; } Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 09:48:58 UTC (rev 3229) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 10:05:42 UTC (rev 3230) @@ -559,46 +559,6 @@ </sv:property> </sv:node> </sv:node> - <sv:node sv:name="modified"> - <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>433e018a-acee-4699-8183-ff57367c1824</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.modified</sv:value> - </sv:property> - <sv:property sv:name="value" sv:type="String"> - <sv:value>MOD</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>2011-01-13T10:33:46.033+01:00</sv:value> - </sv:property> - </sv:node> - </sv:node> </sv:node> </sv:node> <sv:node sv:name="from"> Property changes on: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang ___________________________________________________________________ Deleted: svn:mergeinfo - /branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang:1004 Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 09:48:58 UTC (rev 3229) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 10:05:42 UTC (rev 3230) @@ -152,5 +152,4 @@ config.search.filters.options.all=All config.search.filters.options.published=Published config.search.filters.options.notpublished=Not published -config.search.filters.options.modified=Modified config.search.filters.uuid=UUID Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 09:48:58 UTC (rev 3229) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 10:05:42 UTC (rev 3230) @@ -155,5 +155,4 @@ config.search.filters.options.all=Tutti config.search.filters.options.published=Pubblicati config.search.filters.options.notpublished=Non pubblicati -config.search.filters.options.modified=Modificato config.search.filters.uuid=UUID This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-01-13 09:49:07
|
Revision: 3229 http://openutils.svn.sourceforge.net/openutils/?rev=3229&view=rev Author: diego_schivo Date: 2011-01-13 09:48:58 +0000 (Thu, 13 Jan 2011) Log Message: ----------- PIRMEDIA-202 modified status search (does not work) Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java 2011-01-13 09:11:50 UTC (rev 3228) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java 2011-01-13 09:48:58 UTC (rev 3229) @@ -58,6 +58,12 @@ { criterionList.add(Restrictions.eq(META_DATA_MGNL_ACTIVATED, false)); } + if (!values[0].equals("ALL") && "MOD".equals(values[0])) + { + criterionList.add(Restrictions.eq(META_DATA_MGNL_ACTIVATED, "true")); + // https://issues.apache.org/jira/browse/JCR-2271 + criterionList.add(Restrictions.gt("MetaData/@mgnl:lastmodified", "MetaData/@mgnl:lastaction")); + } } return criterionList; } Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 09:11:50 UTC (rev 3228) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 09:48:58 UTC (rev 3229) @@ -559,6 +559,46 @@ </sv:property> </sv:node> </sv:node> + <sv:node sv:name="modified"> + <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>433e018a-acee-4699-8183-ff57367c1824</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.modified</sv:value> + </sv:property> + <sv:property sv:name="value" sv:type="String"> + <sv:value>MOD</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>2011-01-13T10:33:46.033+01:00</sv:value> + </sv:property> + </sv:node> + </sv:node> </sv:node> </sv:node> <sv:node sv:name="from"> Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 09:11:50 UTC (rev 3228) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 09:48:58 UTC (rev 3229) @@ -152,4 +152,5 @@ config.search.filters.options.all=All config.search.filters.options.published=Published config.search.filters.options.notpublished=Not published +config.search.filters.options.modified=Modified config.search.filters.uuid=UUID Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 09:11:50 UTC (rev 3228) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 09:48:58 UTC (rev 3229) @@ -155,4 +155,5 @@ config.search.filters.options.all=Tutti config.search.filters.options.published=Pubblicati config.search.filters.options.notpublished=Non pubblicati +config.search.filters.options.modified=Modificato config.search.filters.uuid=UUID This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hu...@op...> - 2011-01-13 09:34:50
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/325/changes> Changes: [diego_schivo] PIRMEDIA-202 uuid search [diego_schivo] PIRMEDIA-204 overflow=hidden on body to avoid scrollbars on IE8 ------------------------------------------ Started by an SCM change Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia A src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java U src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties U src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties U src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html U src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml At revision 3228 Parsing POMs [openutils-mgnlmedia] $ /usr/local/jdk1.6.0_20/bin/java -cp /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.386.jar:/usr/local/maven/boot/classworlds-1.1.jar hudson.maven.agent.Main /usr/local/maven /data/webapps/hudson/WEB-INF/lib/remoting-1.386.jar /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.386.jar 56739 /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar <===[HUDSON REMOTING CAPACITY]===> channel started Executing Maven: -B -f <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/pom.xml> install [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Building Magnolia SimpleMedia Module [INFO] task-segment: [install] [INFO] ------------------------------------------------------------------------ [INFO] [resources:resources {execution: default-resources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 263 resources [INFO] Copying 1 resource [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [INFO] [compiler:compile {execution: default-compile}] [INFO] Compiling 1 source file to <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/classes> [INFO] [resources:testResources {execution: default-testResources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] [compiler:testCompile {execution: default-testCompile}] [INFO] Nothing to compile - all classes are up to date [INFO] [surefire:test {execution: default-test}] [INFO] Surefire report directory: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/surefire-reports> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running TestSuite Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.406 sec Results : Tests run: 8, Failures: 0, Errors: 0, Skipped: 0 [HUDSON] Recording test results [INFO] [jar:jar {execution: default-jar}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar> [INFO] Preparing source:jar [WARNING] Removing: jar from forked lifecycle, to prevent recursive invocation. [INFO] No goals needed for project - skipping [INFO] [source:jar {execution: attach-sources}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar> [INFO] [assembly:single {execution: bundle}] [INFO] Reading assembly descriptor: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/src/main/assembly/assembly-bundle.xml> [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. [INFO] Building zip: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip> [INFO] [license:check {execution: default}] [INFO] Checking licenses... [INFO] Missing header in: <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java> [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/pom.xml> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-13_10-21-44/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/pom.xml [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-13_10-21-44/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT.jar [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-13_10-21-44/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT-sources.jar [HUDSON] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlmedia/ws/openutils-mgnlmedia/target/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip> to /data/hudson-data/jobs/openutils-mgnlmedia/modules/net.sourceforge.openutils$openutils-mgnlmedia/builds/2011-01-13_10-21-44/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.3.1-SNAPSHOT/openutils-mgnlmedia-4.3.1-SNAPSHOT-bundle.zip [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Some files do not have the expected license header [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 36 seconds [INFO] Finished at: Thu Jan 13 10:22:24 CET 2011 [INFO] Final Memory: 46M/280M [INFO] ------------------------------------------------------------------------ Waiting for Hudson to finish collecting data Sending e-mails to: ope...@li... channel stopped |