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-08-26 07:12:05
|
Revision: 3639
http://openutils.svn.sourceforge.net/openutils/?rev=3639&view=rev
Author: diego_schivo
Date: 2011-08-26 07:11:59 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-15 Single quote escape problem
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 07:02:18 UTC (rev 3638)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-26 07:11:59 UTC (rev 3639)
@@ -152,7 +152,7 @@
+ ((MgnlContext.getMessages().get(key) != null) ? StringUtils.replace(
MgnlContext.getMessages().get(key),
"'",
- "\'") : "") + "'}";
+ "\\'") : "") + "'}";
MgnlContext.setLocale(locBk);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:02:24
|
Revision: 3638
http://openutils.svn.sourceforge.net/openutils/?rev=3638&view=rev
Author: diego_schivo
Date: 2011-08-26 07:02:18 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 SearchPanel.TextField
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js
Modified: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js 2011-08-26 07:01:33 UTC (rev 3637)
+++ trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js 2011-08-26 07:02:18 UTC (rev 3638)
@@ -37,7 +37,7 @@
cm :cm,
autoExpandColumn :'key',
clicksToEdit :2,
- tbar : [ 'Text: ', ' ', new SearchPanel.FilterField( {
+ tbar : [ 'Text: ', ' ', new SearchPanel.TextField( {
store :ds
}) ]
});
@@ -46,9 +46,9 @@
Ext.extend(SearchPanel, Ext.grid.EditorGridPanel);
-SearchPanel.FilterField = Ext.extend(Ext.form.TriggerField, {
+SearchPanel.TextField = Ext.extend(Ext.form.TriggerField, {
initComponent : function() {
- SearchPanel.FilterField.superclass.initComponent.call(this);
+ SearchPanel.TextField.superclass.initComponent.call(this);
},
enableKeyEvents :true,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 07:01:38
|
Revision: 3637
http://openutils.svn.sourceforge.net/openutils/?rev=3637&view=rev
Author: diego_schivo
Date: 2011-08-26 07:01:33 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 Text
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js
Modified: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js 2011-08-26 06:55:58 UTC (rev 3636)
+++ trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js 2011-08-26 07:01:33 UTC (rev 3637)
@@ -37,7 +37,7 @@
cm :cm,
autoExpandColumn :'key',
clicksToEdit :2,
- tbar : [ 'Filter: ', ' ', new SearchPanel.FilterField( {
+ tbar : [ 'Text: ', ' ', new SearchPanel.FilterField( {
store :ds
}) ]
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-26 06:56:04
|
Revision: 3636
http://openutils.svn.sourceforge.net/openutils/?rev=3636&view=rev
Author: diego_schivo
Date: 2011-08-26 06:55:58 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
MESSAGES-14 avoid ajax calls on keyup
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js
Modified: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js 2011-08-25 17:56:27 UTC (rev 3635)
+++ trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js 2011-08-26 06:55:58 UTC (rev 3636)
@@ -49,9 +49,6 @@
SearchPanel.FilterField = Ext.extend(Ext.form.TriggerField, {
initComponent : function() {
SearchPanel.FilterField.superclass.initComponent.call(this);
- this.on('keyup', function(f, e) {
- this.onTriggerClick();
- }, this);
},
enableKeyEvents :true,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-25 17:56:33
|
Revision: 3635
http://openutils.svn.sourceforge.net/openutils/?rev=3635&view=rev
Author: diego_schivo
Date: 2011-08-25 17:56:27 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
MESSAGES-14 avaiable locales
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-25 17:47:16 UTC (rev 3634)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-25 17:56:27 UTC (rev 3635)
@@ -30,9 +30,11 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
+import java.util.Set;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
@@ -226,18 +228,27 @@
@SuppressWarnings("unchecked")
public String search()
{
- Messages messages = MgnlContext.getMessages();
- Iterator<String> it = messages.keys();
- keys = new ArrayList<String>();
- while (it.hasNext())
+ Locale locBk = MgnlContext.getLocale();
+ Set<String> set = new HashSet<String>();
+ for (Locale newLoc : MessagesConfigurationManager.getAvaiableLocales())
{
- String curKey = it.next();
- String curText = messages.get(curKey);
- if (StringUtils.contains(curText, text))
+ MgnlContext.setLocale(newLoc);
+ Messages messages = MgnlContext.getMessages();
+ Iterator<String> it = messages.keys();
+ while (it.hasNext())
{
- keys.add(curKey);
+ String curKey = it.next();
+ String curText = messages.get(curKey);
+ if (StringUtils.contains(curText, text))
+ {
+ set.add(curKey);
+ }
}
}
+ MgnlContext.setLocale(locBk);
+
+ keys = new ArrayList<String>(set);
+
Collections.sort(keys);
StringBuilder sb = new StringBuilder("[ ");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-25 17:47:22
|
Revision: 3634
http://openutils.svn.sourceforge.net/openutils/?rev=3634&view=rev
Author: diego_schivo
Date: 2011-08-25 17:47:16 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
MESSAGES-14 search
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-25 17:31:23 UTC (rev 3633)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-25 17:47:16 UTC (rev 3634)
@@ -23,6 +23,7 @@
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.Path;
+import info.magnolia.cms.i18n.Messages;
import info.magnolia.context.MgnlContext;
import info.magnolia.module.admininterface.TemplatedMVCHandler;
@@ -38,11 +39,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
@@ -227,24 +223,36 @@
return JSON_VIEW;
}
+ @SuppressWarnings("unchecked")
public String search()
{
- Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(MessagesModuleLifecycle.REPO);
- criteria.add(Restrictions.eq("@jcr:primaryType", ItemType.CONTENTNODE.getSystemName()));
- criteria.add(Restrictions.contains(".", text));
- int id = 0;
+ Messages messages = MgnlContext.getMessages();
+ Iterator<String> it = messages.keys();
+ keys = new ArrayList<String>();
+ while (it.hasNext())
+ {
+ String curKey = it.next();
+ String curText = messages.get(curKey);
+ if (StringUtils.contains(curText, text))
+ {
+ keys.add(curKey);
+ }
+ }
+ Collections.sort(keys);
+
StringBuilder sb = new StringBuilder("[ ");
- for (ResultIterator<AdvancedResultItem> items = criteria.execute().getItems(); items.hasNext();)
+ int i = 0;
+ for (String curKey : keys)
{
- String key = StringUtils.replaceChars(StringUtils.removeStart(items.next().getHandle(), "/"), '/', '.');
- sb.append("{ id: '").append(id++).append("', key: '").append(key).append("' }");
- if (items.hasNext())
+ if (i > 0)
{
sb.append(", ");
}
+ sb.append("{ id: '").append(i++).append("', key: '").append(curKey).append("' }");
}
sb.append(" ]");
json = sb.toString();
+
return JSON_VIEW;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-25 17:31:29
|
Revision: 3633
http://openutils.svn.sourceforge.net/openutils/?rev=3633&view=rev
Author: diego_schivo
Date: 2011-08-25 17:31:23 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
MESSAGES-14 search
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-25 17:08:35 UTC (rev 3632)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-25 17:31:23 UTC (rev 3633)
@@ -38,6 +38,11 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
import net.sourceforge.openutils.mgnlmessages.configuration.MessagesConfigurationManager;
import net.sourceforge.openutils.mgnlmessages.lifecycle.MessagesModuleLifecycle;
@@ -149,8 +154,7 @@
+ ((MgnlContext.getMessages().get(key) != null) ? StringUtils.replace(
MgnlContext.getMessages().get(key),
"'",
- "\'") : "")
- + "'}";
+ "\'") : "") + "'}";
MgnlContext.setLocale(locBk);
@@ -225,7 +229,22 @@
public String search()
{
- json = "[ {id: '0', key: 'about.build'}, {id: '1', key: 'about.title'} ]";
+ Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(MessagesModuleLifecycle.REPO);
+ criteria.add(Restrictions.eq("@jcr:primaryType", ItemType.CONTENTNODE.getSystemName()));
+ criteria.add(Restrictions.contains(".", text));
+ int id = 0;
+ StringBuilder sb = new StringBuilder("[ ");
+ for (ResultIterator<AdvancedResultItem> items = criteria.execute().getItems(); items.hasNext();)
+ {
+ String key = StringUtils.replaceChars(StringUtils.removeStart(items.next().getHandle(), "/"), '/', '.');
+ sb.append("{ id: '").append(id++).append("', key: '").append(key).append("' }");
+ if (items.hasNext())
+ {
+ sb.append(", ");
+ }
+ }
+ sb.append(" ]");
+ json = sb.toString();
return JSON_VIEW;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-25 17:08:41
|
Revision: 3632
http://openutils.svn.sourceforge.net/openutils/?rev=3632&view=rev
Author: diego_schivo
Date: 2011-08-25 17:08:35 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
MESSAGES-14 JsonStore
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/MessagesViewer.js
trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js
Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-25 15:44:09 UTC (rev 3631)
+++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-25 17:08:35 UTC (rev 3632)
@@ -223,6 +223,12 @@
return JSON_VIEW;
}
+ public String search()
+ {
+ json = "[ {id: '0', key: 'about.build'}, {id: '1', key: 'about.title'} ]";
+ return JSON_VIEW;
+ }
+
/**
* move a node (from AdminTreeMVCHandler copymoveNode)
* @param source source node
Modified: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/MessagesViewer.js
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/MessagesViewer.js 2011-08-25 15:44:09 UTC (rev 3631)
+++ trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/MessagesViewer.js 2011-08-25 17:08:35 UTC (rev 3632)
@@ -35,6 +35,10 @@
mainPanel.changeKey(key);
});
+ search.on('selectedKey', function(key) {
+ mainPanel.changeKey(key);
+ });
+
var viewport = new Ext.Viewport( {
layout :'border',
items : [
Modified: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js 2011-08-25 15:44:09 UTC (rev 3631)
+++ trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js 2011-08-25 17:08:35 UTC (rev 3632)
@@ -1,13 +1,65 @@
SearchPanel = function() {
+ var ds = new Ext.data.JsonStore( {
+ fields : [ 'id', 'key' ],
+ url: pageUrl
+ });
+ var pn = this;
+
+ var sm = new Ext.grid.RowSelectionModel( {
+ singleSelect :true,
+ listeners : {
+ rowselect : function(selmodel, rowIndex, r) {
+ pn.fireEvent('selectedKey', r.get('key'));
+ }
+ }
+ });
+
+ var cm = new Ext.grid.ColumnModel( [ {
+ id :'key',
+ header :"Message key",
+ dataIndex :'key',
+ editor :new Ext.form.TextField( {
+ allowBlank :false
+ })
+ } ]);
+
+ cm.defaultSortable = true;
+
SearchPanel.superclass.constructor.call(this, {
id :'search',
region :'center',
title :'Search',
margins :'0 0 0 0',
- cmargins :'0 0 0 0'
+ cmargins :'0 0 0 0',
+ store :ds,
+ sm :sm,
+ cm :cm,
+ autoExpandColumn :'key',
+ clicksToEdit :2,
+ tbar : [ 'Filter: ', ' ', new SearchPanel.FilterField( {
+ store :ds
+ }) ]
});
}
-Ext.extend(SearchPanel, Ext.Panel);
+Ext.extend(SearchPanel, Ext.grid.EditorGridPanel);
+
+SearchPanel.FilterField = Ext.extend(Ext.form.TriggerField, {
+ initComponent : function() {
+ SearchPanel.FilterField.superclass.initComponent.call(this);
+ this.on('keyup', function(f, e) {
+ this.onTriggerClick();
+ }, this);
+ },
+
+ enableKeyEvents :true,
+
+ triggerClass :'x-form-search-trigger',
+
+ onTriggerClick : function() {
+ var v = this.getRawValue();
+ this.store.load({ params: { command: 'search', text: v } });
+ }
+});
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-25 15:44:15
|
Revision: 3631
http://openutils.svn.sourceforge.net/openutils/?rev=3631&view=rev
Author: diego_schivo
Date: 2011-08-25 15:44:09 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
MESSAGES-14 tabpanel
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/MessagesPanel.js
trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/MessagesViewer.js
Modified: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/MessagesPanel.js
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/MessagesPanel.js 2011-08-25 15:43:35 UTC (rev 3630)
+++ trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/MessagesPanel.js 2011-08-25 15:44:09 UTC (rev 3631)
@@ -130,16 +130,10 @@
MessagesPanel.superclass.constructor.call(this, {
id :'feed-tree',
- region :'west',
+ region :'center',
title :'Keys',
- split :true,
- width :350,
- minSize :275,
- maxSize :400,
- collapsible :true,
- margins :'0 0 5 5',
- cmargins :'0 5 5 5',
- collapseFirst :false,
+ margins :'0 0 0 0',
+ cmargins :'0 0 0 0',
store :ds,
sm :sm,
cm :cm,
Modified: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/MessagesViewer.js
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/MessagesViewer.js 2011-08-25 15:43:35 UTC (rev 3630)
+++ trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/MessagesViewer.js 2011-08-25 15:44:09 UTC (rev 3631)
@@ -28,6 +28,7 @@
});
var messages = new MessagesPanel();
+ var search = new SearchPanel();
var mainPanel = new MainPanel();
messages.on('selectedKey', function(key) {
@@ -36,7 +37,23 @@
var viewport = new Ext.Viewport( {
layout :'border',
- items : [ messages, mainPanel ]
+ items : [
+ {
+ region :'west',
+ xtype: 'tabpanel',
+ split :true,
+ width :350,
+ minSize :275,
+ maxSize :400,
+ collapsible :true,
+ margins :'0 0 5 5',
+ cmargins :'0 5 5 5',
+ collapseFirst :false,
+ activeTab: 0,
+ items: [ messages, search ]
+ },
+ mainPanel
+ ]
});
});
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-25 15:43:42
|
Revision: 3630
http://openutils.svn.sourceforge.net/openutils/?rev=3630&view=rev
Author: diego_schivo
Date: 2011-08-25 15:43:35 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
MESSAGES-14 SearchPanel
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.html
Added Paths:
-----------
trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js
Added: trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js (rev 0)
+++ trunk/openutils-mgnlmessages/src/main/resources/mgnl-resources/messages/js/SearchPanel.js 2011-08-25 15:43:35 UTC (rev 3630)
@@ -0,0 +1,13 @@
+SearchPanel = function() {
+
+ SearchPanel.superclass.constructor.call(this, {
+ id :'search',
+ region :'center',
+ title :'Search',
+ margins :'0 0 0 0',
+ cmargins :'0 0 0 0'
+ });
+
+}
+
+Ext.extend(SearchPanel, Ext.Panel);
Modified: trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.html
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.html 2011-08-25 15:04:50 UTC (rev 3629)
+++ trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.html 2011-08-25 15:43:35 UTC (rev 3630)
@@ -46,6 +46,7 @@
</script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/messages/js/TabCloseMenu.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/messages/js/MessagesPanel.js"></script>
+ <script type="text/javascript" src="${this.request.contextPath}/.resources/messages/js/SearchPanel.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/messages/js/MainPanel.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/messages/js/MessagesViewer.js"></script>
</head>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-25 15:04:56
|
Revision: 3629
http://openutils.svn.sourceforge.net/openutils/?rev=3629&view=rev
Author: diego_schivo
Date: 2011-08-25 15:04:50 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
MESSAGES-13 Use ext-all.js insted of ext-all-debug.js
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.html
Modified: trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.html
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.html 2011-08-25 14:54:04 UTC (rev 3628)
+++ trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.html 2011-08-25 15:04:50 UTC (rev 3629)
@@ -6,7 +6,13 @@
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/ext/css/xtheme-gray.css" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/messages/css/messagespanel.css" />
<script type="text/javascript" src="${this.request.contextPath}/.resources/ext/ext-base.js"></script>
+ <#-- TODO import the appropriate script depending on SystemProperty.getBooleanProperty("magnolia.develop")
+ <#if debug>
<script type="text/javascript" src="${this.request.contextPath}/.resources/ext/ext-all-debug.js"></script>
+ <#else>
+ -->
+ <script type="text/javascript" src="${this.request.contextPath}/.resources/ext/ext-all.js"></script>
+ <#--</#if>-->
<script type="text/javascript">
var ctx = "${this.request.contextPath}";
var keys = [
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-08-25 14:54:10
|
Revision: 3628
http://openutils.svn.sourceforge.net/openutils/?rev=3628&view=rev
Author: diego_schivo
Date: 2011-08-25 14:54:04 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
MESSAGES-12 miframe.js unused
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.html
Modified: trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.html
===================================================================
--- trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.html 2011-08-22 07:40:44 UTC (rev 3627)
+++ trunk/openutils-mgnlmessages/src/main/resources/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.html 2011-08-25 14:54:04 UTC (rev 3628)
@@ -7,7 +7,6 @@
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/messages/css/messagespanel.css" />
<script type="text/javascript" src="${this.request.contextPath}/.resources/ext/ext-base.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/ext/ext-all-debug.js"></script>
- <script type="text/javascript" src="${this.request.contextPath}/.resources/messages/js/miframe.js"></script>
<script type="text/javascript">
var ctx = "${this.request.contextPath}";
var keys = [
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2011-08-22 08:38:22
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/421/changes> Changes: [Fabrizio Giustina] [maven-release-plugin] prepare for next development iteration [Fabrizio Giustina] [maven-release-plugin] prepare release openutils-mgnlmedia-4.4.2 ------------------------------------------ Started by an SCM change Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia U pom.xml At revision 3627 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 52603 /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 294 resources [INFO] Copying 1 resource [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. Downloading: http://repository.openmindonline.it/net/sourceforge/openutils/flazr/0.7-snv20100505/flazr-0.7-snv20100505.pom [INFO] Unable to find resource 'net.sourceforge.openutils:flazr:pom:0.7-snv20100505' in repository central (http://repo1.maven.org/maven2) Downloading: http://repository.openmindonline.it/net/sourceforge/openutils/flazr/0.7-snv20100505/flazr-0.7-snv20100505.jar [INFO] Unable to find resource 'net.sourceforge.openutils:flazr:jar:0.7-snv20100505' 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-08-22_10-21-57/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.4.3-SNAPSHOT/pom.xml [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Failed to resolve artifact. Missing: ---------- 1) net.sourceforge.openutils:flazr:jar:0.7-snv20100505 Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=net.sourceforge.openutils -DartifactId=flazr -Dversion=0.7-snv20100505 -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=flazr -Dversion=0.7-snv20100505 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) net.sourceforge.openutils:openutils-mgnlmedia:jar:4.4.3-SNAPSHOT 2) net.sourceforge.openutils:flazr:jar:0.7-snv20100505 ---------- 1 required artifact is missing. for artifact: net.sourceforge.openutils:openutils-mgnlmedia:jar:4.4.3-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: 6 seconds [INFO] Finished at: Mon Aug 22 10:22:08 CEST 2011 [INFO] Final Memory: 32M/152M [INFO] ------------------------------------------------------------------------ channel stopped |
|
From: <fg...@us...> - 2011-08-22 07:40:49
|
Revision: 3627
http://openutils.svn.sourceforge.net/openutils/?rev=3627&view=rev
Author: fgiust
Date: 2011-08-22 07:40:44 +0000 (Mon, 22 Aug 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-08-22 07:40:37 UTC (rev 3626)
+++ trunk/openutils-mgnlmedia/pom.xml 2011-08-22 07:40:44 UTC (rev 3627)
@@ -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.2</version>
+ <version>4.4.3-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.2</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4.2</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.4.2</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-08-22 07:40:42
|
Revision: 3626
http://openutils.svn.sourceforge.net/openutils/?rev=3626&view=rev
Author: fgiust
Date: 2011-08-22 07:40:37 +0000 (Mon, 22 Aug 2011)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmedia-4.4.2
Added Paths:
-----------
tags/openutils-mgnlmedia-4.4.2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-08-22 07:40:24
|
Revision: 3625
http://openutils.svn.sourceforge.net/openutils/?rev=3625&view=rev
Author: fgiust
Date: 2011-08-22 07:40:17 +0000 (Mon, 22 Aug 2011)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmedia-4.4.2
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2011-08-21 18:02:33 UTC (rev 3624)
+++ trunk/openutils-mgnlmedia/pom.xml 2011-08-22 07:40:17 UTC (rev 3625)
@@ -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.2-SNAPSHOT</version>
+ <version>4.4.2</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.2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4.2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.4.2</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2011-08-21 18:38:11
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/420/changes> Changes: [Fabrizio Giustina] MEDIA-213 repackaged flazr ------------------------------------------ Started by an SCM change Updating https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia U pom.xml At revision 3624 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 60745 /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 294 resources [INFO] Copying 1 resource [WARNING] POM for 'com.drewnoakes:metadata-extractor:pom:2.4.0-beta-1:compile' is invalid. Its dependencies (if any) will NOT be available to the current build. Downloading: http://repository.openmindonline.it/net/sourceforge/openutils/flazr/0.7-snv20100505/flazr-0.7-snv20100505.pom [INFO] Unable to find resource 'net.sourceforge.openutils:flazr:pom:0.7-snv20100505' in repository central (http://repo1.maven.org/maven2) Downloading: http://repository.openmindonline.it/net/sourceforge/openutils/flazr/0.7-snv20100505/flazr-0.7-snv20100505.jar [INFO] Unable to find resource 'net.sourceforge.openutils:flazr:jar:0.7-snv20100505' 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-08-21_20-21-41/archive/net.sourceforge.openutils/openutils-mgnlmedia/4.4.2-SNAPSHOT/pom.xml [INFO] ------------------------------------------------------------------------ [ERROR] BUILD ERROR [INFO] ------------------------------------------------------------------------ [INFO] Failed to resolve artifact. Missing: ---------- 1) net.sourceforge.openutils:flazr:jar:0.7-snv20100505 Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=net.sourceforge.openutils -DartifactId=flazr -Dversion=0.7-snv20100505 -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=flazr -Dversion=0.7-snv20100505 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) net.sourceforge.openutils:openutils-mgnlmedia:jar:4.4.2-SNAPSHOT 2) net.sourceforge.openutils:flazr:jar:0.7-snv20100505 ---------- 1 required artifact is missing. for artifact: net.sourceforge.openutils:openutils-mgnlmedia:jar:4.4.2-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: Sun Aug 21 20:21:57 CEST 2011 [INFO] Final Memory: 32M/151M [INFO] ------------------------------------------------------------------------ channel stopped |
|
From: <fg...@us...> - 2011-08-21 18:02:39
|
Revision: 3624
http://openutils.svn.sourceforge.net/openutils/?rev=3624&view=rev
Author: fgiust
Date: 2011-08-21 18:02:33 +0000 (Sun, 21 Aug 2011)
Log Message:
-----------
MEDIA-213 repackaged flazr
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2011-08-21 17:08:59 UTC (rev 3623)
+++ trunk/openutils-mgnlmedia/pom.xml 2011-08-21 18:02:33 UTC (rev 3624)
@@ -179,7 +179,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.flazr</groupId>
+ <groupId>net.sourceforge.openutils</groupId>
<artifactId>flazr</artifactId>
<version>0.7-snv20100505</version>
<exclusions>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-08-21 17:09:05
|
Revision: 3623
http://openutils.svn.sourceforge.net/openutils/?rev=3623&view=rev
Author: fgiust
Date: 2011-08-21 17:08:59 +0000 (Sun, 21 Aug 2011)
Log Message:
-----------
avoid NPEs
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2011-08-21 17:05:47 UTC (rev 3622)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/VideoTypeHandler.java 2011-08-21 17:08:59 UTC (rev 3623)
@@ -55,7 +55,7 @@
{
VideoMetaData metaData = VideoMedataUtils.parsefromStream(getOriginalFileNodeData(media).getAttribute(
FileProperties.PROPERTY_EXTENSION), stream);
- if (metaData.getFileSize() == 0)
+ if (metaData != null && metaData.getFileSize() == 0)
{
metaData.setFileSize(Long.parseLong(getOriginalFileNodeData(media).getAttribute(
FileProperties.PROPERTY_SIZE)));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-08-21 17:05:53
|
Revision: 3622
http://openutils.svn.sourceforge.net/openutils/?rev=3622&view=rev
Author: fgiust
Date: 2011-08-21 17:05:47 +0000 (Sun, 21 Aug 2011)
Log Message:
-----------
MEDIA-252 Add an API for loading an external video into the repository
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2011-08-21 17:01:44 UTC (rev 3621)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java 2011-08-21 17:05:47 UTC (rev 3622)
@@ -61,7 +61,35 @@
private static Logger log = LoggerFactory.getLogger(MediaLoadUtils.class);
/**
- * Load a file in media repository
+ * Loads a media linking to an external video.
+ * @param videourl absolute video url
+ * @param parent media folder
+ * @param filename video filename
+ * @param overwrite overwrite an exxisting media
+ * @return loaded media
+ * @throws RepositoryException exception working on media repository
+ * @throws IOException exception working with file stream
+ */
+ public static Content loadExternalVideo(String videourl, String parent, String filename, boolean overwrite)
+ throws RepositoryException, IOException
+ {
+ log.debug("loading external video {}/{} with url {}", new Object[]{parent, filename, videourl });
+
+ MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get("youtube");
+
+ String cleanFilename = Path.getValidatedLabel(videourl);
+
+ Content media = createMediaNode(mtc, parent, cleanFilename, overwrite);
+ media.setNodeData("videoUrl", videourl);
+
+ mtc.getHandler().onPostSave(media);
+
+ return media;
+
+ }
+
+ /**
+ * Loads a file in the media repository
* @param inputStream file input stream
* @param parent parent folder node
* @param filename filename
@@ -76,57 +104,23 @@
log.debug("loading image {} {}", parent, filename);
- HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModule.REPO);
-
String extension = StringUtils.substringAfterLast(filename, ".");
String cleanFilename = StringUtils.substringBeforeLast(filename, ".");
MediaTypeConfiguration mtc = MediaConfigurationManager.getMediaHandlerFromExtension(extension);
if (mtc != null)
{
- Content parentNode = getOrCreateFullPath(mgr, parent);
- String mediaName = Path.getValidatedLabel(cleanFilename);
+ Content media = createMediaNode(mtc, parent, cleanFilename, overwrite);
- if (overwrite)
- {
- Content existing = parentNode.getChildByName(mediaName);
- if (existing != null)
- {
- existing.delete();
- mgr.save();
- }
- }
-
- Content media = mgr.createContent(
- parent,
- Path.getUniqueLabel(parentNode, mediaName),
- MediaConfigurationManager.MEDIA.getSystemName());
-
- setNodedataOnlyIfNotExisting(media, "creator", MgnlContext.getUser().getName());
- setNodedataOnlyIfNotExisting(media, "creationDate", Calendar.getInstance());
-
- NodeDataUtil.getOrCreateAndSet(media, "type", mtc.getName());
- NodeDataUtil.getOrCreateAndSet(media, "modificationDate", Calendar.getInstance());
- NodeDataUtil.getOrCreateAndSet(media, "modificationUser", MgnlContext.getUser().getName());
-
- if (MediaEl.module().isSingleinstance())
- {
- media.getMetaData().setActivated();
- }
-
- mgr.save();
-
File f = File.createTempFile("entry", "." + extension);
FileOutputStream fTemp = new FileOutputStream(f);
IOUtils.copy(inputStream, fTemp);
-
IOUtils.closeQuietly(fTemp);
mtc.getHandler().saveFromZipFile(media, f, cleanFilename, extension);
- mgr.save();
-
+ MgnlContext.getSystemContext().getHierarchyManager(MediaModule.REPO).save();
FileUtils.deleteQuietly(f);
return media;
@@ -135,6 +129,55 @@
}
/**
+ * @param mtc
+ * @param parent
+ * @param filename
+ * @param overwrite
+ * @return
+ * @throws RepositoryException
+ * @throws AccessDeniedException
+ */
+ private static Content createMediaNode(MediaTypeConfiguration mtc, String parent, String filename, boolean overwrite)
+ throws RepositoryException, AccessDeniedException
+ {
+
+ HierarchyManager mgr = MgnlContext.getSystemContext().getHierarchyManager(MediaModule.REPO);
+
+ Content parentNode = getOrCreateFullPath(mgr, parent);
+ String mediaName = Path.getValidatedLabel(filename);
+
+ if (overwrite)
+ {
+ Content existing = parentNode.getChildByName(mediaName);
+ if (existing != null)
+ {
+ existing.delete();
+ mgr.save();
+ }
+ }
+
+ Content media = mgr.createContent(
+ parent,
+ Path.getUniqueLabel(parentNode, mediaName),
+ MediaConfigurationManager.MEDIA.getSystemName());
+
+ setNodedataOnlyIfNotExisting(media, "creator", MgnlContext.getUser().getName());
+ setNodedataOnlyIfNotExisting(media, "creationDate", Calendar.getInstance());
+
+ NodeDataUtil.getOrCreateAndSet(media, "type", mtc.getName());
+ NodeDataUtil.getOrCreateAndSet(media, "modificationDate", Calendar.getInstance());
+ NodeDataUtil.getOrCreateAndSet(media, "modificationUser", MgnlContext.getUser().getName());
+
+ if (MediaEl.module().isSingleinstance())
+ {
+ media.getMetaData().setActivated();
+ }
+
+ mgr.save();
+ return media;
+ }
+
+ /**
* @param media
* @param key
* @param value
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-08-21 17:01:50
|
Revision: 3621
http://openutils.svn.sourceforge.net/openutils/?rev=3621&view=rev
Author: fgiust
Date: 2011-08-21 17:01:44 +0000 (Sun, 21 Aug 2011)
Log Message:
-----------
MEDIA-251 MediaEL.node() should not require a webcontext
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2011-08-20 15:50:25 UTC (rev 3620)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java 2011-08-21 17:01:44 UTC (rev 3621)
@@ -154,11 +154,18 @@
if (content != null && !(content instanceof NodeMapWrapper))
{
- Content currentpage = MgnlContext.getAggregationState().getMainContent();
+ Content currentpage = null;
+
+ if (MgnlContext.isWebContext())
+ {
+ currentpage = MgnlContext.getAggregationState().getMainContent();
+ }
+
if (currentpage == null)
{
currentpage = content;
}
+
content = new NodeMapWrapper(new I18nContentWrapper(content), currentpage.getHandle());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-08-20 15:50:31
|
Revision: 3620
http://openutils.svn.sourceforge.net/openutils/?rev=3620&view=rev
Author: fgiust
Date: 2011-08-20 15:50:25 +0000 (Sat, 20 Aug 2011)
Log Message:
-----------
MEDIA-250 Add support for jwplayer analytics plugin
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag
trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2011-08-20 15:47:51 UTC (rev 3619)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2011-08-20 15:50:25 UTC (rev 3620)
@@ -31,7 +31,8 @@
<jsp:directive.attribute name="thumbnail" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true the preview of the player shows the thumbnail image"/>
<jsp:directive.attribute name="videoImagePreview" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true, the tag will not insert the player for videos but only a preview image. For videos or mp3s it needs the following scripts loaded in page: <ul><li>.resources/media/js/mootools-1.2-core.js</li><li>.resources/media/js/mootools-1.2-more.js</li><li>.resources/media/js/mootools-1.2-swfobject.js</li></ul>"/>
<jsp:directive.attribute name="controlbar" required="false" rtexprvalue="true" type="java.lang.String" description="defines controlbar position. Possible values are: 'none' (for hiding), 'over', 'bottom', 'top'. If not set, this value will be 'bottom' by default." />
- <jsp:directive.attribute name="share" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true the pluging share-1 is show"/>
+ <jsp:directive.attribute name="share" required="false" rtexprvalue="true" type="java.lang.Boolean" description="Adds the share features to the player (only supported for jwplayer 4/5)" />
+ <jsp:directive.attribute name="analytics" required="false" rtexprvalue="true" type="java.lang.Boolean" description="Track views using google analytics (only supported for jwplayer 5)" />
<jsp:directive.attribute name="crop" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if true, the zoom and crop mode is enabled on the media. The cropProperty attribute is mandatory"/>
<jsp:directive.attribute name="cropProperty" required="false" rtexprvalue="true" type="java.lang.String" description="the name of the property where (with '_pzc' suffix) zoom and crop informations are saved "/>
<jsp:directive.attribute name="cropJs" required="false" rtexprvalue="true" type="java.lang.Boolean" description="whether to load crop js files. Defaults to true. If false you have to manually include jquery, jquery ui and (before closing body tag) /.resources/media/js/crop/crop.js" />
@@ -167,7 +168,8 @@
thumbnail="${thumbnail}"
noPlayIcon="${noPlayIcon}"
controlbar="${controlbar}"
- skin="${skin}"/>
+ skin="${skin}"
+ analytics="${analytics}" />
</c:otherwise>
</c:choose>
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag 2011-08-20 15:47:51 UTC (rev 3619)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag 2011-08-20 15:50:25 UTC (rev 3620)
@@ -27,13 +27,14 @@
<jsp:directive.attribute name="controlbar" required="false" rtexprvalue="true" type="java.lang.String"
description="defines controlbar position. Possible values are: 'none' (for hiding), 'over', 'bottom', 'top'. If not set, this value will be 'bottom' by default." />
<jsp:directive.attribute name="share" required="false" rtexprvalue="true" type="java.lang.Boolean"
- description="Adds the share features to the player (copy page url and embed code)" />
+ description="Adds the share features to the player (only supported for jwplayer 4/5)" />
+ <jsp:directive.attribute name="analytics" required="false" rtexprvalue="true" type="java.lang.Boolean"
+ description="Track views using google analytics (only supported for jwplayer 5)" />
<c:if test="${empty requestScope['mgnlmedia_jwplayer5_link_drawn']}">
<script type="text/javascript" src="${pageContext.request.contextPath}/.resources/media/players/jwplayer5/jwplayer.js"><!-- -->
</script>
<c:set var="mgnlmedia_jwplayer5_link_drawn" scope="request" value="true" />
</c:if>
-
<c:set var="previewId" value="preview-${su:randomAlphanumeric(6)}" />
<div id="${previewId}" class="preview"><!-- -->
</div>
@@ -49,16 +50,22 @@
]]>
<c:if test="${not empty skin}">skin:"${skin}",</c:if>
<c:if test="${thumbnail and !empty preview}"> image:"${preview}",</c:if>
+ <jsp:text>'plugins': {</jsp:text>
+ <c:if test="${analytics}"> 'gapro-2': {},</c:if>
<c:if test="${share}">
<c:set var="sharinglink">${baseUrl}${actpage.handle}.html</c:set>
<c:set var="sharingcode">
<embed src="${playerPath}" flashvars="file=${fn:contains(url, '://')? '' : baseUrl}${url}" width="${width}"
height="${height}" />
</c:set>
- <![CDATA[plugins: "sharing-2",']]>
- <![CDATA[sharing.link: "${sharinglink}",]]>
- <![CDATA[sharing.code: "${fn:escapeXml(sharingcode)",}]]>
+ <![CDATA[
+ 'sharing-3': {
+ link: "${sharinglink}",
+ code: '${sharingcode}'
+ },
+ ]]>
</c:if>
+ <jsp:text>},</jsp:text>
<c:choose>
<c:when test="${fn:startsWith(url, 'rtmp:') or fn:startsWith(url, 'rtmpt:')}">
<c:set var="file" value="${fn:split(url, '/')}" />
Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2011-08-20 15:47:51 UTC (rev 3619)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2011-08-20 15:50:25 UTC (rev 3620)
@@ -29,7 +29,9 @@
<jsp:directive.attribute name="controlbar" required="false" rtexprvalue="true" type="java.lang.String"
description="defines controlbar position. Possible values are: 'none' (for hiding), 'over', 'bottom', 'top'. If not set, this value will be 'bottom' by default." />
<jsp:directive.attribute name="share" required="false" rtexprvalue="true" type="java.lang.Boolean"
- description="Adds the share features to the player (copy page url and embed code)" />
+ description="Adds the share features to the player (only supported for jwplayer 4/5)" />
+ <jsp:directive.attribute name="analytics" required="false" rtexprvalue="true" type="java.lang.Boolean"
+ description="Track views using google analytics (only supported for jwplayer 5)" />
<!-- end attributes -->
<c:set value="${media:node(item)}" var="mediaNode" />
<c:if test="${empty controlbar}">
@@ -78,7 +80,7 @@
<c:when test="${player eq 'jwplayer5' or player eq 'jwplayer'}">
<media:player-jwplayer5 url="${url}" preview="${preview}" share="${share}"
item="${item}" width="${width}" height="${height}" autoPlay="${autoPlay}" loop="${loop}" thumbnail="${thumbnail}"
- noPlayIcon="${noPlayIcon}" controlbar="${controlbar}" skin="${skin}" />
+ noPlayIcon="${noPlayIcon}" controlbar="${controlbar}" skin="${skin}" analytics="${analytics}"/>
</c:when>
<c:otherwise>
<c:choose>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-08-20 15:47:59
|
Revision: 3619
http://openutils.svn.sourceforge.net/openutils/?rev=3619&view=rev
Author: fgiust
Date: 2011-08-20 15:47:51 +0000 (Sat, 20 Aug 2011)
Log Message:
-----------
MEDIA-241 Analytics imported multiple times
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-08-12 09:27:20 UTC (rev 3618)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-08-20 15:47:51 UTC (rev 3619)
@@ -354,14 +354,5 @@
<input type="file" name="zipFile" />
</form>
</div>
-
- <script type="text/javascript">
- // <![CDATA[[
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-// ]]>
-</script>
-
-
</body>
</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@op...> - 2011-08-12 09:59:12
|
See <https://hudson.openmindonline.it/job/openutils-deployment/32/changes> |
|
From: <hu...@op...> - 2011-08-12 09:59:09
|
See <https://hudson.openmindonline.it/job/openutils-deployment/net.sourceforge.openutils$openutils-deployment/32/changes> |
