Menu
▾
▴
openutils-svn — developer list with svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
| 2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
| 2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
| 2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
| 2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
| 2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
| 2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <die...@us...> - 2011-05-27 06:28:20
|
Revision: 3496
http://openutils.svn.sourceforge.net/openutils/?rev=3496&view=rev
Author: diego_schivo
Date: 2011-05-27 06:28:14 +0000 (Fri, 27 May 2011)
Log Message:
-----------
CONTROLS-37 Handle enterMode (p/br) setting for FCKEditor column on grid control
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-fckeditor.html
trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/FckEditorField.js
Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2011-05-27 06:25:04 UTC (rev 3495)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2011-05-27 06:28:14 UTC (rev 3496)
@@ -51,6 +51,13 @@
protected void addColumnData(Map<String, String> column, String propertyName, int colIndex, Map colMap,
Messages msgs)
{
- column.put("editor", "new Ed(new FckEditorField({contextPath: '" + MgnlContext.getContextPath() + "'}))");
+ StringBuilder sb = new StringBuilder();
+ sb.append("new Ed(new FckEditorField({contextPath: '" + MgnlContext.getContextPath() + "'");
+ if (colMap.get("enterMode") != null)
+ {
+ sb.append(", enterMode: '" + String.valueOf(colMap.get("enterMode")) + "'");
+ }
+ sb.append("}))");
+ column.put("editor", sb.toString());
}
}
Modified: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-fckeditor.html
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-fckeditor.html 2011-05-27 06:25:04 UTC (rev 3495)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/grid-fckeditor.html 2011-05-27 06:28:14 UTC (rev 3496)
@@ -11,6 +11,12 @@
</head>
<body style="padding:0;margin:0">
<script type="text/javascript">
+var urlParams={};
+var t=document.location.search.substr(1).split('&');
+for (var i=0;i<t.length;i++) {
+ var s=t[i].split('=');
+ urlParams[decodeURIComponent(s[0])]=decodeURIComponent(s[1]);
+}
if( window.MgnlFCKConfigs == null)
window.MgnlFCKConfigs = new Object();
MgnlFCKConfigs.grid = new Object();
@@ -22,7 +28,7 @@
MgnlFCKConfigs.grid.colors = '';
MgnlFCKConfigs.grid.styles = '';
MgnlFCKConfigs.grid.templates = '';
-MgnlFCKConfigs.grid.enterMode = 'p';
+MgnlFCKConfigs.grid.enterMode = urlParams['enterMode'] || 'p';
MgnlFCKConfigs.grid.shiftEnterMode = 'br';
MgnlFCKConfigs.grid.lists = true;
MgnlFCKConfigs.grid.alignment = false;
Modified: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/FckEditorField.js
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/FckEditorField.js 2011-05-27 06:25:04 UTC (rev 3495)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/FckEditorField.js 2011-05-27 06:28:14 UTC (rev 3496)
@@ -4,6 +4,8 @@
contextPath: '',
+ enterMode: '',
+
getContextPath: function() {
return this.contextPath;
},
@@ -15,7 +17,7 @@
window.setFckEditorValue = function(value) {
this.setValue(value);
}.createDelegate(this);
- mgnlOpenWindow('/.resources/controls/grid-fckeditor.html', 880, 300);
+ mgnlOpenWindow('/.resources/controls/grid-fckeditor.html?enterMode=' + this.enterMode, 880, 300);
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-05-27 06:25:10
|
Revision: 3495
http://openutils.svn.sourceforge.net/openutils/?rev=3495&view=rev
Author: diego_schivo
Date: 2011-05-27 06:25:04 +0000 (Fri, 27 May 2011)
Log Message:
-----------
update dependencies
Modified Paths:
--------------
trunk/magnolia-test-webapp/pom.xml
Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml 2011-05-24 12:25:14 UTC (rev 3494)
+++ trunk/magnolia-test-webapp/pom.xml 2011-05-27 06:25:04 UTC (rev 3495)
@@ -112,7 +112,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcontrols</artifactId>
- <version>4.1.2-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -122,7 +122,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlcache</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -137,17 +137,17 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmedia</artifactId>
- <version>4.4-b3-SNAPSHOT</version>
+ <version>4.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmessages</artifactId>
- <version>4.2.1-SNAPSHOT</version>
+ <version>4.2.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlrepoutils</artifactId>
- <version>4.0.3-SNAPSHOT</version>
+ <version>4.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -157,7 +157,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlstripes</artifactId>
- <version>4.1.2-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
@@ -181,7 +181,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnltagcloud</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -198,7 +198,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-elfunctions</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2011-05-24 12:44:24
|
See <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/153/changes> Changes: [carlocolombo] failing test for offset with maxResult different from pagesize ------------------------------------------ Started by an SCM change Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcriteria A src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java At revision 3494 Found mavenVersion 2.2.1 from file jar:file:/usr/local/maven/lib/maven-2.2.1-uber.jar!/META-INF/maven/org.apache.maven/maven-core/pom.properties Parsing POMs [openutils-mgnlcriteria] $ /usr/local/jdk1.6.0_20/bin/java -cp /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.403.jar:/usr/local/maven/boot/classworlds-1.1.jar hudson.maven.agent.Main /usr/local/maven /data/webapps/hudson/WEB-INF/lib/remoting-1.403.jar /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.403.jar 42136 /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-mgnlcriteria/ws/openutils-mgnlcriteria/pom.xml> clean install [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Building Criteria API for Magnolia CMS [INFO] task-segment: [clean, install] [INFO] ------------------------------------------------------------------------ [INFO] [clean:clean {execution: default-clean}] [INFO] Deleting directory <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target> [INFO] [resources:resources {execution: default-resources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] Copying 1 resource [INFO] [compiler:compile {execution: default-compile}] [INFO] Compiling 46 source files to <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target/classes> [INFO] [resources:testResources {execution: default-testResources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 15 resources [INFO] [compiler:testCompile {execution: default-testCompile}] [INFO] Compiling 17 source files to <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target/test-classes> [INFO] [surefire:test {execution: default-test}] [INFO] Surefire report directory: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target/surefire-reports> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running TestSuite Tests run: 71, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.22 sec Results : Tests run: 71, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [jar:jar {execution: default-jar}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target/openutils-mgnlcriteria-3.3.2-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-mgnlcriteria/ws/openutils-mgnlcriteria/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT-sources.jar> [INFO] [assembly:single {execution: bundle}] [INFO] Reading assembly descriptor: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/src/main/assembly/assembly-bundle.xml> [INFO] Building zip: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT-bundle.zip> [INFO] [license:check {execution: default}] [INFO] Checking licenses... [INFO] Missing header in: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java> [JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/pom.xml> to /data/hudson-data/jobs/openutils-mgnlcriteria/modules/net.sourceforge.openutils$openutils-mgnlcriteria/builds/2011-05-24_14-28-46/archive/net.sourceforge.openutils/openutils-mgnlcriteria/3.3.2-SNAPSHOT/pom.xml [JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT.jar> to /data/hudson-data/jobs/openutils-mgnlcriteria/modules/net.sourceforge.openutils$openutils-mgnlcriteria/builds/2011-05-24_14-28-46/archive/net.sourceforge.openutils/openutils-mgnlcriteria/3.3.2-SNAPSHOT/openutils-mgnlcriteria-3.3.2-SNAPSHOT.jar [JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/ws/openutils-mgnlcriteria/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT-sources.jar> to /data/hudson-data/jobs/openutils-mgnlcriteria/modules/net.sourceforge.openutils$openutils-mgnlcriteria/builds/2011-05-24_14-28-46/archive/net.sourceforge.openutils/openutils-mgnlcriteria/3.3.2-SNAPSHOT/openutils-mgnlcriteria-3.3.2-SNAPSHOT-sources.jar [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: 48 seconds [INFO] Finished at: Tue May 24 14:29:40 CEST 2011 [INFO] Final Memory: 53M/316M [INFO] ------------------------------------------------------------------------ Sending e-mails to: ope...@li... channel stopped |
|
From: <hu...@op...> - 2011-05-24 12:44:21
|
See <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/153/changes> Changes: [carlocolombo] failing test for offset with maxResult different from pagesize ------------------------------------------ <===[HUDSON REMOTING CAPACITY]===> channel started Executing Maven: -B -f <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/pom.xml> clean install [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Building Criteria API for Magnolia CMS [INFO] task-segment: [clean, install] [INFO] ------------------------------------------------------------------------ [INFO] [clean:clean {execution: default-clean}] [INFO] Deleting directory <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target> [INFO] [resources:resources {execution: default-resources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] Copying 1 resource [INFO] [compiler:compile {execution: default-compile}] [INFO] Compiling 46 source files to <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target/classes> [INFO] [resources:testResources {execution: default-testResources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 15 resources [INFO] [compiler:testCompile {execution: default-testCompile}] [INFO] Compiling 17 source files to <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target/test-classes> [INFO] [surefire:test {execution: default-test}] [INFO] Surefire report directory: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target/surefire-reports> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running TestSuite Tests run: 71, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.22 sec Results : Tests run: 71, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [jar:jar {execution: default-jar}] [INFO] Building jar: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target/openutils-mgnlcriteria-3.3.2-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-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT-sources.jar> [INFO] [assembly:single {execution: bundle}] [INFO] Reading assembly descriptor: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/src/main/assembly/assembly-bundle.xml> [INFO] Building zip: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT-bundle.zip> [INFO] [license:check {execution: default}] [INFO] Checking licenses... [INFO] Missing header in: <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java> [JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/pom.xml> to /data/hudson-data/jobs/openutils-mgnlcriteria/modules/net.sourceforge.openutils$openutils-mgnlcriteria/builds/2011-05-24_14-28-46/archive/net.sourceforge.openutils/openutils-mgnlcriteria/3.3.2-SNAPSHOT/pom.xml [JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT.jar> to /data/hudson-data/jobs/openutils-mgnlcriteria/modules/net.sourceforge.openutils$openutils-mgnlcriteria/builds/2011-05-24_14-28-46/archive/net.sourceforge.openutils/openutils-mgnlcriteria/3.3.2-SNAPSHOT/openutils-mgnlcriteria-3.3.2-SNAPSHOT.jar [JENKINS] Archiving <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/ws/target/openutils-mgnlcriteria-3.3.2-SNAPSHOT-sources.jar> to /data/hudson-data/jobs/openutils-mgnlcriteria/modules/net.sourceforge.openutils$openutils-mgnlcriteria/builds/2011-05-24_14-28-46/archive/net.sourceforge.openutils/openutils-mgnlcriteria/3.3.2-SNAPSHOT/openutils-mgnlcriteria-3.3.2-SNAPSHOT-sources.jar [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: 48 seconds [INFO] Finished at: Tue May 24 14:29:40 CEST 2011 [INFO] Final Memory: 53M/316M [INFO] ------------------------------------------------------------------------ |
Revision: 3494
http://openutils.svn.sourceforge.net/openutils/?rev=3494&view=rev
Author: carlocolombo
Date: 2011-05-24 12:25:14 +0000 (Tue, 24 May 2011)
Log Message:
-----------
failing test for offset with maxResult different from pagesize
Added Paths:
-----------
trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java
Added: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java (rev 0)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java 2011-05-24 12:25:14 UTC (rev 3494)
@@ -0,0 +1,156 @@
+/**
+ *
+ */
+package net.sourceforge.openutils.mgnlcriteria.advanced.impl;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.context.MgnlContext;
+import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+import net.sourceforge.openutils.mgnlcriteria.tests.CriteriaTestUtils;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+
+/**
+ * @author carlo
+ */
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.pets.xml")
+public class CorrectElementsWithoutMaxResults extends TestNgRepositoryTestcase
+{
+
+ @Override
+ @BeforeClass
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ // Nodes in this workspace:
+ // - pets (title=Pets)
+ // --- cats (title=Cats)
+ // ----- 1 (title=Leo, petType=cat, birthDate=2000-09-07)
+ // ----- 7 (title=Samantha, petType=cat, birthDate=1995-09-04)
+ // ----- 8 (title=Max, petType=cat, birthDate=1995-09-04)
+ // ----- 13 (title=Sly, petType=cat, birthDate=2002-06-08)
+ // --- dogs (title=Dogs)
+ // ----- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
+ // ----- 4 (title=Jewel, petType=dog, birthDate=2000-03-07)
+ // ----- 10 (title=Mulligan, petType=dog, birthDate=1997-02-24)
+ // ----- 12 (title=Lucky, petType=dog, birthDate=2000-06-24)
+ // --- lizards (title=Lizards)
+ // ----- 5 (title=Iggy, petType=lizard, birthDate=2000-11-30)
+ // --- snakes (title=Snakes)
+ // ----- 6 (title=George, petType=snake, birthDate=2000-01-20)
+ // --- birds (title=Birds)
+ // ----- 9 (title=Lucky, petType=bird, birthDate=1999-08-06)
+ // ----- 11 (title=Freddy, petType=bird, birthDate=2000-03-09)
+ // --- hamsters (title=Hamsters)
+ // ----- 2 (title=Basil, petType=hamster, birthDate=2002-08-06)
+ // ************************************************************
+ // total 13 pets
+ MgnlContext.getHierarchyManager(ContentRepository.WEBSITE).save();
+ }
+
+ @Test
+ public void otherResultWithMaxResultAsMaxInt() throws Exception
+ {
+ Criteria criteria = getAllPetWithDocumentOrder();
+
+ criteria.setFirstResult(9);
+ criteria.setMaxResults(Integer.MAX_VALUE);
+
+ CriteriaTestUtils.assertNumOfResults(
+ 4,
+ CriteriaTestUtils.collectCollectionFromResult(criteria.execute()),
+ "all pets, offset:9");
+ assertMissing4MissingPets(criteria);
+ }
+
+ @Test
+ public void otherResultWithMaxResultAsOffset() throws Exception
+ {
+ Criteria criteria = getAllPetWithDocumentOrder();
+
+ criteria.setFirstResult(9);
+ criteria.setMaxResults(9);
+
+ CriteriaTestUtils.assertNumOfResults(
+ 4,
+ CriteriaTestUtils.collectCollectionFromResult(criteria.execute()),
+ "all pets, offset:9");
+ assertMissing4MissingPets(criteria);
+ }
+
+ @Test
+ public void otherResultWithMaxResultAsLesserThanOffset() throws Exception
+ {
+ Criteria criteria = getAllPetWithDocumentOrder();
+
+ criteria.setFirstResult(9);
+ criteria.setMaxResults(8);
+
+ CriteriaTestUtils.assertNumOfResults(
+ 4,
+ CriteriaTestUtils.collectCollectionFromResult(criteria.execute()),
+ "all pets, offset:9, maxResult: 8");
+ assertMissing4MissingPets(criteria);
+ }
+
+ @Test
+ public void otherResultWithMaxResultAsGreaterThanOffset() throws Exception
+ {
+ Criteria criteria = getAllPetWithDocumentOrder();
+
+ criteria.setFirstResult(9);
+ criteria.setMaxResults(10);
+
+ CriteriaTestUtils.assertNumOfResults(
+ 4,
+ CriteriaTestUtils.collectCollectionFromResult(criteria.execute()),
+ "all pets, offset:9, maxResult: 10");
+ assertMissing4MissingPets(criteria);
+ }
+
+ /**
+ * Control test
+ * @throws Exception
+ */
+ @Test
+ public void otherResultWithPagination() throws Exception
+ {
+ Criteria criteria = getAllPetWithDocumentOrder();
+ criteria.setPaging(9, 2);
+ CriteriaTestUtils.assertNumOfResults(
+ 4,
+ CriteriaTestUtils.collectCollectionFromResult(criteria.execute()),
+ "all pets, 2nd page, pagesize: 9");
+ assertMissing4MissingPets(criteria);
+ }
+
+ /**
+ * @param criteria
+ */
+ private void assertMissing4MissingPets(Criteria criteria)
+ {
+ CriteriaTestUtils.assertSortedResults(new String[]{"George", "Lucky", "Freddy", "Basil" }, CriteriaTestUtils
+ .collectCollectionFromResult(criteria.execute()), "all missing pets, sorted");
+ }
+
+ /**
+ * @return
+ */
+ private Criteria getAllPetWithDocumentOrder()
+ {
+ return JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(ContentRepository.WEBSITE)
+ .setBasePath("/jcr:root/pets/*/*")
+ .add(Restrictions.eq("@jcr:primaryType", ItemType.CONTENT.getSystemName()))
+ .setForcePagingWithDocumentOrder(true);
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2011-05-24 07:17:04
|
Revision: 3493
http://openutils.svn.sourceforge.net/openutils/?rev=3493&view=rev
Author: carlocolombo
Date: 2011-05-24 07:16:57 +0000 (Tue, 24 May 2011)
Log Message:
-----------
fix on editing messages
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag
Modified: trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag 2011-05-22 18:53:40 UTC (rev 3492)
+++ trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag 2011-05-24 07:16:57 UTC (rev 3493)
@@ -19,6 +19,10 @@
<![CDATA[
(function($) {
var currentMsgEdit = null;
+ var editLink = $('<a href="#" title="edit" \
+ style="position:absolute;background:#000 url(${appCtx}/.resources/messages/icons/edit.png) center \
+ center no-repeat;border-radius:4px;-moz-border-radius:4px;\
+ -webkit-border-radius:4px;width:24px;height:24px;z-index:1000; top:-5px; left:-24px;"></a>');
function init(container, dialog) {
container.css({
@@ -32,23 +36,17 @@
var msgDefaultLocale = container.attr("data-msgdefaultlocale");
var defaultMsg = container.attr("data-msgdefault");
- var editLink = $('<a href="#" title="edit" \
- style="position:absolute;background:#000 url(${appCtx}/.resources/messages/icons/edit.png) center \
- center no-repeat;border-radius:4px;-moz-border-radius:4px;\
- -webkit-border-radius:4px;width:24px;height:24px;z-index:1000; top:-5px; left:-24px;"></a>');
- container.append(editLink).css('position','relative');
- editLink.fadeTo('slow',0.3);
- editLink.mouseenter(function(){
- editLink.fadeTo('slow',1.0);
- msgsWithSameKey.animate({
- "background-color" : 'yellow'});
- });
- editLink.mouseleave(function(){
+ container.append(editLink.clone()).css('position','relative').find('a')
+ .fadeTo('slow',0.3)
+ .live('mouseenter',function(){
+ $(this).fadeTo('slow',1.0);
+ msgsWithSameKey.animate({"background-color" : 'yellow'});
+ })
+ .live('mouseleave',function(){
editLink.fadeTo('slow',0.3);
- msgsWithSameKey.css({
- "background-color" : 'transparent'});
- });
- editLink.click(function(evt){
+ msgsWithSameKey.css({"background-color" : 'transparent'});
+ })
+ .live('click',function(evt){
evt.preventDefault();
currentMsgEdit = container;
$("#dialog-msgEdit-default").css({
@@ -73,7 +71,7 @@
var msgKey = currentMsgEdit.attr('data-msgkey');
if (valueTxt != currentMsgEdit.text().trim())
{
- $("." + msgKey.replace(/\./g, '_')).text(valueTxt);
+ $("." + msgKey.replace(/\./g, '_')).text(valueTxt).append(editLink.clone()).find('a').fadeTo('slow',0.3);
$.ajax({
url: '${appCtx}/messages/save',
type: 'POST',
@@ -96,7 +94,7 @@
}
},
open: function() {
- $("#dialog-msgEdit-value").val(currentMsgEdit.html().trim());
+ $("#dialog-msgEdit-value").val(currentMsgEdit.text().trim());
},
close: function() {
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-05-22 18:53:46
|
Revision: 3492
http://openutils.svn.sourceforge.net/openutils/?rev=3492&view=rev
Author: fgiust
Date: 2011-05-22 18:53:40 +0000 (Sun, 22 May 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2011-05-22 18:53:30 UTC (rev 3491)
+++ trunk/openutils-mgnlmedia/pom.xml 2011-05-22 18:53:40 UTC (rev 3492)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlmedia</artifactId>
<name>SimpleMedia Module for Magnolia CMS</name>
<description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia assets.</description>
- <version>4.4.0</version>
+ <version>4.4.1-SNAPSHOT</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/MEDIA</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4.0</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4.0</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.4.0</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-05-22 18:53:36
|
Revision: 3491
http://openutils.svn.sourceforge.net/openutils/?rev=3491&view=rev
Author: fgiust
Date: 2011-05-22 18:53:30 +0000 (Sun, 22 May 2011)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmedia-4.4.0
Added Paths:
-----------
tags/openutils-mgnlmedia-4.4.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-05-22 18:53:06
|
Revision: 3490
http://openutils.svn.sourceforge.net/openutils/?rev=3490&view=rev
Author: fgiust
Date: 2011-05-22 18:52:59 +0000 (Sun, 22 May 2011)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmedia-4.4.0
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2011-05-22 18:51:45 UTC (rev 3489)
+++ trunk/openutils-mgnlmedia/pom.xml 2011-05-22 18:52:59 UTC (rev 3490)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlmedia</artifactId>
<name>SimpleMedia Module for Magnolia CMS</name>
<description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia assets.</description>
- <version>4.4-b5-SNAPSHOT</version>
+ <version>4.4.0</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/MEDIA</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4.0</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4.0</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.4.0</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-05-22 18:51:51
|
Revision: 3489
http://openutils.svn.sourceforge.net/openutils/?rev=3489&view=rev
Author: fgiust
Date: 2011-05-22 18:51:45 +0000 (Sun, 22 May 2011)
Log Message:
-----------
better (slighlty better) layout for the media menu in case of long links
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2011-05-22 18:20:17 UTC (rev 3488)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2011-05-22 18:51:45 UTC (rev 3489)
@@ -375,7 +375,7 @@
.mediaStatus0,.mediaStatus1 {
opacity: 0.75;
- filter: alpha(opacity = 75);
+ filter: alpha(opacity = 75);
}
div.sexy-tooltip {
@@ -398,7 +398,7 @@
background-color: #ffffff;
border: 1px solid #cfcfcf;
opacity: 0.90;
- filter: alpha(opacity = 90);
+ filter: alpha(opacity = 90);
-moz-box-shadow: 3px 3px 3px #666;
-webkit-box-shadow: 3px 3px 3px #666;
box-shadow: 3px 3px 3px #666;
@@ -441,10 +441,17 @@
}
ul.mediamenu li,ul.mediamenu li a {
- height: 20px;
+ min-height: 20px;
cursor: pointer;
+ background-repeat: no-repeat;
+ background-position: 2px 2px;
}
+ul.mediamenu li a {
+ background-image: url("../icons/ico16-link_go.png");
+ padding-left: 22px;
+}
+
#scrollablecontent {
overflow-y: scroll;
height: 600px;
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-05-22 18:20:17 UTC (rev 3488)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-05-22 18:51:45 UTC (rev 3489)
@@ -436,59 +436,50 @@
<ul class="mediamenu">
[#if media.writable]
<li>
- <a href="javascript:$empty()" onclick="openDialog('${media.handle}')" title="${this.msgs.get('media.edit')}">
- <img src="${this.request.contextPath}/.resources/media/icons/ico16-edit.png" alt="" />
- <span>${this.msgs.get('media.edit')}</span>
+ <a href="javascript:$empty()" onclick="openDialog('${media.handle}')" title="${this.msgs.get('media.edit')}" style="background-image: url('${this.request.contextPath}/.resources/media/icons/ico16-edit.png');">
+ ${this.msgs.get('media.edit')}
</a>
</li>
<li>
- <a href="javascript:$empty()" onclick="deleteMedia('${media.handle}')" title="${this.msgs.get('media.delete')}">
- <img src="${this.request.contextPath}/.resources/icons/16/delete2.gif" alt="" />
- <span>${this.msgs.get('media.delete')}</span>
+ <a href="javascript:$empty()" onclick="deleteMedia('${media.handle}')" title="${this.msgs.get('media.delete')}" style="background-image: url('${this.request.contextPath}/.resources/icons/16/delete2.gif');">
+ ${this.msgs.get('media.delete')}
</a>
</li>
<li>
- <a href="javascript:$empty()" onclick="openMediaTree('move','${media.handle}')" title="${this.msgs.get('media.move')}">
- <img src="${this.request.contextPath}/.resources/icons/16/up_down.gif" alt="" />
- <span>${this.msgs.get('media.move')}</span>
+ <a href="javascript:$empty()" onclick="openMediaTree('move','${media.handle}')" title="${this.msgs.get('media.move')}" style="background-image: url('${this.request.contextPath}/.resources/icons/16/up_down.gif');">
+ ${this.msgs.get('media.move')}
</a>
</li>
<li>
- <a href="javascript:$empty()" onclick="openMediaTree('copy','${media.handle}')" title="${this.msgs.get('media.copy')}">
- <img src="${this.request.contextPath}/.resources/icons/16/copy.gif" alt="" />
- <span>${this.msgs.get('media.copy')}</span>
+ <a href="javascript:$empty()" onclick="openMediaTree('copy','${media.handle}')" title="${this.msgs.get('media.copy')}" style="background-image: url('${this.request.contextPath}/.resources/icons/16/copy.gif');">
+ ${this.msgs.get('media.copy')}
</a>
</li>
[#else]
<li>
- <a>
- <img src="${this.request.contextPath}/.resources/media/icons/ico16-edit_inactive.png" alt="" />
+ <a style="background-image: url('${this.request.contextPath}/.resources/media/icons/ico16-edit_inactive.png');">
<span style="display:block; clear:left;"><!-- --></span>
</a>
</li>
<li>
- <a>
- <img src="${this.request.contextPath}/.resources/icons/16/delete2_inactive.gif" alt="" />
+ <a style="background-image: url('${this.request.contextPath}/.resources/icons/16/delete2_inactive.gif');">
<span style="display:block; clear:left;"><!-- --></span>
</a>
</li>
<li>
- <a>
- <img src="${this.request.contextPath}/.resources/icons/16/up_down_inactive.gif" alt="" />
+ <a style="background-image: url('${this.request.contextPath}/.resources/icons/16/up_down_inactive.gif');">
<span style="display:block; clear:left;"><!-- --></span>
</a>
</li>
<li>
- <a>
- <img src="${this.request.contextPath}/.resources/icons/16/copy_inactive.gif" alt="" />
+ <a style="background-image: url('${this.request.contextPath}/.resources/icons/16/copy_inactive.gif');">
<span style="display:block; clear:left;"><!-- --></span>
</a>
</li>
[/#if]
[#if !media.external]
<li>
- <a href="?command=download&path=${media.handle}">
- <img src="${this.request.contextPath}/.resources/media/icons/ico16-download.png" alt="" />
+ <a href="?command=download&path=${media.handle}" style="background-image: url('${this.request.contextPath}/.resources/media/icons/ico16-download.png');">
<span>${this.msgs.get('media.download')}</span>
</a>
</li>
@@ -496,31 +487,27 @@
[#if !this.singleInstance]
[#if media.canPublish]
<li>
- <a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="${this.msgs.get('media.activate')}">
- <img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" alt="" />
- <span>${this.msgs.get('media.activate')}</span>
+ <a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="${this.msgs.get('media.activate')}" style="background-image: url('${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif');">
+ ${this.msgs.get('media.activate')}
</a>
</li>
[#else]
<li>
- <a title="${this.msgs.get('media.activate')}" class="disabled">
- <img src="${this.request.contextPath}/.resources/media/icons/ico16-arrow_right_inactive.png" alt="" />
- <span>${this.msgs.get('media.activate')}</span>
+ <a title="${this.msgs.get('media.activate')}" class="disabled" style="background-image: url('${this.request.contextPath}/.resources/media/icons/ico16-arrow_right_inactive.png');">
+ ${this.msgs.get('media.activate')}
</a>
</li>
[/#if]
[#if media.canPublish && media.metaData.activationStatus = 2]
<li>
- <a href="javascript:$empty()" onclick="performAction('deactivate', '${media.handle}','')" title="${this.msgs.get('media.deactivate')}">
- <img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red.gif" border="0" />
- <span>${this.msgs.get('media.deactivate')}</span>
+ <a href="javascript:$empty()" onclick="performAction('deactivate', '${media.handle}','')" title="${this.msgs.get('media.deactivate')}" style="background-image: url('${this.request.contextPath}/.resources/icons/16/arrow_left_red.gif');">
+ ${this.msgs.get('media.deactivate')}
</a>
</li>
[#else]
<li>
- <a title="${this.msgs.get('media.deactivate')}" class="disabled">
- <img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red_inactive.gif" alt="" />
- <span>${this.msgs.get('media.deactivate')}</span>
+ <a title="${this.msgs.get('media.deactivate')}" class="disabled" style="background-image: url('${this.request.contextPath}/.resources/icons/16/arrow_left_red_inactive.gif');">
+ ${this.msgs.get('media.deactivate')}
</a>
</li>
[/#if]
@@ -532,12 +519,11 @@
[#else]
<span class="tips menuitem">${this.msgs.get('media.pages')} (${media.usedInWebPages?size})</span>
<div class="pages menu" style="display: none;">
- <ul class="mediamenu">
+ <ul class="mediamenu medialinks">
[#list media.usedInUris as uri]
<li>
<a href="${this.request.contextPath}${uri}" target="_blank">
- <img src="${this.request.contextPath}/.resources/media/icons/ico16-link_go.png" alt="" />
- <span>${uri}</span>
+ ${uri}
</a>
</li>
[/#list]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2011-05-22 18:37:26
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/393/changes> |
|
From: <fg...@us...> - 2011-05-22 18:20:24
|
Revision: 3488
http://openutils.svn.sourceforge.net/openutils/?rev=3488&view=rev
Author: fgiust
Date: 2011-05-22 18:20:17 +0000 (Sun, 22 May 2011)
Log Message:
-----------
MEDIA-225 make the document handler usable also with jackrabbit 1.6
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2011-05-22 18:19:13 UTC (rev 3487)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2011-05-22 18:20:17 UTC (rev 3488)
@@ -42,7 +42,6 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.pdfbox.exceptions.WrappedIOException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.slf4j.Logger;
@@ -192,7 +191,7 @@
{
log.warn("Apache pdfbox 1.0.0 not available, not generating preview for pdf document");
}
- catch (WrappedIOException e)
+ catch (IOException e)
{
if (e.getCause() instanceof ClassCastException)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-05-22 18:19:19
|
Revision: 3487
http://openutils.svn.sourceforge.net/openutils/?rev=3487&view=rev
Author: fgiust
Date: 2011-05-22 18:19:13 +0000 (Sun, 22 May 2011)
Log Message:
-----------
shorter labels
Modified Paths:
--------------
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/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-05-22 18:12:41 UTC (rev 3486)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-05-22 18:19:13 UTC (rev 3487)
@@ -60,7 +60,7 @@
media.types.image.load=Upload new image
media.types.audio.load=Upload new mp3
media.types.youtube.load=Link external video
-media.types.video.load=Upload new flv or mp4 video
+media.types.video.load=Upload flv/mp4 video
media.types.document.load=Upload new document
media.download=Download
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-05-22 18:12:41 UTC (rev 3486)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-05-22 18:19:13 UTC (rev 3487)
@@ -61,7 +61,7 @@
media.types.image.load=Carica immagine
media.types.audio.load=Carica file mp3
media.types.youtube.load=Collega video esterno
-media.types.video.load=Carica video flv o mp4
+media.types.video.load=Carica video flv/mp4
media.types.document.load=Carica documento
media.download=Scarica
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-05-22 18:12:47
|
Revision: 3486
http://openutils.svn.sourceforge.net/openutils/?rev=3486&view=rev
Author: fgiust
Date: 2011-05-22 18:12:41 +0000 (Sun, 22 May 2011)
Log Message:
-----------
filter magnolia module definition
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/pom.xml
Modified: trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- trunk/openutils-mgnlcriteria/pom.xml 2011-05-22 18:01:52 UTC (rev 3485)
+++ trunk/openutils-mgnlcriteria/pom.xml 2011-05-22 18:12:41 UTC (rev 3486)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -28,6 +29,22 @@
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcriteria</url>
</scm>
<build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>META-INF/magnolia/*</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-05-22 18:01:58
|
Revision: 3485
http://openutils.svn.sourceforge.net/openutils/?rev=3485&view=rev
Author: fgiust
Date: 2011-05-22 18:01:52 +0000 (Sun, 22 May 2011)
Log Message:
-----------
MEDIA-225 safer catch of exceptions during pdf preview generation
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2011-05-22 17:56:02 UTC (rev 3484)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/DocumentTypeHandler.java 2011-05-22 18:01:52 UTC (rev 3485)
@@ -124,16 +124,26 @@
if (StringUtils.equalsIgnoreCase(data.getAttribute(FileProperties.EXTENSION), "pdf"))
{
- String filename = data.getAttribute(FileProperties.PROPERTY_FILENAME) + ".png";
-
- InputStream stream = data.getStream();
try
{
- createPdfPreview(media, stream, filename);
+ String filename = data.getAttribute(FileProperties.PROPERTY_FILENAME) + ".png";
+
+ InputStream stream = data.getStream();
+ try
+ {
+ createPdfPreview(media, stream, filename);
+ }
+ finally
+ {
+ IOUtils.closeQuietly(stream);
+ }
}
- finally
+ catch (Throwable e)
{
- IOUtils.closeQuietly(stream);
+ log.warn("Unable to generate a preview for {} due to a {}: {}", new Object[]{
+ media.getHandle(),
+ e.getClass().getName(),
+ e.getMessage() });
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-05-22 17:56:09
|
Revision: 3484
http://openutils.svn.sourceforge.net/openutils/?rev=3484&view=rev
Author: fgiust
Date: 2011-05-22 17:56:02 +0000 (Sun, 22 May 2011)
Log Message:
-----------
minor fixes to labels
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.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/types/impl/BaseVideoTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java 2011-05-22 17:41:57 UTC (rev 3483)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseVideoTypeHandler.java 2011-05-22 17:56:02 UTC (rev 3484)
@@ -56,7 +56,7 @@
}
catch (Throwable e)
{
- log.warn("Error parsing FLV file "
+ log.warn("Error parsing video file "
+ getOriginalFileNodeData(media).getHandle()
+ " "
+ e.getClass().getName()
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-05-22 17:41:57 UTC (rev 3483)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-05-22 17:56:02 UTC (rev 3484)
@@ -27,7 +27,7 @@
media.dialogs.tabDocument.document.label=File
media.dialogs.tabVideo.videoUrl.label=External video url
-media.dialogs.tabVideo.videoUrl.description=flv/mp4 absolute url
+media.dialogs.tabVideo.videoUrl.description=flv or mp4 absolute url
media.dialogs.tabTitle.label=Title
@@ -60,7 +60,7 @@
media.types.image.load=Upload new image
media.types.audio.load=Upload new mp3
media.types.youtube.load=Link external video
-media.types.video.load=Upload new flv/mp4 video
+media.types.video.load=Upload new flv or mp4 video
media.types.document.load=Upload new document
media.download=Download
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-05-22 17:41:57 UTC (rev 3483)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-05-22 17:56:02 UTC (rev 3484)
@@ -61,7 +61,7 @@
media.types.image.load=Carica immagine
media.types.audio.load=Carica file mp3
media.types.youtube.load=Collega video esterno
-media.types.video.load=Carica video flv/mp4
+media.types.video.load=Carica video flv o mp4
media.types.document.load=Carica documento
media.download=Scarica
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-05-22 17:42:03
|
Revision: 3483
http://openutils.svn.sourceforge.net/openutils/?rev=3483&view=rev
Author: fgiust
Date: 2011-05-22 17:41:57 +0000 (Sun, 22 May 2011)
Log Message:
-----------
add mp4 to labels for uploadable videos
Modified Paths:
--------------
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/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-05-22 17:36:31 UTC (rev 3482)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-05-22 17:41:57 UTC (rev 3483)
@@ -27,7 +27,7 @@
media.dialogs.tabDocument.document.label=File
media.dialogs.tabVideo.videoUrl.label=External video url
-media.dialogs.tabVideo.videoUrl.description=flv absolute url or youtube url
+media.dialogs.tabVideo.videoUrl.description=flv/mp4 absolute url
media.dialogs.tabTitle.label=Title
@@ -53,14 +53,14 @@
media.types.image=Images
media.types.audio=Mp3s
media.types.youtube=External videos
-media.types.video=Flvs
+media.types.video=Videos
media.types.document=Documents
media.types.image.load=Upload new image
media.types.audio.load=Upload new mp3
media.types.youtube.load=Link external video
-media.types.video.load=Upload new flv
+media.types.video.load=Upload new flv/mp4 video
media.types.document.load=Upload new document
media.download=Download
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-05-22 17:36:31 UTC (rev 3482)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-05-22 17:41:57 UTC (rev 3483)
@@ -27,7 +27,7 @@
media.dialogs.tabDocument.document.label=File
media.dialogs.tabVideo.videoUrl.label=Url del video esterno
-media.dialogs.tabVideo.videoUrl.description=URL del file flv o URL di youtube
+media.dialogs.tabVideo.videoUrl.description=URL del file flv o mp4
media.dialogs.tabTitle.label=Titolo
@@ -54,14 +54,14 @@
media.types.image=Immagini
media.types.audio=Mp3
media.types.youtube=Video esterni
-media.types.video=Flv
+media.types.video=Video
media.types.document=Documenti
media.types.image.load=Carica immagine
media.types.audio.load=Carica file mp3
media.types.youtube.load=Collega video esterno
-media.types.video.load=Carica video flv
+media.types.video.load=Carica video flv/mp4
media.types.document.load=Carica documento
media.download=Scarica
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-05-22 17:36:37
|
Revision: 3482
http://openutils.svn.sourceforge.net/openutils/?rev=3482&view=rev
Author: fgiust
Date: 2011-05-22 17:36:31 +0000 (Sun, 22 May 2011)
Log Message:
-----------
partial support for newer youtube share urls
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/YoutubeSupport.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/YoutubeSupport.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/YoutubeSupport.java 2011-05-22 07:39:28 UTC (rev 3481)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/externals/YoutubeSupport.java 2011-05-22 17:36:31 UTC (rev 3482)
@@ -72,7 +72,7 @@
*/
public boolean canHandle(String url)
{
- return StringUtils.startsWith(url, "http://www.youtube");
+ return StringUtils.startsWith(url, "http://www.youtube") || StringUtils.startsWith(url, "http://youtu.be/");
}
/**
@@ -139,6 +139,13 @@
private String getVideoId(String shareUrl)
{
+
+ if (StringUtils.startsWith(shareUrl, "http://youtu.be/"))
+ {
+
+ return StringUtils.substringAfter(shareUrl, "http://youtu.be/");
+ }
+
for (String att : StringUtils.split(StringUtils.substringAfter(shareUrl, "?"), "&"))
{
if (att.startsWith("v="))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-05-22 07:39:34
|
Revision: 3481
http://openutils.svn.sourceforge.net/openutils/?rev=3481&view=rev
Author: fgiust
Date: 2011-05-22 07:39:28 +0000 (Sun, 22 May 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlrepoutils/pom.xml
Modified: trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- trunk/openutils-mgnlrepoutils/pom.xml 2011-05-22 07:39:18 UTC (rev 3480)
+++ trunk/openutils-mgnlrepoutils/pom.xml 2011-05-22 07:39:28 UTC (rev 3481)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlrepoutils</artifactId>
<name>Repository tools for Magnolia CMS</name>
- <version>4.1.0</version>
+ <version>4.1.1-SNAPSHOT</version>
<description>A simple GUI for running maintenance operations on jackrabbit repositories from the Magnolia admin
interface</description>
<url>http://www.openmindlab.com/lab/products/repotools.html</url>
@@ -25,9 +25,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlrepoutils-4.1.0</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlrepoutils-4.1.0</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlrepoutils-4.1.0</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrepoutils</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrepoutils</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlrepoutils</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-05-22 07:39:24
|
Revision: 3480
http://openutils.svn.sourceforge.net/openutils/?rev=3480&view=rev
Author: fgiust
Date: 2011-05-22 07:39:18 +0000 (Sun, 22 May 2011)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlrepoutils-4.1.0
Added Paths:
-----------
tags/openutils-mgnlrepoutils-4.1.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-05-22 07:38:57
|
Revision: 3479
http://openutils.svn.sourceforge.net/openutils/?rev=3479&view=rev
Author: fgiust
Date: 2011-05-22 07:38:49 +0000 (Sun, 22 May 2011)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlrepoutils-4.1.0
Modified Paths:
--------------
trunk/openutils-mgnlrepoutils/pom.xml
Modified: trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- trunk/openutils-mgnlrepoutils/pom.xml 2011-05-22 07:36:51 UTC (rev 3478)
+++ trunk/openutils-mgnlrepoutils/pom.xml 2011-05-22 07:38:49 UTC (rev 3479)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
<parent>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
@@ -10,7 +9,7 @@
<packaging>jar</packaging>
<artifactId>openutils-mgnlrepoutils</artifactId>
<name>Repository tools for Magnolia CMS</name>
- <version>4.0.3-SNAPSHOT</version>
+ <version>4.1.0</version>
<description>A simple GUI for running maintenance operations on jackrabbit repositories from the Magnolia admin
interface</description>
<url>http://www.openmindlab.com/lab/products/repotools.html</url>
@@ -26,9 +25,9 @@
</license>
</licenses>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrepoutils</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrepoutils</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlrepoutils</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlrepoutils-4.1.0</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlrepoutils-4.1.0</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlrepoutils-4.1.0</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-05-22 07:36:57
|
Revision: 3478
http://openutils.svn.sourceforge.net/openutils/?rev=3478&view=rev
Author: fgiust
Date: 2011-05-22 07:36:51 +0000 (Sun, 22 May 2011)
Log Message:
-----------
REPOTOOLS-2 minor cleanups
Modified Paths:
--------------
trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.adminInterface.config.menu.tools.linkfix.xml
trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.repoutils.pages.linkfix.xml
Added Paths:
-----------
trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/repoutils/icons/ico16-linkfix.png
Modified: trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.adminInterface.config.menu.tools.linkfix.xml
===================================================================
--- trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.adminInterface.config.menu.tools.linkfix.xml 2011-05-20 16:17:33 UTC (rev 3477)
+++ trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.adminInterface.config.menu.tools.linkfix.xml 2011-05-22 07:36:51 UTC (rev 3478)
@@ -7,7 +7,7 @@
<sv:value>63a87f96-def9-4b24-911f-35d7612ec1d9</sv:value>
</sv:property>
<sv:property sv:name="icon" sv:type="String">
- <sv:value>/.resources/pirellimedia/img/ico16-linkfix.png</sv:value>
+ <sv:value>/.resources/repoutils/icons/ico16-linkfix.png</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
Modified: trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.repoutils.pages.linkfix.xml
===================================================================
--- trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.repoutils.pages.linkfix.xml 2011-05-20 16:17:33 UTC (rev 3477)
+++ trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.repoutils.pages.linkfix.xml 2011-05-22 07:36:51 UTC (rev 3478)
@@ -16,17 +16,14 @@
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="replacements" sv:type="String">
- <sv:value>tyre/ww/en/=tyre/NEWPATH/en/</sv:value>
+ <sv:value>mysite/OLDPATH=mysite/NEWPATH</sv:value>
</sv:property>
<sv:property sv:name="sourceRepositoriesAndPaths" sv:type="String">
- <sv:value>website:/tyre/NEWPATH/en/car
-products:/pirellityre/NEWPATH/en/car</sv:value>
+ <sv:value>website:/mysite/NEWPATH</sv:value>
</sv:property>
<sv:property sv:name="targetRepositories" sv:type="String">
<sv:value>website
media
-products
-dms
playlists</sv:value>
</sv:property>
<sv:node sv:name="MetaData">
Added: trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/repoutils/icons/ico16-linkfix.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/repoutils/icons/ico16-linkfix.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2011-05-20 16:49:42
|
See <https://hudson.openmindonline.it/job/openutils-mgnlrepoutils/32/changes> |
|
From: <hu...@op...> - 2011-05-20 16:36:44
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/392/changes> Changes: [Fabrizio Giustina] upgrade controls to 4.1.2 ------------------------------------------ Started by an SCM change Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia U pom.xml At revision 3477 Found mavenVersion 2.2.1 from file jar:file:/usr/local/maven/lib/maven-2.2.1-uber.jar!/META-INF/maven/org.apache.maven/maven-core/pom.properties 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.403.jar:/usr/local/maven/boot/classworlds-1.1.jar hudson.maven.agent.Main /usr/local/maven /data/webapps/hudson/WEB-INF/lib/remoting-1.403.jar /data/hudson-data/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.403.jar 44952 /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 SimpleMedia Module for Magnolia CMS [INFO] task-segment: [install] [INFO] ------------------------------------------------------------------------ [INFO] [resources:resources {execution: default-resources}] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 284 resources [INFO] Copying 1 resource Downloading: http://repository.openmindonline.it/net/sourceforge/openutils/openutils-mgnlcontrols/4.1.2/openutils-mgnlcontrols-4.1.2.pom [INFO] Unable to find resource 'net.sourceforge.openutils:openutils-mgnlcontrols:pom:4.1.2' in repository central (http://repo1.maven.org/maven2) [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. Downloading: http://repository.openmindonline.it/net/sourceforge/openutils/openutils-mgnlcontrols/4.1.2/openutils-mgnlcontrols-4.1.2.jar [INFO] Unable to find resource 'net.sourceforge.openutils:openutils-mgnlcontrols:jar:4.1.2' in repository central (http://repo1.maven.org/maven2) [JENKINS] 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-05-20_18-21-51/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.4-b5-SNAPSHOT/pom.xml [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Failed to resolve artifact. Missing: ---------- 1) net.sourceforge.openutils:openutils-mgnlcontrols:jar:4.1.2 Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=net.sourceforge.openutils -DartifactId=openutils-mgnlcontrols -Dversion=4.1.2 -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=net.sourceforge.openutils -DartifactId=openutils-mgnlcontrols -Dversion=4.1.2 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) net.sourceforge.openutils:openutils-mgnlmedia:jar:4.4-b5-SNAPSHOT 2) net.sourceforge.openutils:openutils-mgnlcontrols:jar:4.1.2 ---------- 1 required artifact is missing. for artifact: net.sourceforge.openutils:openutils-mgnlmedia:jar:4.4-b5-SNAPSHOT from the specified remote repositories: openmind (http://repository.openmindonline.it) [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 11 seconds [INFO] Finished at: Fri May 20 18:22:07 CEST 2011 [INFO] Final Memory: 32M/192M [INFO] ------------------------------------------------------------------------ channel stopped |
|
From: <fg...@us...> - 2011-05-20 16:17:40
|
Revision: 3477
http://openutils.svn.sourceforge.net/openutils/?rev=3477&view=rev
Author: fgiust
Date: 2011-05-20 16:17:33 +0000 (Fri, 20 May 2011)
Log Message:
-----------
REPOTOOLS-2 New feature: tool for fixing links in a jcr tree
Modified Paths:
--------------
trunk/openutils-mgnlrepoutils/pom.xml
trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java
trunk/openutils-mgnlrepoutils/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexUtils.java
Added Paths:
-----------
trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/Linkfix.java
trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.java
trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.adminInterface.config.menu.tools.linkfix.xml
trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.repoutils.pages.linkfix.xml
trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/
trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/css/
trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/css/images/
trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/css/images/frame-bottom.png
trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/css/images/frame-top.png
trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/css/images/ico-warning.png
trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/css/openmindlab.css
trunk/openutils-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.html
Modified: trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- trunk/openutils-mgnlrepoutils/pom.xml 2011-05-20 16:10:54 UTC (rev 3476)
+++ trunk/openutils-mgnlrepoutils/pom.xml 2011-05-20 16:17:33 UTC (rev 3477)
@@ -74,6 +74,11 @@
<version>${magnolia.version}</version>
</dependency>
<dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-mgnlcriteria</artifactId>
+ <version>3.3.1</version>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<classifier>jdk15</classifier>
@@ -87,19 +92,6 @@
</exclusions>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>repository.magnolia.info</id>
- <name>magnolia repository</name>
- <url>http://nexus.magnolia-cms.com/content/groups/public</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
<properties>
<magnolia.version>4.4.1</magnolia.version>
</properties>
Added: trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/Linkfix.java
===================================================================
--- trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/Linkfix.java (rev 0)
+++ trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/Linkfix.java 2011-05-20 16:17:33 UTC (rev 3477)
@@ -0,0 +1,403 @@
+/**
+ *
+ * Repository tools for Magnolia CMS (http://www.openmindlab.com/lab/products/repotools.html)
+ * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlrepoutils;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.Content.ContentFilter;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.core.NodeData;
+import info.magnolia.context.MgnlContext;
+
+import java.io.StringWriter;
+import java.util.Collection;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class Linkfix
+{
+
+ private static final Pattern UUID_PATTERN = Pattern
+ .compile("([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})");
+
+ private static final ContentFilter ACCEPTALL_CONTENTFILTER = new ContentFilter()
+ {
+
+ public boolean accept(Content content)
+ {
+ try
+ {
+ return !ItemType.NT_METADATA.equals(content.getNodeTypeName());
+ }
+ catch (RepositoryException e)
+ {
+ return true;
+ }
+ }
+ };
+
+ private Map<String, String> replacements;
+
+ private Collection<String> sourceRepositoriesAndPaths;
+
+ private Collection<String> targetRepositories;
+
+ private int nodesCount;
+
+ private int matchesCount;
+
+ private int substitutionsCount;
+
+ private StringWriter fullLog = new StringWriter();
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(Linkfix.class);
+
+ /**
+ * @param replacements
+ * @param sourceRepositoriesAndPaths
+ * @param targetRepositories
+ */
+ public Linkfix(
+ Map<String, String> replacements,
+ Collection<String> sourceRepositoriesAndPaths,
+ Collection<String> targetRepositories)
+ {
+ super();
+ this.replacements = replacements;
+ this.sourceRepositoriesAndPaths = sourceRepositoriesAndPaths;
+ this.targetRepositories = targetRepositories;
+ }
+
+ /**
+ * Returns the matchesCount.
+ * @return the matchesCount
+ */
+ public int getMatchesCount()
+ {
+ return matchesCount;
+ }
+
+ /**
+ * Returns the nodesCount.
+ * @return the nodesCount
+ */
+ public int getNodesCount()
+ {
+ return nodesCount;
+ }
+
+ /**
+ * Returns the substitutionsCount.
+ * @return the substitutionsCount
+ */
+ public int getSubstitutionsCount()
+ {
+ return substitutionsCount;
+ }
+
+ public String getFullLog()
+ {
+ return fullLog.toString();
+ }
+
+ public void process() throws RepositoryException
+ {
+
+ log.info("Starting");
+ for (String source : sourceRepositoriesAndPaths)
+ {
+ String repo = StringUtils.substringBefore(source, ":");
+ String path = StringUtils.substringAfter(source, ":");
+ if (StringUtils.isEmpty(repo) || StringUtils.isEmpty(path))
+ {
+ log.error("Skipping entry {}, must be in \"repo:path\" format", source);
+ continue;
+ }
+
+ log.info("Processing {}", source);
+
+ Content node = MgnlContext.getHierarchyManager(repo).getContent(path);
+ processNode(node);
+ }
+
+ log.info("Everything done");
+
+ }
+
+ /**
+ * @param node
+ * @throws RepositoryException
+ */
+ private void processNode(Content node) throws RepositoryException
+ {
+ log.debug("Processing {}", node.getHandle());
+ nodesCount++;
+
+ Collection<NodeData> nodedatas = node.getNodeDataCollection();
+
+ boolean nodeUpdated = false;
+ for (NodeData nodedata : nodedatas)
+ {
+ nodeUpdated = processNodedata(nodedata) || nodeUpdated;
+ }
+
+ if (nodeUpdated)
+ {
+ node.updateMetaData();
+ }
+
+ Collection<Content> children = node.getChildren(ACCEPTALL_CONTENTFILTER);
+ for (Content child : children)
+ {
+ processNode(child);
+ }
+
+ }
+
+ /**
+ * @param nodedata
+ * @throws RepositoryException
+ */
+ private boolean processNodedata(NodeData data) throws RepositoryException
+ {
+ if (data.isMultiValue() == NodeData.MULTIVALUE_TRUE)
+ {
+ return processMultiValue(data);
+ }
+ else if (data.getType() == PropertyType.STRING)
+ {
+ return processString(data);
+ }
+
+ return false;
+
+ }
+
+ /**
+ * @param data
+ * @throws RepositoryException
+ */
+ private boolean processString(NodeData data) throws RepositoryException
+ {
+ String dataAsString = data.getString();
+ if (StringUtils.isEmpty(dataAsString))
+ {
+ // quick skip
+ return false;
+ }
+
+ boolean gotMatches = false;
+ Matcher matcher = UUID_PATTERN.matcher(dataAsString);
+ StringBuffer sb = new StringBuffer();
+ while (matcher.find())
+ {
+ matchesCount++;
+ final String uuid = matcher.group(0);
+
+ String newuuid = findAndReplaceUuid(uuid);
+ if (newuuid != null)
+ {
+ log.debug("Replacing UUID {} with {}", uuid, newuuid);
+
+ fullLog.append(String.format(
+ "%s:%s\n",
+ data.getHierarchyManager().getWorkspace().getName(),
+ data.getHandle()));
+
+ gotMatches = true;
+ substitutionsCount++;
+ matcher.appendReplacement(sb, newuuid);
+ }
+
+ }
+
+ matcher.appendTail(sb);
+ String newString = sb.toString();
+
+ // replace hardcoded path
+ for (Map.Entry<String, String> repl : replacements.entrySet())
+ {
+ Pattern pattern = Pattern.compile(repl.getKey());
+
+ matcher = pattern.matcher(newString);
+ sb = new StringBuffer();
+ while (matcher.find())
+ {
+ matchesCount++;
+ final String plainpath = matcher.group(0);
+
+ log.debug("Replacing text {} with {}", plainpath, repl.getValue());
+
+ fullLog.append(String.format(
+ "%s:%s\n",
+ data.getHierarchyManager().getWorkspace().getName(),
+ data.getHandle()));
+
+ gotMatches = true;
+ substitutionsCount++;
+ matcher.appendReplacement(sb, repl.getValue());
+
+ }
+
+ matcher.appendTail(sb);
+ newString = sb.toString();
+ }
+
+ if (gotMatches)
+ {
+ data.setValue(newString);
+ data.save();
+ return true;
+ }
+
+ return false;
+
+ }
+
+ /**
+ * @param uuid
+ * @return
+ */
+ private String findAndReplaceUuid(String uuid)
+ {
+ for (String repo : targetRepositories)
+ {
+ AdvancedResultItem result = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(repo)
+ .add(Restrictions.eq("jcr:uuid", uuid))
+ .execute()
+ .getFirstResult();
+
+ if (result != null)
+ {
+
+ String handle = result.getHandle();
+
+ log.debug("Found uuid {} in repo {} with handle {}", new Object[]{uuid, repo, handle });
+
+ for (Map.Entry<String, String> replacement : replacements.entrySet())
+ {
+ if (StringUtils.contains(handle, replacement.getKey()))
+ {
+ String newhandle = StringUtils.replace(handle, replacement.getKey(), replacement.getValue());
+ try
+ {
+ Content newcontent = MgnlContext.getHierarchyManager(repo).getContent(newhandle);
+ return newcontent.getUUID();
+ }
+ catch (RepositoryException e)
+ {
+ // not existing at the expected path, go on
+ }
+ }
+ }
+ }
+
+ }
+ return null;
+ }
+
+ /**
+ * @param data
+ * @throws RepositoryException
+ */
+ private boolean processMultiValue(NodeData data) throws RepositoryException
+ {
+ Value[] values = data.getValues();
+
+ boolean gotMatches = false;
+
+ for (int j = 0; j < values.length; j++)
+ {
+ Value value = values[j];
+ String dataAsString = value.getString();
+
+ boolean gotValueMatches = false;
+ Matcher matcher = UUID_PATTERN.matcher(dataAsString);
+ StringBuffer sb = new StringBuffer();
+ while (matcher.find())
+ {
+ matchesCount++;
+ final String uuid = matcher.group(0);
+
+ String newuuid = findAndReplaceUuid(uuid);
+ if (newuuid != null)
+ {
+ log.debug("Replacing UUID {} with {} (multivalue)", uuid, newuuid);
+ gotMatches = true;
+ gotValueMatches = true;
+ substitutionsCount++;
+ matcher.appendReplacement(sb, newuuid);
+ }
+ else
+ {
+ matcher.appendTail(sb);
+ }
+ }
+ if (gotValueMatches)
+ {
+ matcher.appendTail(sb);
+ String newString = sb.toString();
+ log.info("Creating value {}", newString);
+
+ values[j] = data
+ .getHierarchyManager()
+ .getWorkspace()
+ .getSession()
+ .getValueFactory()
+ .createValue(newString);
+
+ }
+ }
+
+ if (gotMatches)
+ {
+
+ log.debug("Setting value {} {}", values.length, values);
+
+ data.setValue(values);
+ data.save();
+ return true;
+ }
+
+ return false;
+ }
+}
Property changes on: trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/Linkfix.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.java
===================================================================
--- trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.java (rev 0)
+++ trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.java 2011-05-20 16:17:33 UTC (rev 3477)
@@ -0,0 +1,206 @@
+/**
+ *
+ * Repository tools for Magnolia CMS (http://www.openmindlab.com/lab/products/repotools.html)
+ * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlrepoutils;
+
+import info.magnolia.cms.util.AlertUtil;
+import info.magnolia.context.MgnlContext;
+import info.magnolia.module.admininterface.TemplatedMVCHandler;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DurationFormatUtils;
+import org.apache.commons.lang.time.StopWatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class LinkfixPage extends TemplatedMVCHandler
+{
+
+ private static Logger log = LoggerFactory.getLogger(LinkfixPage.class);
+
+ private static final String SUCCESS = "success";
+
+ private String replacements;
+
+ private String sourceRepositoriesAndPaths;
+
+ private String targetRepositories;
+
+ public LinkfixPage(String name, HttpServletRequest request, HttpServletResponse response)
+ {
+ super(name, request, response);
+ }
+
+ /**
+ * Sets the replacements.
+ * @param replacements the replacements to set
+ */
+ public void setReplacements(String replacements)
+ {
+ this.replacements = replacements;
+ }
+
+ /**
+ * Sets the sourceRepositoriesAndPaths.
+ * @param sourceRepositoriesAndPaths the sourceRepositoriesAndPaths to set
+ */
+ public void setSourceRepositoriesAndPaths(String sourceRepositoriesAndPaths)
+ {
+ this.sourceRepositoriesAndPaths = sourceRepositoriesAndPaths;
+ }
+
+ /**
+ * Sets the targetRepositories.
+ * @param targetRepositories the targetRepositories to set
+ */
+ public void setTargetRepositories(String targetRepositories)
+ {
+ this.targetRepositories = targetRepositories;
+ }
+
+ /**
+ * Returns the replacements.
+ * @return the replacements
+ */
+ public String getReplacements()
+ {
+ return replacements;
+ }
+
+ /**
+ * Returns the sourceRepositoriesAndPaths.
+ * @return the sourceRepositoriesAndPaths
+ */
+ public String getSourceRepositoriesAndPaths()
+ {
+ return sourceRepositoriesAndPaths;
+ }
+
+ /**
+ * Returns the targetRepositories.
+ * @return the targetRepositories
+ */
+ public String getTargetRepositories()
+ {
+ return targetRepositories;
+ }
+
+ public String execute() throws RepositoryException
+ {
+
+ String[] replacementsSplit = StringUtils.split(replacements, "\n");
+ Map<String, String> replacementsMap = new LinkedHashMap<String, String>();
+ for (String string : replacementsSplit)
+ {
+ String[] split = StringUtils.split(StringUtils.trim(string), "=");
+ if (split != null & split.length > 1)
+ {
+ replacementsMap.put(split[0], split[1]);
+ }
+ }
+
+ String[] sourceRepositoriesAndPathsArray = StringUtils
+ .split(StringUtils.trim(sourceRepositoriesAndPaths), "\n");
+ List<String> sourceRepositoriesAndPathList = new ArrayList<String>();
+ for (String string : sourceRepositoriesAndPathsArray)
+ {
+ if (StringUtils.contains(string, ":"))
+ {
+ sourceRepositoriesAndPathList.add(StringUtils.trim(string));
+ }
+ else
+ {
+ log.error("Invalid path: {}", string);
+ }
+ }
+
+ String[] repoArray = StringUtils.split(targetRepositories);
+ List<String> reposAsList = new ArrayList<String>();
+ for (String string : repoArray)
+ {
+ String repo = StringUtils.trim(string);
+ if (StringUtils.isNotEmpty(repo))
+ {
+
+ // test it
+ try
+ {
+ MgnlContext.getHierarchyManager(repo);
+ }
+ catch (IllegalArgumentException e)
+ {
+ log.error(e.getMessage(), e);
+ AlertUtil.setMessage(String.format("Invalid repository: %s", repo));
+ return SUCCESS;
+ }
+ reposAsList.add(repo);
+ }
+ }
+
+ StopWatch sw = new StopWatch();
+ sw.start();
+
+ Linkfix linkfix = new Linkfix(replacementsMap, sourceRepositoriesAndPathList, reposAsList);
+
+ try
+ {
+
+ linkfix.process();
+
+ }
+ catch (Throwable e)
+ {
+ log.error(e.getMessage(), e);
+ AlertUtil.setMessage(e.getClass().getName()
+ + ": "
+ + StringUtils.defaultIfEmpty(e.getMessage(), "(no message)"));
+ return SUCCESS;
+ }
+
+ sw.stop();
+ long time = sw.getTime();
+
+ AlertUtil
+ .setMessage(String
+ .format(
+ "Fix done in %s, %s nodes processed, %s matches and %s substitutions applied. Full list of modified properties:\n%s",
+ DurationFormatUtils.formatDurationWords(time, true, false),
+ linkfix.getNodesCount(),
+ linkfix.getMatchesCount(),
+ linkfix.getSubstitutionsCount(),
+ StringUtils.defaultIfEmpty(linkfix.getFullLog(), "(none)")));
+
+ return SUCCESS;
+ }
+
+}
Property changes on: trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java
===================================================================
--- trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java 2011-05-20 16:10:54 UTC (rev 3476)
+++ trunk/openutils-mgnlrepoutils/src/main/java/net/sourceforge/openutils/mgnlrepoutils/RepositoryUtilsPage.java 2011-05-20 16:17:33 UTC (rev 3477)
@@ -1,7 +1,7 @@
/**
*
* Repository tools for Magnolia CMS (http://www.openmindlab.com/lab/products/repotools.html)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: trunk/openutils-mgnlrepoutils/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexUtils.java
===================================================================
--- trunk/openutils-mgnlrepoutils/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexUtils.java 2011-05-20 16:10:54 UTC (rev 3476)
+++ trunk/openutils-mgnlrepoutils/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexUtils.java 2011-05-20 16:17:33 UTC (rev 3477)
@@ -1,7 +1,7 @@
/**
*
* Repository tools for Magnolia CMS (http://www.openmindlab.com/lab/products/repotools.html)
- * Copyright(C) ${project.inceptionYear}-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Added: trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.adminInterface.config.menu.tools.linkfix.xml
===================================================================
--- trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.adminInterface.config.menu.tools.linkfix.xml (rev 0)
+++ trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.adminInterface.config.menu.tools.linkfix.xml 2011-05-20 16:17:33 UTC (rev 3477)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="linkfix" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>63a87f96-def9-4b24-911f-35d7612ec1d9</sv:value>
+ </sv:property>
+ <sv:property sv:name="icon" sv:type="String">
+ <sv:value>/.resources/pirellimedia/img/ico16-linkfix.png</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>Fix links</sv:value>
+ </sv:property>
+ <sv:property sv:name="onclick" sv:type="String">
+ <sv:value>MgnlAdminCentral.showContent('/.magnolia/pages/linkfix.html');</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:Data" sv:type="String">
+ <sv:value>MetaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2005-05-16T20:46:43.549+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2006-05-31T14:57:07.972+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-01-31T12:18:09.250+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.adminInterface.config.menu.tools.linkfix.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.repoutils.pages.linkfix.xml
===================================================================
--- trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.repoutils.pages.linkfix.xml (rev 0)
+++ trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.repoutils.pages.linkfix.xml 2011-05-20 16:17:33 UTC (rev 3477)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="linkfix" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>7cc6213e-106c-45d3-8532-36d5517ce8f6</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlrepoutils.LinkfixPage</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="replacements" sv:type="String">
+ <sv:value>tyre/ww/en/=tyre/NEWPATH/en/</sv:value>
+ </sv:property>
+ <sv:property sv:name="sourceRepositoriesAndPaths" sv:type="String">
+ <sv:value>website:/tyre/NEWPATH/en/car
+products:/pirellityre/NEWPATH/en/car</sv:value>
+ </sv:property>
+ <sv:property sv:name="targetRepositories" sv:type="String">
+ <sv:value>website
+media
+products
+dms
+playlists</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:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-06-18T15:49:04.038Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2008-06-18T16:32:03.891Z</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-01-31T12:17:33.825+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-bootstrap/repoutils/config.modules.repoutils.pages.linkfix.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/css/images/frame-bottom.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/css/images/frame-bottom.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/css/images/frame-top.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/css/images/frame-top.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/css/images/ico-warning.png
===================================================================
(Binary files differ)
Property changes on: trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/css/images/ico-warning.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/css/openmindlab.css
===================================================================
--- trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/css/openmindlab.css (rev 0)
+++ trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/css/openmindlab.css 2011-05-20 16:17:33 UTC (rev 3477)
@@ -0,0 +1,124 @@
+body {
+ background-color: #333;
+ padding: 10px;
+ margin: 0;
+}
+
+div,span,p,input,select,pre,textarea {
+ font-size: 13px;
+ font-family: georgia, sans-serif;
+}
+
+form {
+ padding: 0;
+ margin: 0;
+}
+
+.ma-frame {
+ background-color: #fff;
+ padding: 0;
+ margin: 0;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+}
+
+.ma-frame h1 {
+ height: 59px;
+ background-image: url("images/frame-top.png");
+ background-position: top;
+ background-repeat: repeat-x;
+ -webkit-border-top-left-radius: 6px;
+ -webkit-border-top-right-radius: 6px;
+ -moz-border-radius-topleft: 6px;
+ -moz-border-radius-topright: 6px;
+ border-top-left-radius: 6px;
+ border-top-right-radius: 6px;
+ font-weight: lighter;
+ font-size: 22px;
+ line-height: 55px;
+ color: #fff;
+ background-repeat: repeat-x;
+ padding: 0 30px 0 30px;
+ text-shadow: #ddd 1px 1px 1px;
+}
+
+.ma-framecenter {
+ padding: 10px 30px 10px 30px;
+}
+
+.footer {
+ height: 60px;
+ background-image: url("images/frame-bottom.png");
+ background-position: bottom;
+ background-repeat: repeat-x;
+ -webkit-border-bottom-right-radius: 6px;
+ -webkit-border-bottom-left-radius: 6px;
+ -moz-border-radius-bottomright: 6px;
+ -moz-border-radius-bottomleft: 6px;
+ border-bottom-right-radius: 6px;
+ border-bottom-left-radius: 6px;
+ -webkit-border-bottom-right-radius: 6px;
+ padding: 0 30px 0 30px;
+}
+
+.warning {
+ border: 2px solid #FFD324;
+ padding: 10px 11px 8px 38px;
+ background: #FFF8BF url(images/ico-warning.png) no-repeat scroll 13px 12px;
+ color: #B35F00;
+}
+
+input,textarea {
+ width: 600px;
+ padding: 5px;
+ border: solid 1px #E5E5E5;
+ outline: 0;
+ font: normal 13px/100% Verdana, Tahoma, sans-serif;
+ background: #FFFFFF url('bg_form.png') left top repeat-x;
+ background: -webkit-gradient(linear, left top, left 25, from(#FFFFFF), color-stop(4%, #EEEEEE), to(#FFFFFF) );
+ background: -moz-linear-gradient(top, #FFFFFF, #EEEEEE 1px, #FFFFFF 25px);
+ box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 8px;
+ -moz-box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 8px;
+ -webkit-box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 8px;
+ padding: 9px;
+}
+
+textarea {
+ max-width: 500px;
+ height: 150px;
+ line-height: 150%;
+}
+
+input:hover,textarea:hover,input:focus,textarea:focus {
+ border-color: #C9C9C9;
+ -webkit-box-shadow: rgba(0, 0, 0, 0.15) 0px 0px 8px;
+}
+
+label {
+ color: #666;
+ display: block;
+ text-decoration: underline;
+ margin: 10px 0 5px 0;
+}
+
+.submit input {
+ width: auto;
+ padding: 9px 15px;
+ background: #666;
+ border: 0;
+ font-size: 14px;
+ color: #FFFFFF;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ float: right;
+ cursor: pointer;
+}
+
+small {
+ color: red;
+}
+
+#buttonContainer {
+ padding-top: 10px;
+}
\ No newline at end of file
Property changes on: trunk/openutils-mgnlrepoutils/src/main/resources/mgnl-resources/adminstyle/css/openmindlab.css
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/openutils-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.html
===================================================================
--- trunk/openutils-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.html (rev 0)
+++ trunk/openutils-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.html 2011-05-20 16:17:33 UTC (rev 3477)
@@ -0,0 +1,74 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+ <head>
+ <title>Linkfix util</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <link href="${this.request.contextPath}/.resources/adminstyle/css/openmindlab.css" type="text/css" rel="stylesheet" />
+ </head>
+ <body>
+ <div class="ma-frame">
+ <form id="settingsForm" method="post" action="">
+ <h1>Linkfix</h1>
+ <div class="ma-framecenter">
+ [#if message?exists]
+ <pre class="warning">${message}</pre>
+ [/#if]
+ <div>
+ <p>
+ This tool will help you fixing internal links in copied pages/sections.
+ <br />
+ After copying a whole website tree from /OLD to /NEW for example all the links in pages below /NEW will
+ still keep as a target pages in /OLD, since links are generated by using the UUID of pages. This tool will
+ seach for pages in the new path and will update any link found.
+ </p>
+ <label for="sourceRepositoriesAndPaths">
+ <small>1)</small>
+ Source repositories/path
+ </label>
+ <p>
+ The list of path where the substitution will be performed. This is the list of
+ <strong>new</strong>
+ paths, copied from the original tree.
+ <br />
+ You may add multiple repositories/path here, separated by a newline.
+ </p>
+ <textarea name="sourceRepositoriesAndPaths" style="width: 300px; height:120px">${this.sourceRepositoriesAndPaths!}</textarea>
+ </div>
+ <div>
+ <label for="targetRepositories">
+ <small>2)</small>
+ Target Repositories
+ </label>
+ <p>
+ The list of repositories where link
+ <strong>target</strong>
+ will be searched. Content into repositories listed here will not be affected, since they are only used for
+ references.
+ </p>
+ <textarea name="targetRepositories" style="width: 300px; height:120px">${this.targetRepositories!}</textarea>
+ </div>
+ <div>
+ <label for="replacements">
+ <small>3)</small>
+ Replacements
+ </label>
+ <p>
+ Multiple old=new paths to use for replacement.
+ <br />
+ An entry "/OLD=/NEW" means for example that when a reference is resolved with a path "/OLD/mynode", the
+ tool will look for the existence of a resource with the path "/NEW/mynode". If such content exists, the
+ link will be updated.
+ </p>
+ <textarea name="replacements" style="width: 300px; height:120px">${this.replacements!}</textarea>
+ </div>
+ </div>
+ <div class="footer">
+ <div id="buttonContainer" class="submit">
+ <input type="hidden" id="command" name="command" value="execute" />
+ <input id="button" class="button" type="submit" value="Start replacement" />
+ </div>
+ </div>
+ </form>
+ </div>
+ </body>
+</html>
\ No newline at end of file
Property changes on: trunk/openutils-mgnlrepoutils/src/main/resources/net/sourceforge/openutils/mgnlrepoutils/LinkfixPage.html
___________________________________________________________________
Added: svn:mime-type
+ text/html
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
