- kune-commits - lists.ourproject.org

11 May '09

Author: vjrj Date: 2009-05-11 22:23:46 +0200 (Mon, 11 May 2009) New Revision: 1109 Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManager.java trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneUiUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/InfoDialog.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTELinkPopup.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditor.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/properties/ChatProperties.java trunk/src/main/java/org/ourproject/kune/platf/server/properties/DatabaseProperties.java trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java trunk/src/test/java/org/ourproject/kune/chat/server/managers/XmppManagerTest.java Log: Complete - task link editing/remove not working Complete - task link editing close option Complete - task Elements unselectable utility Incomplete - task 192: Make a chat notification library to users http://ourproject.org/tracker/?group_id=407&func=detail&atid=139&aid=192 Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -286,7 +286,7 @@ final String resource = "emiteui-" + new Date().getTime() + "-kune"; // + // getGwtMetaProperty(GWT_PROPERTY_RELEASE); // FIXME, get this from user profile - return new UserChatOptions(jid + "@" + chatOptions.domain, passwd, resource, "blue", - SubscriptionMode.autoAcceptAll, true); + return new UserChatOptions(jid + "@" + chatOptions.domain, passwd, resource, "blue", SubscriptionMode.manual, + true); } } Modified: trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManager.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManager.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -39,4 +39,6 @@ void sendMessage(Room room, String message); + void sendMessage(String userName, String message); + } Modified: trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManagerDefault.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/chat/server/managers/XmppManagerDefault.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -24,7 +24,11 @@ import java.util.Iterator; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jivesoftware.smack.Chat; import org.jivesoftware.smack.ConnectionConfiguration; +import org.jivesoftware.smack.MessageListener; import org.jivesoftware.smack.Roster; import org.jivesoftware.smack.RosterEntry; import org.jivesoftware.smack.XMPPConnection; @@ -40,6 +44,7 @@ @Singleton public class XmppManagerDefault implements XmppManager { + public static final Log log = LogFactory.getLog(XmppManagerDefault.class); private final ChatProperties chatProperties; @@ -78,7 +83,7 @@ } - public Collection<RosterEntry> getRoster(ChatConnection conn) { + public Collection<RosterEntry> getRoster(final ChatConnection conn) { XmppConnection xConn = (XmppConnection) conn; Roster roster = xConn.getConn().getRoster(); return roster.getEntries(); @@ -123,6 +128,29 @@ } } + public void sendMessage(final String userName, final String text) { + ChatConnection connection = login(chatProperties.getAdminJID(), chatProperties.getAdminPasswd(), + "kuneserveradmin" + System.currentTimeMillis()); + XMPPConnection xmppConn = ((XmppConnection) connection).getConn(); + + String userJid = userName + "@" + chatProperties.getDomain(); + Chat newChat = xmppConn.getChatManager().createChat(userJid, new MessageListener() { + public void processMessage(final Chat arg0, final Message arg1) { + log.info("Sended message: " + text); + } + }); + try { + final Message message = new Message(); + message.setFrom(chatProperties.getDomain()); + message.setTo(userJid); + message.setBody(text); + newChat.sendMessage(message); + } catch (Exception e) { + log.error("Error Delivering xmpp message to " + userName); + } + xmppConn.disconnect(); + } + private void configure(final MultiUserChat muc) throws XMPPException { Form form = muc.getConfigurationForm(); Form answer = form.createAnswerForm(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneUiUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneUiUtils.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneUiUtils.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -25,6 +25,7 @@ import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Widget; +import com.gwtext.client.core.Ext; import com.gwtext.client.widgets.ToolTip; import com.gwtext.client.widgets.form.Field; @@ -55,7 +56,7 @@ } public static String genQuickTipLabel(final String labelText, final String tipTitle, final String tipText, - final AbstractImagePrototype icon, IconPosition iconPosition) { + final AbstractImagePrototype icon, final IconPosition iconPosition) { String tipHtml = "<span style=\"vertical-align: middle;\" ext:qtip=\"" + tipText + "\""; if (tipTitle != null && tipTitle.length() > 0) { tipHtml += " ext:qtitle=\"" + tipTitle + "\""; @@ -88,7 +89,7 @@ return tipHtml; } - public static String genQuickTipWithImage(String imageResizedUrl, int size) { + public static String genQuickTipWithImage(final String imageResizedUrl, final int size) { return new Image(imageResizedUrl).toString(); } @@ -131,4 +132,13 @@ public static void setQuickTip(final Widget widget, final String tip, final String tipTitle) { setQuickTip(widget.getElement(), tip, tipTitle); } + + /** + * Disables text selection on element + * + * @param element + */ + public static void setUnselectable(final Element element) { + Ext.get(element).unselectable(); + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/InfoDialog.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/InfoDialog.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/InfoDialog.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -27,7 +27,7 @@ public class InfoDialog extends BasicDialog { public InfoDialog(final String dialogId, final String title, final String header, final String text, - final String okButtonText, String okButtonId, final boolean modal, final boolean autoScroll, + final String okButtonText, final String okButtonId, final boolean modal, final boolean autoScroll, final int width, final int height) { super(dialogId, title, modal, autoScroll, width, height); final Button okButton = new Button(okButtonText); @@ -35,7 +35,7 @@ okButton.addListener(new ButtonListenerAdapter() { @Override public void onClick(final Button button, final EventObject e) { - hide(); + destroy(); } }); final Panel panel = new Panel(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTELinkPopup.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTELinkPopup.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTELinkPopup.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -1,10 +1,13 @@ package org.ourproject.kune.platf.client.ui.rte.basic; import org.ourproject.kune.platf.client.actions.ActionItem; +import org.ourproject.kune.platf.client.services.Images; +import org.ourproject.kune.platf.client.ui.KuneUiUtils; import com.calclab.suco.client.events.Listener0; import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.Widget; @@ -16,22 +19,32 @@ public RTELinkPopup() { hp = new HorizontalPanel(); hp.setSpacing(5); + KuneUiUtils.setUnselectable(hp.getElement()); + Image close = new Image(); + Images.App.getInstance().kuneClose().applyTo(close); + close.addClickListener(new ClickListener() { + public void onClick(final Widget sender) { + hide(); + } + }); + hp.add(close); } public void addAction(final ActionItem<Object> item, final Listener0 onClick) { Label actionLabel = new Label(); actionLabel.setText(item.getAction().getText()); actionLabel.addStyleName("k-rte-changelink"); + KuneUiUtils.setUnselectable(actionLabel.getElement()); actionLabel.addClickListener(new ClickListener() { public void onClick(final Widget arg0) { onClick.onEvent(); } }); - hp.add(actionLabel); + hp.insert(actionLabel, 0); } public void hide() { - if (popupPalette != null) { + if (isVisible()) { popupPalette.hide(); } } @@ -47,10 +60,9 @@ public void show(final int left, final int top) { popupPalette = new PopupPanel(false, false); popupPalette.addStyleName("k-rte-changelink-popup"); - popupPalette.setVisible(false); + popupPalette.setWidget(hp); popupPalette.show(); popupPalette.setPopupPosition(left, top); - popupPalette.setWidget(hp); popupPalette.setVisible(true); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditor.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditor.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -39,6 +39,8 @@ ActionToolbar<Object> getTopBar(); + void reset(); + void setExtended(boolean extended); void setFocus(boolean focus); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -28,6 +28,7 @@ import org.xwiki.gwt.dom.client.Range; import org.xwiki.gwt.dom.client.Selection; +import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.events.Listener0; import com.google.gwt.dom.client.Element; import com.google.gwt.user.client.Command; @@ -87,7 +88,11 @@ public void addCtxAction(final ActionItem<Object> actionItem) { linkCtxMenu.addAction(actionItem, new Listener0() { public void onEvent() { - actionManager.doAction(actionItem); + DeferredCommand.addCommand(new Command() { + public void execute() { + actionManager.doAction(actionItem); + } + }); } }); } @@ -126,15 +131,13 @@ public LinkInfo getLinkInfoIfHref() { LinkInfo linkinfo = null; - org.xwiki.gwt.dom.client.Element selectedAnchor = LinkExecutableUtils.getSelectedAnchor(this); + org.xwiki.gwt.dom.client.Element selectedAnchor = selectAndGetLink(); if (selectedAnchor != null) { - Range range = getDocument().createRange(); - range.selectNode(selectedAnchor); - getSelection().addRange(range); linkinfo = LinkInfo.parse(selectedAnchor); } else { linkinfo = new LinkInfo(getSelectionText()); } + Log.debug("Link info: " + linkinfo); return linkinfo; } @@ -156,7 +159,6 @@ public void hideLinkCtxMenu() { linkCtxMenu.hide(); - } public void insertBlockquote() { @@ -320,6 +322,10 @@ basic.selectAll(); } + public void selectLink() { + selectAndGetLink(); + } + public void setBackColor(final String color) { basic.setBackColor(color); } @@ -422,6 +428,16 @@ } } + private org.xwiki.gwt.dom.client.Element selectAndGetLink() { + org.xwiki.gwt.dom.client.Element selectedAnchor = LinkExecutableUtils.getSelectedAnchor(this); + if (selectedAnchor != null) { + Range range = getDocument().createRange(); + range.selectNode(selectedAnchor); + getSelection().addRange(range); + } + return selectedAnchor; + } + private void updateLinkInfo() { presenter.updateLinkInfo(); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -67,7 +67,7 @@ private final DeferredCommandWrapper deferred; private final ActionAddCondition<Object> canBeBasic; private final ActionAddCondition<Object> canBeExtended; - private final Provider<ColorWebSafePalette> palette; + private final Provider<ColorWebSafePalette> paletteProvider; private final Provider<InsertLinkDialog> insertLinkDialog; private final Provider<EditHtmlDialog> editHtmlDialog; private final Provider<InsertImageDialog> insertImageDialog; @@ -81,6 +81,7 @@ private final Provider<InsertSpecialCharDialog> insertSpecialCharDialog; protected Listener<String> insertSpecialCharListener; private final Provider<InsertMediaDialog> insertMediaDialog; + protected ColorWebSafePalette palette; public RTEditorPresenter(final I18nTranslationService i18n, final Session session, final RTEActionTopToolbar topBar, final RTEActionSndToolbar sndBar, final RTEImgResources imgResources, @@ -93,7 +94,7 @@ this.topBar = topBar; this.sndBar = sndBar; this.insertLinkDialog = textEditorInsertElement; - this.palette = palette; + this.paletteProvider = palette; this.editHtmlDialog = editHtmlDialog; this.insertImageDialog = insertImageDialog; this.insertMediaDialog = insertMediaDialog; @@ -186,12 +187,14 @@ } public void onEditorFocus() { - topBar.hideAllMenus(); - sndBar.hideAllMenus(); - palette.get().hide(); + hideMenus(); } public void onLostFocus() { + } + + public void reset() { + hideMenus(); hideLinkCtxMenu(); } @@ -452,6 +455,7 @@ EditHtmlDialog dialog = editHtmlDialog.get(); dialog.setUpdateListener(updateHtmlListener); dialog.show(); + hideLinkCtxMenu(); dialog.setHtml(view.getHTML()); } }); @@ -619,6 +623,7 @@ dialog.reset(); dialog.setOnCreateImage(insertImageListener); dialog.show(); + hideLinkCtxMenu(); } }); } @@ -651,6 +656,7 @@ InsertMediaDialog dialog = insertMediaDialog.get(); dialog.setOnCreate(insertMediaListener); dialog.show(); + hideLinkCtxMenu(); } }); } @@ -659,7 +665,6 @@ insertMedia.setTextDescription(i18n.t("Audio/Video...")); insertMedia.setAddCondition(canBeExtended); insertMedia.setParentMenuTitle(i18n.t(INSERT_MENU)); - ActionToolbarButtonDescriptor<Object> createOrEditLinkBtn = new ActionToolbarButtonDescriptor<Object>( accessRol, sndbarPosition, new Listener0() { public void onEvent() { @@ -681,6 +686,7 @@ dialog.setLinkInfo(linkInfo); dialog.setOnCreateLink(insertLinkListener); dialog.show(); + hideLinkCtxMenu(); String href = linkInfo.getHref(); if (href.length() > 0) { if (href.startsWith("mailto")) { @@ -711,13 +717,23 @@ editLinkCtx.setToolTip(null); editLinkCtx.setShortcut(null); editLinkCtx.setActionPosition(linkCtxPosition); - editLinkCtx.setParentMenuTitle(i18n.t(INSERT_MENU)); ActionToolbarButtonDescriptor<Object> removeLink = new ActionToolbarButtonDescriptor<Object>(accessRol, sndbarPosition, new Listener0() { public void onEvent() { - view.unlink(); - fireOnEdit(); + if (view.isAnythingSelected()) { + // we try to unlink the selection + } else { + // we try to select the complete link + view.selectLink(); + } + deferred.addCommand(new Listener0() { + public void onEvent() { + view.unlink(); + hideLinkCtxMenu(); + fireOnEdit(); + } + }); } }); removeLink.setIconCls(getCssName(imgResources.linkbreak())); @@ -730,7 +746,6 @@ removeLinkCtx.setToolTip(null); removeLinkCtx.setShortcut(null); removeLinkCtx.setActionPosition(linkCtxPosition); - removeLinkCtx.setParentMenuTitle(i18n.t(INSERT_MENU)); final ActionToolbarMenuDescriptor<Object> removeFormat = new ActionToolbarMenuDescriptor<Object>(accessRol, topbarPosition, new Listener0() { @@ -772,6 +787,7 @@ } insertSpecialCharDialog.get().setOnInsertSpecialChar(insertSpecialCharListener); insertSpecialCharDialog.get().show(); + hideLinkCtxMenu(); NotifyUser.hideProgress(); } }); @@ -805,14 +821,16 @@ final ActionToolbarButtonDescriptor<Object> fontColor = new ActionToolbarButtonDescriptor<Object>(accessRol, sndbarPosition, new Listener0() { public void onEvent() { - palette.get().show(getActionLeftPosition(sndBar, insertTableBtn), - getActionTopPosition(sndBar, removeFormatBtn), new Listener<String>() { - public void onEvent(final String color) { - palette.get().hide(); - view.setForeColor(color); - fireOnEdit(); - } - }); + getPalette(); + palette.show(getActionLeftPosition(sndBar, insertTableBtn), getActionTopPosition(sndBar, + removeFormatBtn), new Listener<String>() { + public void onEvent(final String color) { + palette.hide(); + view.setForeColor(color); + fireOnEdit(); + } + }); + hideLinkCtxMenu(); } }); fontColor.setIconCls(getCssName(imgResources.fontcolor())); @@ -822,14 +840,16 @@ ActionToolbarButtonDescriptor<Object> backgroundColor = new ActionToolbarButtonDescriptor<Object>(accessRol, sndbarPosition, new Listener0() { public void onEvent() { - palette.get().show(getActionLeftPosition(sndBar, fontColor), - getActionTopPosition(sndBar, fontColor), new Listener<String>() { + getPalette(); + palette.show(getActionLeftPosition(sndBar, fontColor), getActionTopPosition(sndBar, fontColor), + new Listener<String>() { public void onEvent(final String color) { - palette.get().hide(); + palette.hide(); view.setBackColor(color); fireOnEdit(); } }); + hideLinkCtxMenu(); } }); backgroundColor.setIconCls(getCssName(imgResources.backcolor())); @@ -904,8 +924,8 @@ actions.add(withNoItem(fontColor)); actions.add(withNoItem(backgroundColor)); + view.addCtxAction(withNoItem(removeLinkCtx)); view.addCtxAction(withNoItem(editLinkCtx)); - view.addCtxAction(withNoItem(removeLinkCtx)); } private ActionToolbarMenuDescriptor<Object> createFontNameAction(final ActionAddCondition<Object> canBeBasic, @@ -954,12 +974,26 @@ return RTEImgResources.SUFFIX + imageResource.getName(); } + private void getPalette() { + if (palette == null) { + palette = paletteProvider.get(); + } + } + private void hideLinkCtxMenu() { if (view.isCtxMenuVisible()) { view.hideLinkCtxMenu(); } } + private void hideMenus() { + topBar.hideAllMenus(); + sndBar.hideAllMenus(); + if (palette != null) { + palette.hide(); + } + } + private boolean isExtended() { return extended && view.canBeExtended(); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorView.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorView.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -96,6 +96,8 @@ void selectAll(); + void selectLink(); + void setBackColor(String color); void setFocus(boolean focus); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -39,9 +39,9 @@ ActionToolbarButtonDescriptor<Object> saveBtn; private RTESavingEditorView view; - public RTESavingEditorPresenter(RTEditor editor, final boolean autoSave, final I18nTranslationService i18n, - StateManager stateManager, DeferredCommandWrapper deferredCommandWrapper, - RTEImgResources imgResources, TimerWrapper timer) { + public RTESavingEditorPresenter(final RTEditor editor, final boolean autoSave, final I18nTranslationService i18n, + final StateManager stateManager, final DeferredCommandWrapper deferredCommandWrapper, + final RTEImgResources imgResources, final TimerWrapper timer) { this.editor = editor; this.autoSave = autoSave; this.i18n = i18n; @@ -70,7 +70,7 @@ }; } - public void edit(String html, Listener<String> onSave, Listener0 onEditCancelled) { + public void edit(final String html, final Listener<String> onSave, final Listener0 onEditCancelled) { this.onSave = onSave; this.onEditCancelled = onEditCancelled; editor.setHtml(html); @@ -87,7 +87,7 @@ return beforeStateChangeListener; } - public void init(RTESavingEditorView view) { + public void init(final RTESavingEditorView view) { this.view = view; } @@ -214,7 +214,7 @@ ActionToolbarMenuDescriptor<Object> close = new ActionToolbarMenuDescriptor<Object>(AccessRolDTO.Editor, RTEditor.topbarPosition, new Listener<Object>() { - public void onEvent(Object parameter) { + public void onEvent(final Object parameter) { onCancel(); } }); @@ -252,7 +252,7 @@ editor.addAction(saveCloseBtn); } - private void enableSaveBtn(boolean enable) { + private void enableSaveBtn(final boolean enable) { editor.getSndBar().setButtonEnable(saveBtn, enable); } @@ -265,5 +265,6 @@ savePending = false; saveAndCloseConfirmed = false; enableSaveBtn(false); + editor.reset(); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -108,6 +108,9 @@ @Basic(optional = false) private final Long createdOn; + @Basic + private Long lastLogin; + public User() { this(null, null, null, null, null, null, null); } @@ -125,6 +128,7 @@ customProperties = new CustomProperties(); buddiesVisibility = UserBuddiesVisibility.anyone; this.createdOn = System.currentTimeMillis(); + this.setLastLogin(null); } @Finder(query = "from User") @@ -174,6 +178,10 @@ return language; } + public Long getLastLogin() { + return lastLogin; + } + public String getName() { return name; } @@ -224,6 +232,10 @@ this.language = language; } + public void setLastLogin(final Long lastLogin) { + this.lastLogin = lastLogin; + } + public void setName(final String name) { this.name = name; } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -34,6 +34,7 @@ import org.ourproject.kune.chat.server.managers.ChatConnection; import org.ourproject.kune.chat.server.managers.XmppManager; import org.ourproject.kune.platf.client.errors.I18nNotFoundException; +import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.server.domain.I18nCountry; import org.ourproject.kune.platf.server.domain.I18nLanguage; import org.ourproject.kune.platf.server.domain.User; @@ -54,17 +55,19 @@ private final I18nLanguageManager languageManager; private final XmppManager xmppManager; private final ChatProperties properties; + private final I18nTranslationService i18n; @Inject public UserManagerDefault(final Provider<EntityManager> provider, final User finder, final I18nLanguageManager languageManager, final I18nCountryManager countryManager, - final XmppManager xmppManager, ChatProperties properties) { + final XmppManager xmppManager, final ChatProperties properties, final I18nTranslationService i18n) { super(provider, User.class); this.finder = finder; this.languageManager = languageManager; this.countryManager = countryManager; this.xmppManager = xmppManager; this.properties = properties; + this.i18n = i18n; } public User createUser(final String shortName, final String longName, final String email, final String passwd, @@ -85,7 +88,7 @@ return userId != null ? super.find(userId) : User.UNKNOWN_USER; } - public User findByShortname(String shortName) { + public User findByShortname(final String shortName) { return finder.getByShortName(shortName); } @@ -143,6 +146,15 @@ } } if (user.getPassword().equals(passwd)) { + if (user.getLastLogin() == null) { + xmppManager.sendMessage( + user.getShortName(), + i18n.t("This is the chat window. \n" + + "\n" + + "Here you can communicate with other users of this site but also with other users with compatible accounts (like gmail accounts). \n" + + "\n" + "Just add some buddie and start to chat.")); + } + user.setLastLogin(System.currentTimeMillis()); return user; } else { return null; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/properties/ChatProperties.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/properties/ChatProperties.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/platf/server/properties/ChatProperties.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -34,16 +34,23 @@ this.properties = properties; } - public String getHttpBase() { - return properties.get(KuneProperties.CHAT_HTTP_BASE); + public String getAdminJID() { + return properties.get(KuneProperties.SITE_ADMIN_SHORTNAME); } + public String getAdminPasswd() { + return properties.get(KuneProperties.SITE_ADMIN_PASSWD); + } + public String getDomain() { return properties.get(KuneProperties.CHAT_DOMAIN); } + public String getHttpBase() { + return properties.get(KuneProperties.CHAT_HTTP_BASE); + } + public String getRoomHost() { return properties.get(KuneProperties.CHAT_ROOM_HOST); } - } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/properties/DatabaseProperties.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/properties/DatabaseProperties.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/platf/server/properties/DatabaseProperties.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -34,31 +34,31 @@ this.properties = properties; } - public String getDefaultSiteShortName() { - return properties.get("kune.default.site.shortName"); + public String getAdminEmail() { + return properties.get(KuneProperties.SITE_ADMIN_EMAIL); } - public String getDefaultSiteName() { - return properties.get("kune.default.site.name"); + public String getAdminPassword() { + return properties.get(KuneProperties.SITE_ADMIN_PASSWD); } - public String getAdminUserName() { - return properties.get("kune.admin.name"); + public String getAdminShortName() { + return properties.get(KuneProperties.SITE_ADMIN_SHORTNAME); } - public String getAdminShortName() { - return properties.get("kune.admin.shortName"); + public String getAdminUserName() { + return properties.get(KuneProperties.SITE_ADMIN_NAME); } - public String getAdminEmail() { - return properties.get("kune.admin.email"); + public String getDefaultLicense() { + return properties.get(KuneProperties.SITE_DEF_LICENSE); } - public String getAdminPassword() { - return properties.get("kune.admin.password"); + public String getDefaultSiteName() { + return properties.get(KuneProperties.SITE_NAME); } - public String getDefaultLicense() { - return properties.get("kune.default.license"); + public String getDefaultSiteShortName() { + return properties.get(KuneProperties.SITE_SHORTNAME); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -22,6 +22,14 @@ public interface KuneProperties { String SITE_URL = "kune.siteurl"; String SITE_DOMAIN = "kune.site.domain"; + String SITE_NAME = "kune.default.site.name"; + String SITE_SHORTNAME = "kune.default.site.shortName"; + String SITE_DEF_LICENSE = "kune.default.license"; + + String SITE_ADMIN_NAME = "kune.admin.name"; + String SITE_ADMIN_SHORTNAME = "kune.admin.shortName"; + String SITE_ADMIN_EMAIL = "kune.admin.email"; + String SITE_ADMIN_PASSWD = "kune.admin.password"; String DEFAULT_SITE_SHORT_NAME = "kune.default.site.shortName"; String CURRENT_CC_VERSION = "kune.currentccversion"; String CHAT_HTTP_BASE = "kune.chat.httpbase"; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -75,18 +75,18 @@ } @Transactional(type = TransactionType.READ_WRITE, rollbackOn = DefaultException.class) - public UserInfoDTO createUser(final UserDTO userDTO, boolean wantPersonalHomepage) throws DefaultException { + public UserInfoDTO createUser(final UserDTO userDTO, final boolean wantPersonalHomepage) throws DefaultException { final User user = userManager.createUser(userDTO.getShortName(), userDTO.getName(), userDTO.getEmail(), userDTO.getPassword(), userDTO.getLanguage().getCode(), userDTO.getCountry().getCode(), userDTO.getTimezone().getId()); groupManager.createUserGroup(user, wantPersonalHomepage); - return loginUser(user); + return login(userDTO.getShortName(), userDTO.getPassword()); } @Authenticated @Transactional(type = TransactionType.READ_ONLY) @Authorizated(accessRolRequired = AccessRol.Administrator, actionLevel = ActionLevel.group) - public String getUserAvatarBaser64(final String userHash, StateToken userToken) throws DefaultException { + public String getUserAvatarBaser64(final String userHash, final StateToken userToken) throws DefaultException { final UserSession userSession = getUserSession(); final User user = userSession.getUser(); Group userGroup = user.getUserGroup(); @@ -133,7 +133,8 @@ @Authenticated(mandatory = true) @Authorizated(accessRolRequired = AccessRol.Administrator, actionLevel = ActionLevel.group) @Transactional(type = TransactionType.READ_WRITE) - public void setBuddiesVisibility(final String userHash, StateToken groupToken, UserBuddiesVisibilityDTO visibility) { + public void setBuddiesVisibility(final String userHash, final StateToken groupToken, + final UserBuddiesVisibilityDTO visibility) { final UserSession userSession = getUserSession(); final User user = userSession.getUser(); if (groupToken.getGroup() != user.getShortName()) { Modified: trunk/src/test/java/org/ourproject/kune/chat/server/managers/XmppManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/chat/server/managers/XmppManagerTest.java 2009-05-07 20:31:39 UTC (rev 1108) +++ trunk/src/test/java/org/ourproject/kune/chat/server/managers/XmppManagerTest.java 2009-05-11 20:23:46 UTC (rev 1109) @@ -13,9 +13,7 @@ import com.google.inject.Inject; public class XmppManagerTest { - public static class OutputListener implements RoomListener { - Log log = LogFactory.getLog(OutputListener.class); private final String name; private int hits; @@ -36,6 +34,8 @@ } + static Log log = LogFactory.getLog(XmppManagerTest.class); + @Inject XmppManager manager; @@ -81,6 +81,11 @@ assertNotNull(manager.getRoster(handler)); } + @Test + public void testSendMessage() { + manager.sendMessage("admin", "test message"); + } + @Test(expected = ChatException.class) public void testUserDontExist() { manager.login("user", "passowrd", "test");

1 0

r1108 - in trunk: . src/main/java/org/ourproject/kune/platf/server/domain src/main/java/org/ourproject/kune/workspace/client/entityheader src/main/java/org/ourproject/kune/workspace/client/skel
by vjrj 07 May '09

07 May '09

Author: vjrj Date: 2009-05-07 22:31:39 +0200 (Thu, 07 May 2009) New Revision: 1108 Modified: trunk/pom.xml trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java Log: Complete - task Languages are not sorted by lang name Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-05-07 15:41:11 UTC (rev 1107) +++ trunk/pom.xml 2009-05-07 20:31:39 UTC (rev 1108) @@ -447,7 +447,7 @@ <version>2.0-beta26</version> <configuration> <logLevel>INFO</logLevel> - <style>PRETTY</style> + <style>OBF</style>  <runTarget> org.ourproject.kune.app.Kune/Kune.html Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java 2009-05-07 15:41:11 UTC (rev 1107) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java 2009-05-07 20:31:39 UTC (rev 1108) @@ -152,7 +152,7 @@ return null; } - @Finder(query = "FROM I18nLanguage") + @Finder(query = "FROM I18nLanguage ORDER BY englishName") public List<I18nLanguage> getAll() { return null; } @@ -234,11 +234,11 @@ this.code = code; } - public void setDateFormat(String dateFormat) { + public void setDateFormat(final String dateFormat) { this.dateFormat = dateFormat; } - public void setDateFormatShort(String dateFormatShort) { + public void setDateFormatShort(final String dateFormatShort) { this.dateFormatShort = dateFormatShort; } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2009-05-07 15:41:11 UTC (rev 1107) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2009-05-07 20:31:39 UTC (rev 1108) @@ -45,9 +45,11 @@ public EntityHeaderPanel(final WorkspaceSkeleton ws, final Provider<FileDownloadUtils> downloadProvider, final Images images) { + super.setWidth("100%"); this.downloadProvider = downloadProvider; this.images = images; vp = new VerticalPanel(); + vp.setWidth("100%"); vp.setHorizontalAlignment(ALIGN_RIGHT); entityTextLogo = new EntityTextLogo(); add(entityTextLogo); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2009-05-07 15:41:11 UTC (rev 1107) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2009-05-07 20:31:39 UTC (rev 1108) @@ -93,12 +93,12 @@ // }, "Bla, bla, bla")); panel.addListener(new ContainerListenerAdapter() { @Override - public void onHide(Component component) { + public void onHide(final Component component) { openFirstIfActiveNotVisible(); } @Override - public void onShow(Component component) { + public void onShow(final Component component) { openFirstIfActiveNotVisible(); } @@ -156,12 +156,12 @@ return trayBar; } - public void setMaximized(boolean maximized) { + public void setMaximized(final boolean maximized) { entitySummary.setVisible(!maximized); if (maximized) { - mainFitPanel.collapse(); + mainFitPanel.collapse(true); } else { - mainFitPanel.expand(); + mainFitPanel.expand(true); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java 2009-05-07 15:41:11 UTC (rev 1107) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java 2009-05-07 20:31:39 UTC (rev 1108) @@ -155,7 +155,7 @@ context.addListener(listener); } - public void addListener(ContainerListenerAdapter containerListenerAdapter) { + public void addListener(final ContainerListenerAdapter containerListenerAdapter) { cntCtxBorderLayout.addListener(containerListenerAdapter); } @@ -221,11 +221,11 @@ setPanel(context, widget); } - public void setMaximized(boolean maximized) { + public void setMaximized(final boolean maximized) { if (maximized) { - contextWrap.collapse(); + contextWrap.collapse(true); } else { - contextWrap.expand(); + contextWrap.expand(true); } } @@ -248,7 +248,7 @@ context.addStyleName("k-entity-context-" + newTheme); } - private void setPanel(Panel panel, Widget widget) { + private void setPanel(final Panel panel, final Widget widget) { panel.clear(); panel.add(widget); if (panel.isRendered()) {

1 0

r1107 - in trunk: . src/main/java/org/ourproject/kune/platf/public src/main/java/org/ourproject/kune/workspace/client/entityheader src/main/java/org/ourproject/kune/workspace/client/options src/main/java/org/ourproject/kune/workspace/client/options/tools src/main/java/org/ourproject/kune/workspace/client/signin src/main/java/org/ourproject/kune/workspace/client/themes
by vjrj 07 May '09

07 May '09

Author: vjrj Date: 2009-05-07 17:41:11 +0200 (Thu, 07 May 2009) New Revision: 1107 Added: trunk/src/main/java/org/ourproject/kune/platf/public/ext-load.gif Modified: trunk/CREDITS trunk/DEV-GUIDE trunk/TODO trunk/pom.xml trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderButton.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java Log: Complete - task Group/user options hide bug Modified: trunk/CREDITS =================================================================== --- trunk/CREDITS 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/CREDITS 2009-05-07 15:41:11 UTC (rev 1107) @@ -11,12 +11,13 @@ Contributors -------------------------------------------------------------------------------- +* Thanks to David Trigo and http://www.esperanto-es.net/ for suggest the name of +'kune' for our initiative: + http://ourproject.org/forum/forum.php?thread_id=500&forum_id=469 * Antonio Martins, Jéferson Assumção, Moacir Gadotti and the Instituto Paulo Freire staff. * Daniel Jiménez for the initial help and coordination * Javier de la Cueva and Leovigildo García-Bobadilla for the legal support * Jonathan Araña Cruz, Roxu and all the xsto staff for help with the infraestructure -* Thanks to David Trigo and http://www.esperanto-es.net/ for suggest the name of -'kune' for our initiative: - http://ourproject.org/forum/forum.php?thread_id=500&forum_id=469 +* Johnattan Rupire for web contributions. * and ourproject.org and again xsto.info for sharing with us their resources Modified: trunk/DEV-GUIDE =================================================================== --- trunk/DEV-GUIDE 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/DEV-GUIDE 2009-05-07 15:41:11 UTC (rev 1107) @@ -181,7 +181,7 @@ mvn com.totsp.gwt:maven-googlewebtoolkit2-plugin:gwt -Also, you can generate a hosted mode launch configuration in eclipse. We have a "Run configuration" (Run > Open Run Dialog) in eclipse with Project: "org.ourproject.kune" with Main class: "com.google.gwt.dev.GWTShell", with this program arguments (or similar): "-noserver -out gwt-out /kune/?locale=en&log_level=INFO -port 8080" and in the "Classpath User Entries": +Also, you can generate a hosted mode launch configuration in eclipse. We have a "Run configuration" (Run > Open Run Dialog) in eclipse with Project: "org.ourproject.kune" with Main class: "com.google.gwt.dev.GWTShell", with this program arguments (or similar): "-noserver -out gwt-out /ws/?locale=en&log_level=INFO -port 8080" and in the "Classpath User Entries": * gwt-dev-[linux|mac|windows].jar (Add External Jar and choose it from your gwt installation directory) * java - /kune/src/main * kune (default classpath) Modified: trunk/TODO =================================================================== --- trunk/TODO 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/TODO 2009-05-07 15:41:11 UTC (rev 1107) @@ -119,6 +119,7 @@ ** vjrj <v> IconHyperlink.java and IconLabel.java to gwt1.5 * MID-TERM +** TODO <v> Use of command key ⌘ for Mac shortcuts ** TODO <v,s> harden our privacy policy. Goals: - permit user/projects/contents how much private or public are - APIs public only to associated sites (in study) ( http://oauth.net ? ) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/pom.xml 2009-05-07 15:41:11 UTC (rev 1107) @@ -447,7 +447,7 @@ <version>2.0-beta26</version> <configuration> <logLevel>INFO</logLevel> - <style>OBF</style> + <style>PRETTY</style>  <runTarget> org.ourproject.kune.app.Kune/Kune.html Added: trunk/src/main/java/org/ourproject/kune/platf/public/ext-load.gif =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/ext-load.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderButton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderButton.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderButton.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -6,12 +6,12 @@ import com.google.gwt.user.client.ui.AbstractImagePrototype; public class EntityHeaderButton extends IconLabel implements View { - public EntityHeaderButton(AbstractImagePrototype icon, String text) { + public EntityHeaderButton(final AbstractImagePrototype icon, final String text) { super(icon, text, false); setDefStyle(); } - public EntityHeaderButton(String text, AbstractImagePrototype icon) { + public EntityHeaderButton(final String text, final AbstractImagePrototype icon) { super(text, icon, false); setDefStyle(); } @@ -19,6 +19,7 @@ private void setDefStyle() { addStyleName("kune-Margin-Medium-t"); addStyleName("kune-pointer"); + addStyleName("kune-floatright"); } } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -44,12 +44,10 @@ private final VerticalPanel vp; public EntityHeaderPanel(final WorkspaceSkeleton ws, final Provider<FileDownloadUtils> downloadProvider, - Images images) { + final Images images) { this.downloadProvider = downloadProvider; this.images = images; vp = new VerticalPanel(); - vp.setWidth("100%"); - super.setWidth("100%"); vp.setHorizontalAlignment(ALIGN_RIGHT); entityTextLogo = new EntityTextLogo(); add(entityTextLogo); @@ -57,13 +55,12 @@ ws.addToEntityMainHeader(this); } - public void addWidget(View view) { + public void addWidget(final View view) { Widget widget = (Widget) view; vp.add(widget); - vp.setCellWidth(widget, "100%"); } - public void reloadImage(GroupDTO group) { + public void reloadImage(final GroupDTO group) { entityTextLogo.setLogoImage(downloadProvider.get().getLogoImageUrl(group.getStateToken()) + "&nocache=" + new Date().getTime()); } @@ -87,11 +84,11 @@ entityTextLogo.setLargeFont(); } - public void setLogoImage(StateToken stateToken) { + public void setLogoImage(final StateToken stateToken) { entityTextLogo.setLogoImage(downloadProvider.get().getLogoImageUrl(stateToken)); } - public void setLogoImageVisible(boolean visible) { + public void setLogoImageVisible(final boolean visible) { entityTextLogo.setLogoVisible(visible); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -32,7 +32,7 @@ public class EntityOptionsPanel extends AbstractTabbedDialogPanel implements EntityOptionsView { - public static final String ENTITY_OP_PANEL_ID = "k-eop-diag"; + public static final String ENTITY_OP_PANEL_ID = "k-eop-diagpan"; public static final String GROUP_OPTIONS_ERROR_ID = "k-eop-err-mess"; public static final String GROUP_OPTIONS_ICON = "k-eop-icon"; private final I18nTranslationService i18n; @@ -43,7 +43,7 @@ private final EntityOptionsGroup entityPreferencesGroup; public EntityOptionsPanel(final EntityOptions presenter, final EntityHeader entityHeader, - I18nTranslationService i18n, Images images, EntityOptionsGroup entityOptionsGroup) { + final I18nTranslationService i18n, final Images images, final EntityOptionsGroup entityOptionsGroup) { super(ENTITY_OP_PANEL_ID, "", 400, HEIGHT + 80, 400, HEIGHT + 80, false, images, GROUP_OPTIONS_ERROR_ID); this.entityHeader = entityHeader; this.i18n = i18n; @@ -60,7 +60,7 @@ super.createAndShow(); } - public void setButtonVisible(boolean visible) { + public void setButtonVisible(final boolean visible) { optionsButton.setVisible(visible); } @@ -77,7 +77,7 @@ private void createOptionsButton() { optionsButton = new EntityHeaderButton("", images.emblemSystem()); optionsButton.addClickListener(new ClickListener() { - public void onClick(Widget arg0) { + public void onClick(final Widget arg0) { createAndShow(); } }); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPresenter.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPresenter.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -41,7 +41,7 @@ view.setButtonVisible(true); } else { view.setButtonVisible(false); - view.destroy(); + view.hide(); } } }); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -19,10 +19,9 @@ */ package org.ourproject.kune.workspace.client.options; -import org.ourproject.kune.platf.client.View; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogView; -public interface EntityOptionsView extends View, AbstractTabbedDialogView { +public interface EntityOptionsView extends AbstractTabbedDialogView { int HEIGHT = 270; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -45,15 +45,16 @@ private final I18nTranslationService i18n; private final StateManager stateManager; - public EntityOptionsToolsConfPresenter(StateManager stateManager, Session session, I18nTranslationService i18n, - EntityOptions entityOptions, Provider<GroupServiceAsync> groupServiceProvider) { + public EntityOptionsToolsConfPresenter(final StateManager stateManager, final Session session, + final I18nTranslationService i18n, final EntityOptions entityOptions, + final Provider<GroupServiceAsync> groupServiceProvider) { this.stateManager = stateManager; this.session = session; this.i18n = i18n; this.entityOptions = entityOptions; this.groupServiceProvider = groupServiceProvider; stateManager.onGroupChanged(new Listener2<String, String>() { - public void onEvent(String group1, String group2) { + public void onEvent(final String group1, final String group2) { setState(); } }); @@ -63,13 +64,13 @@ return view; } - public void init(EntityOptionsToolsConfView view) { + public void init(final EntityOptionsToolsConfView view) { this.view = view; setState(); entityOptions.addTab(view); } - public void onCheck(ToolSimpleDTO tool, boolean checked) { + public void onCheck(final ToolSimpleDTO tool, final boolean checked) { StateAbstractDTO state = session.getCurrentState(); String toolName = tool.getName(); if (checked) { @@ -126,12 +127,12 @@ private void setToolCheckedInServer(final boolean checked, final String toolName) { groupServiceProvider.get().setToolEnabled(session.getUserHash(), session.getCurrentStateToken(), toolName, checked, new AsyncCallback<Object>() { - public void onFailure(Throwable caught) { + public void onFailure(final Throwable caught) { view.setChecked(toolName, !checked); entityOptions.setErrorMessage(i18n.t("Error configuring the tool"), Level.error); } - public void onSuccess(Object result) { + public void onSuccess(final Object result) { stateManager.reload(); } }); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -217,7 +217,7 @@ add(timezoneCombo); final FieldSet personalSpaceFieldSet = new FieldSet(i18n.t("Do you want a personal homepage?")); - personalSpaceFieldSet.setWidth(DEF_FIELD_WIDTH + DEF_FIELD_LABEL_WITH); + personalSpaceFieldSet.setWidth(DEF_FIELD_WIDTH + DEF_FIELD_LABEL_WITH + 65); wantPersonalHomePage = new Radio(); wantPersonalHomePage.setTabIndex(9); noPersonalHomePage = new Radio(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -47,9 +47,9 @@ public static final String WELCOME_DIALOG = "k-regp-wdiag"; public static final String REGISTER_DIALOG = "k-regp-dialog"; - public RegisterPanel(final RegisterPresenter presenter, I18nTranslationService i18n, final WorkspaceSkeleton ws, - Session session, Images images) { - super(REGISTER_DIALOG, i18n, i18n.t(PlatfMessages.REGISTER_TITLE), true, true, 390, 450, "", + public RegisterPanel(final RegisterPresenter presenter, final I18nTranslationService i18n, + final WorkspaceSkeleton ws, final Session session, final Images images) { + super(REGISTER_DIALOG, i18n, i18n.t(PlatfMessages.REGISTER_TITLE), true, true, 400, 420, "", i18n.t(PlatfMessages.REGISTER_TITLE), REGISTER_BUTTON_ID, i18n.tWithNT("Cancel", "used in button"), CANCEL_BUTTON_ID, new Listener0() { public void onEvent() { @@ -65,17 +65,17 @@ }, images, ERRMSG, 11); super.addListener(new WindowListenerAdapter() { @Override - public void onActivate(Panel panel) { + public void onActivate(final Panel panel) { KuneUiUtils.focusOnField(registerForm.getShortNameField()); } @Override - public void onHide(Component component) { + public void onHide(final Component component) { presenter.onClose(); } @Override - public void onShow(Component component) { + public void onShow(final Component component) { KuneUiUtils.focusOnField(registerForm.getShortNameField()); } }); @@ -83,7 +83,7 @@ Panel panel = new Panel(); panel.setBorder(false); registerForm = new RegisterForm(i18n, session); - registerForm.setWidth(360); + registerForm.setWidth(370); panel.add(registerForm.getFormPanel()); add(panel); panel.setId(REGISTER_FORM); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -70,10 +70,4 @@ }); } } - - @Override - public void setVisible(final boolean visible) { - super.setVisible(visible); - } - } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -90,11 +90,6 @@ private void setState(final StateAbstractDTO state) { setTheme(new WsTheme(state.getGroup().getWorkspaceTheme())); - if (state.getGroupRights().isAdministrable()) { - view.setVisible(true); - } else { - view.setVisible(false); - } } private void setTheme(final WsTheme newTheme) {

1 0

03 May '09

Author: vjrj Date: 2009-05-03 17:08:43 +0200 (Sun, 03 May 2009) New Revision: 1106 Added: trunk/img/kune-logo-alpha60.png trunk/script/css-compact-and-tidy.sh trunk/src/main/java/org/ourproject/kune/platf/client/services/SearcherConstants.java Removed: trunk/script/css-compact-and-tidy.css trunk/src/main/java/org/ourproject/kune/platf/client/ui/form/FileUploadFormSample.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherConstants.java Modified: trunk/COPYRIGHT trunk/img/kune-logos.svg trunk/pom.xml trunk/script/copy_deploy.sh trunk/script/css-update.sh trunk/script/demo-deploy.sh trunk/script/deploy_gwt.sh trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java trunk/src/main/webapp/WEB-INF/web.xml Log: Incomplete - task Insert Media dialog Incomplete - task Group/user options hide bug Incomplete - task /kune/ renamed to /ws/ Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/COPYRIGHT 2009-05-03 15:08:43 UTC (rev 1106) @@ -120,6 +120,11 @@ http://www.flumotion.net/cortado/ Copyright: (C) 2004 Fluendo S.L under GNU General Public License +video embed dialog: + Some ideas and embeded video code from: + http://www.jovelstefan.de/embedded-video/ (GPL) + http://www.daburna.de/blog/2006/12/13/wordpress-video-plugin/ + some license description: from Wikipedia Copyright: under GFDL http://www.gnu.org/copyleft/fdl.html Added: trunk/img/kune-logo-alpha60.png =================================================================== (Binary files differ) Property changes on: trunk/img/kune-logo-alpha60.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/img/kune-logos.svg =================================================================== --- trunk/img/kune-logos.svg 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/img/kune-logos.svg 2009-05-03 15:08:43 UTC (rev 1106) @@ -87,14 +87,14 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="342.68538" - inkscape:cy="391.54295" + inkscape:cx="521.44602" + inkscape:cy="133.64281" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="1280" - inkscape:window-height="1001" - inkscape:window-x="1280" - inkscape:window-y="0" + inkscape:window-height="729" + inkscape:window-x="0" + inkscape:window-y="25" showguides="true" inkscape:guide-bbox="true" inkscape:guide-points="true" @@ -823,5 +823,186 @@ x="620.35358" y="936.12231" id="tspan2733">content sharing & free culture</tspan></text> + <g + id="g2607" + transform="matrix(0.548749,0,0,0.548749,378.52305,746.57538)"> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-without-text.png" + transform="matrix(0.8405688,0,0,0.8394991,295.36384,-621.12129)" + id="g2531"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2533" + d="M 60.321717,411.99998 L 437.33633,411.99998" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2535" + d="M 252.61203,788.60332 L 252.61203,411.59154" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2537" + d="M 252.86937,597.15755 L 629.88177,597.15755" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2539" + d="M 437.45588,596.97447 L 437.45588,219.95956" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2541" + d="M 372.87905,411.27704 L 437.81346,411.27704" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + </g> + <text + transform="matrix(0.9080422,0.4188786,-0.4188786,0.9080422,0,0)" + sodipodi:linespacing="125%" + id="text2549" + y="36.545521" + x="426.55963" + style="font-size:16.88012505px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" + xml:space="preserve"><tspan + y="36.545521" + x="426.55963" + id="tspan2553" + sodipodi:role="line"><tspan + id="tspan2557" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#808080;fill-opacity:1;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Serif">α</tspan><tspan + id="tspan2555" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#808080;fill-opacity:1;font-family:Emblem;-inkscape-font-specification:Emblem">lpha</tspan><tspan + id="tspan2559" + style="font-size:16.88012505px;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke-width:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Sans" /></tspan></text> + </g> + <g + id="g2620"> + <g + inkscape:export-ydpi="44.62801" + inkscape:export-xdpi="44.62801" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-alpha60.png" + transform="matrix(0.8405688,0,0,0.8394991,313.86353,2.43708)" + id="g2561"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2563" + d="M 60.321717,411.99998 L 437.33633,411.99998" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2565" + d="M 252.61203,788.60332 L 252.61203,411.59154" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2567" + d="M 252.86937,597.15755 L 629.88177,597.15755" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2569" + d="M 437.45588,596.97447 L 437.45588,219.95956" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2571" + d="M 372.87905,411.27704 L 437.81346,411.27704" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + </g> + <text + inkscape:export-ydpi="44.62801" + inkscape:export-xdpi="44.62801" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-alpha60.png" + transform="matrix(0.8825152,0.4702838,-0.4702838,0.8825152,0,0)" + sodipodi:linespacing="125%" + id="text2573" + y="532.55298" + x="724.52563" + style="font-size:30.13441849px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" + xml:space="preserve"><tspan + y="532.55298" + x="724.52563" + id="tspan2575" + sodipodi:role="line"><tspan + id="tspan2577" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Serif">α</tspan><tspan + id="tspan2579" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Emblem;-inkscape-font-specification:Emblem">lpha</tspan><tspan + id="tspan2581" + style="font-size:30.13441849px;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke-width:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Sans" /></tspan></text> + </g> + <text + xml:space="preserve" + style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="-181" + y="223.36218" + id="text2583"><tspan + sodipodi:role="line" + id="tspan2585" + x="-181" + y="223.36218" /></text> + <g + id="g2615" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-alpha60.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + transform="translate(-169.81905,-194.32381)"> + <rect + y="1007.8605" + x="829.13959" + height="56.250996" + width="56.250996" + id="rect2613" + style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3.74900579;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <g + inkscape:export-ydpi="44.62801" + inkscape:export-xdpi="44.62801" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-alpha60.png" + transform="matrix(0.2048309,0,0,0.2045702,832.13264,838.40225)" + id="g2559"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2561" + d="M 60.321717,411.99998 L 437.33633,411.99998" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2564" + d="M 252.61203,788.60332 L 252.61203,411.59154" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2566" + d="M 252.86937,597.15755 L 629.88177,597.15755" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2568" + d="M 437.45588,596.97447 L 437.45588,219.95956" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2570" + d="M 372.87905,411.27704 L 437.81346,411.27704" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + </g> + <text + sodipodi:linespacing="125%" + id="text2593" + y="1062.1919" + x="826.17133" + style="font-size:21.96050453px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" + xml:space="preserve"><tspan + y="1062.1919" + x="826.17133" + id="tspan2597" + sodipodi:role="line"><tspan + id="tspan2599" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#4d4d4d;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Serif">α</tspan><tspan + id="tspan2601" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#999999;font-family:Emblem;-inkscape-font-specification:Emblem">lpha</tspan></tspan></text> + </g> </g> </svg> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/pom.xml 2009-05-03 15:08:43 UTC (rev 1106) @@ -227,17 +227,6 @@ <version>1.1.1</version> </dependency> - <dependency> - <groupId>org.cafesip.gwtcomp</groupId> - <artifactId>gwtcomp</artifactId> - <version>0.0.3b</version> - </dependency> - <dependency> - <groupId>org.cafesip.gwtcomp</groupId> - <artifactId>gwtcomp-servlet</artifactId> - <version>0.0.3b</version> - </dependency> -  <dependency> Modified: trunk/script/copy_deploy.sh =================================================================== --- trunk/script/copy_deploy.sh 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/script/copy_deploy.sh 2009-05-03 15:08:43 UTC (rev 1106) @@ -1,6 +1,6 @@ #!/bin/bash -#script/css-compact-and-tidy.css +#script/css-compact-and-tidy.sh script/css-update.sh rm src/main/webapp/gwt/org.ourproject.kune.app.Kune/ -R Deleted: trunk/script/css-compact-and-tidy.css =================================================================== --- trunk/script/css-compact-and-tidy.css 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/script/css-compact-and-tidy.css 2009-05-03 15:08:43 UTC (rev 1106) @@ -1,64 +0,0 @@ -#!/bin/bash -ORIG=src/main/java/org/ourproject/kune/app/public/ -CATTMPFILE=`mktemp -t css.1.XXX` || exit 1 -CSSTMPFILE=`mktemp -t css.2.XXX` || exit 1 -DEST=src/main/java/org/ourproject/kune/app/public/css/all.css -DEST2=src/main/java/org/ourproject/kune/app/public/css/richtext.css - -EXTTMPFILE=$ORIG/js/ext/resources/css/ext-all.css-tmp - -sed 's/x.btn button{border:0 none;background:transparent;font:normal 11px tahoma,verdana,helvetica;/x-btn button{border:0 none;background:transparent;/g' $ORIG/js/ext/resources/css/ext-all.css |\ -sed 's/normal 11px/normal 100\%/g' |\ -sed 's/bold 11px/bold 100\%/g' |\ -sed 's/normal 12px/normal 100\%/g' |\ -sed 's/bold 12px/bold 100\%/g' |\ -sed 's/normal 10px/normal 100\%/g' |\ -sed 's/normal 9px/normal 100\%/g' |\ -sed 's/font-size:11px/font-size:100\%/g' |\ -sed 's/font-size:12px/font-size:100\%/g' |\ -sed 's/ arial,tahoma,helvetica,sans-serif/ arial,sans/g' |\ -sed 's/ tahoma,arial,helvetica,sans-serif/ arial,sans/g' |\ -sed 's/ tahoma,arial,verdana,sans-serif/ arial,sans/g' |\ -sed 's/ tahoma,verdana,helvetica/ arial,sans/g' |\ -sed 's/ tahoma,arial,helvetica/ arial,sans/g' |\ -sed 's/ tahoma,arial,sans-serif/ arial,sans/g' |\ -sed 's/ \"sans serif\",tahoma,verdana,helvetica/ arial,sans/g' |\ -sed 's/ arial,helvetica,tahoma,sans-serif/ arial,sans/g' > $EXTTMPFILE - -CSS='css/reset.css css/fonts-min.css js/ext/resources/css/ext-all.css-tmp js/ext/resources/css/xtheme-gray.css css/kune.css css/workspace.css css/chat.css css/docs.css css/kune-new.css' -CSS2='css/reset.css css/fonts-min.css css/base-min.css css/rte.css' - -function concat { -for i in $* -do - cat $ORIG/$i >> $CATTMPFILE - echo -e "\n" >> $CATTMPFILE -done -} - -function tidy { -ls `which csstidy | cut -d " " -f 1` 2> /dev/null > /dev/null -if [[ $? -eq 0 ]] -then - csstidy $CATTMPFILE \ - --template=highest \ - --optimise_shorthands=2 \ - --preserve_css=true \ - --silent=true \ - $CSSTMPFILE -else - echo Warning: Dependency csstidy, in debian: apt-get install csstidy - cp $CATTMPFILE $CSSTMPFILE -fi -cat $CSSTMPFILE | sed 's/\.\.\/images/\.\.\/js\/ext\/resources\/images/g' > $1 -} - -concat $CSS -tidy $DEST - -echo > $CATTMPFILE - -concat $CSS2 -tidy $DEST2 - -rm $EXTTMPFILE Copied: trunk/script/css-compact-and-tidy.sh (from rev 1078, trunk/script/css-compact-and-tidy.css) =================================================================== --- trunk/script/css-compact-and-tidy.css 2009-03-16 04:13:36 UTC (rev 1078) +++ trunk/script/css-compact-and-tidy.sh 2009-05-03 15:08:43 UTC (rev 1106) @@ -0,0 +1,64 @@ +#!/bin/bash +ORIG=src/main/java/org/ourproject/kune/app/public/ +CATTMPFILE=`mktemp -t css.1.XXX` || exit 1 +CSSTMPFILE=`mktemp -t css.2.XXX` || exit 1 +DEST=src/main/java/org/ourproject/kune/app/public/css/all.css +DEST2=src/main/java/org/ourproject/kune/app/public/css/richtext.css + +EXTTMPFILE=$ORIG/js/ext/resources/css/ext-all.css-tmp + +sed 's/x.btn button{border:0 none;background:transparent;font:normal 11px tahoma,verdana,helvetica;/x-btn button{border:0 none;background:transparent;/g' $ORIG/js/ext/resources/css/ext-all.css |\ +sed 's/normal 11px/normal 100\%/g' |\ +sed 's/bold 11px/bold 100\%/g' |\ +sed 's/normal 12px/normal 100\%/g' |\ +sed 's/bold 12px/bold 100\%/g' |\ +sed 's/normal 10px/normal 100\%/g' |\ +sed 's/normal 9px/normal 100\%/g' |\ +sed 's/font-size:11px/font-size:100\%/g' |\ +sed 's/font-size:12px/font-size:100\%/g' |\ +sed 's/ arial,tahoma,helvetica,sans-serif/ arial,sans/g' |\ +sed 's/ tahoma,arial,helvetica,sans-serif/ arial,sans/g' |\ +sed 's/ tahoma,arial,verdana,sans-serif/ arial,sans/g' |\ +sed 's/ tahoma,verdana,helvetica/ arial,sans/g' |\ +sed 's/ tahoma,arial,helvetica/ arial,sans/g' |\ +sed 's/ tahoma,arial,sans-serif/ arial,sans/g' |\ +sed 's/ \"sans serif\",tahoma,verdana,helvetica/ arial,sans/g' |\ +sed 's/ arial,helvetica,tahoma,sans-serif/ arial,sans/g' > $EXTTMPFILE + +CSS='css/reset.css css/fonts-min.css js/ext/resources/css/ext-all.css-tmp js/ext/resources/css/xtheme-gray.css css/kune.css css/workspace.css css/chat.css css/docs.css css/kune-new.css' +CSS2='css/reset.css css/fonts-min.css css/base-min.css css/rte.css' + +function concat { +for i in $* +do + cat $ORIG/$i >> $CATTMPFILE + echo -e "\n" >> $CATTMPFILE +done +} + +function tidy { +which csstidy 2> /dev/null > /dev/null +if [[ $? -eq 0 ]] +then + csstidy $CATTMPFILE \ + --template=highest \ + --optimise_shorthands=2 \ + --preserve_css=true \ + --silent=true \ + $CSSTMPFILE +else + echo Warning: Dependency csstidy, in debian: apt-get install csstidy + cp $CATTMPFILE $CSSTMPFILE +fi +cat $CSSTMPFILE | sed 's/\.\.\/images/\.\.\/js\/ext\/resources\/images/g' > $1 +} + +concat $CSS +tidy $DEST + +echo > $CATTMPFILE + +concat $CSS2 +tidy $DEST2 + +rm $EXTTMPFILE Property changes on: trunk/script/css-compact-and-tidy.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:mergeinfo + Modified: trunk/script/css-update.sh =================================================================== --- trunk/script/css-update.sh 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/script/css-update.sh 2009-05-03 15:08:43 UTC (rev 1106) @@ -3,7 +3,7 @@ WEBAPP=src/main/webapp/gwt/org.ourproject.kune.app.Kune TARGET=target/kune-0.0.5/org.ourproject.kune.app.Kune -#$PWD/script/css-compact-and-tidy.css +#$PWD/script/css-compact-and-tidy.sh rsync -aC $APPPUB/Kune.html $WEBAPP/Kune.html rsync -aC $APPPUB/js/ $WEBAPP/js Modified: trunk/script/demo-deploy.sh =================================================================== --- trunk/script/demo-deploy.sh 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/script/demo-deploy.sh 2009-05-03 15:08:43 UTC (rev 1106) @@ -1,22 +1,4 @@ #!/bin/bash -PARAM=$# -USER=$1 -DEST=$2 -if [ $PARAM -gt 0 ] -then - EXTRA=$USER@ -fi -if [ $PARAM -gt 1 ] -then - EXTRADEST=$DEST/ -fi - -ORIG=target/kune-0.0.5/org.ourproject.kune.app.Kune/ -DEST=/mnt/kunedev/var/lib/kune/www - -chmod -R g+rw $ORIG # from time to time use --delete -rsync --progress -C -r -p $ORIG ${EXTRA}ourproject.org:$DEST/$EXTRADEST - -ssh ${EXTRA}ourproject.org "chgrp -R kune $DEST" +rsync --delete --progress -C -r -p target/kune-0.0.5/org.ourproject.kune.app.Kune/ [email protected]:/home/ourproject/kunedemo/src/main/webapp/gwt/org.ourproject.kune.app.Kune/ Modified: trunk/script/deploy_gwt.sh =================================================================== --- trunk/script/deploy_gwt.sh 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/script/deploy_gwt.sh 2009-05-03 15:08:43 UTC (rev 1106) @@ -4,7 +4,7 @@ find target/kune-0.0.5/org.ourproject.kune.app.Kune/ -name .DS_Store -exec rm {} \; -script/css-compact-and-tidy.css +script/css-compact-and-tidy.sh script/css-update.sh cp target/kune-0.0.5/org.ourproject.kune.app.Kune/js/ext/ext-all-debug.js target/kune-0.0.5/org.ourproject.kune.app.Kune/js/ext/ext-all.js Modified: trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -64,65 +64,64 @@ private final Module configModule; public KuneRackModule() { - this("development", "kune.properties", null); + this("development", "kune.properties", null); } public KuneRackModule(final String jpaUnit, final String propertiesFileName, final Scope sessionScope) { - configModule = new AbstractModule() { - @Override - public void configure() { - bindInterceptor(Matchers.any(), new NotInObject(), new LoggerMethodInterceptor()); - bindConstant().annotatedWith(JpaUnit.class).to(jpaUnit); - bindConstant().annotatedWith(PropertiesFileName.class).to(propertiesFileName); - if (sessionScope != null) { - bindScope(SessionScoped.class, sessionScope); - } - } - }; + configModule = new AbstractModule() { + @Override + public void configure() { + bindInterceptor(Matchers.any(), new NotInObject(), new LoggerMethodInterceptor()); + bindConstant().annotatedWith(JpaUnit.class).to(jpaUnit); + bindConstant().annotatedWith(PropertiesFileName.class).to(propertiesFileName); + if (sessionScope != null) { + bindScope(SessionScoped.class, sessionScope); + } + } + }; } @SuppressWarnings("unchecked") public void configure(final RackBuilder builder) { - installGuiceModules(builder); + installGuiceModules(builder); - builder.add(KuneContainerListener.class); + builder.add(KuneContainerListener.class); - builder.exclude("/http-bind.*"); - builder.exclude("/services/fileupload.*"); - builder.exclude("/public/.*"); - builder.exclude("/images/.*"); - builder.exclude("/stylesheets/.*"); - builder.exclude("/javascripts/.*"); - builder.exclude("/templates/.*"); - builder.at(".*").install(new LogFilter()); - builder.at(".*").install(new GuiceFilter()); + builder.exclude("/http-bind.*"); + builder.exclude("/public/.*"); + builder.exclude("/images/.*"); + builder.exclude("/stylesheets/.*"); + builder.exclude("/javascripts/.*"); + builder.exclude("/templates/.*"); + builder.at(".*").install(new LogFilter()); + builder.at(".*").install(new GuiceFilter()); - builder.at("^/$").install(new RedirectFilter("/kune/")); - builder.at("^/kune$").install(new RedirectFilter("/kune/")); + builder.at("^/$").install(new RedirectFilter("/ws/")); + builder.at("^/ws").install(new RedirectFilter("/ws/")); - builder.at("^/kune/$").install(new ListenerFilter(KuneApplicationListener.class), - new ForwardFilter("/gwt/org.ourproject.kune.app.Kune/Kune.html")); + builder.at("^/ws/$").install(new ListenerFilter(KuneApplicationListener.class), + new ForwardFilter("/gwt/org.ourproject.kune.app.Kune/Kune.html")); - builder.installGWTServices("^/kune/", SiteService.class, GroupService.class, ContentService.class, - UserService.class, SocialNetworkService.class, I18nService.class); - builder.installRESTServices("^/kune/json/", TestJSONService.class, GroupJSONService.class, - UserJSONService.class, I18nTranslationJSONService.class, ContentJSONService.class); - builder.installServlet("^/kune/servlets/", FileUploadManager.class, FileDownloadManager.class, - EntityLogoUploadManager.class, EntityLogoDownloadManager.class); + builder.installGWTServices("^/ws/", SiteService.class, GroupService.class, ContentService.class, + UserService.class, SocialNetworkService.class, I18nService.class); + builder.installRESTServices("^/ws/json/", TestJSONService.class, GroupJSONService.class, UserJSONService.class, + I18nTranslationJSONService.class, ContentJSONService.class); + builder.installServlet("^/ws/servlets/", FileUploadManager.class, FileDownloadManager.class, + EntityLogoUploadManager.class, EntityLogoDownloadManager.class); - builder.at("^/kune/(.*)$").install(new ForwardFilter("^/kune/(.*)$", "/gwt/org.ourproject.kune.app.Kune/{0}")); + builder.at("^/ws/(.*)$").install(new ForwardFilter("^/ws/(.*)$", "/gwt/org.ourproject.kune.app.Kune/{0}")); } private void installGuiceModules(final RackBuilder builder) { - builder.use(new ServletModule()); - builder.use(new PlatformServerModule()); - builder.use(new DocumentServerModule()); - builder.use(new BlogServerModule()); - builder.use(new WikiServerModule()); - builder.use(new ChatServerModule()); - builder.use(new GalleryServerModule()); - builder.use(new RESTServicesModule()); - builder.use(configModule); + builder.use(new ServletModule()); + builder.use(new PlatformServerModule()); + builder.use(new DocumentServerModule()); + builder.use(new BlogServerModule()); + builder.use(new WikiServerModule()); + builder.use(new ChatServerModule()); + builder.use(new GalleryServerModule()); + builder.use(new RESTServicesModule()); + builder.use(configModule); } } Copied: trunk/src/main/java/org/ourproject/kune/platf/client/services/SearcherConstants.java (from rev 1105, trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherConstants.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherConstants.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/SearcherConstants.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -0,0 +1,21 @@ +package org.ourproject.kune.platf.client.services; + +public interface SearcherConstants { + + String START_PARAM = "start"; + String LIMIT_PARAM = "limit"; + String QUERY_PARAM = "query"; + String MIMETYPE_PARAM = "mimetype"; + String MIMETYPE2_PARAM = "mimetype2"; + String GROUP_PARAM = "group"; + + String GROUP_DATA_PROXY_URL = "/ws/json/GroupJSONService/search"; + String USER_DATA_PROXY_URL = "/ws/json/UserJSONService/search"; + String CONTENT_DATA_PROXY_URL = "/ws/json/ContentJSONService/search"; + String I18N_JSON_SERVICE = "/ws/json/I18nTranslationJSONService/search"; + String I18N_JSON_SERVICE_TRANSLATED = "/ws/json/I18nTranslationJSONService/searchtranslated"; + + String CONTENT_TEMPLATE_TEXT_PREFIX = "<div class=\"search-item\"><span class=\"kune-IconHyperlink\"><img src=\""; + String CONTENT_TEMPLATE_TEXT_SUFFIX = "\" style=\"height: 16px; width: 16px;\" />{shortName}: {longName}</span></div>"; + +} Property changes on: trunk/src/main/java/org/ourproject/kune/platf/client/services/SearcherConstants.java ___________________________________________________________________ Name: svn:mergeinfo + Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -55,8 +55,7 @@ } /** - * sample: - * http://localhost:8080/kune/#site.docs.3.1?locale=en&log_level=INFO + * sample: http://localhost:8080/ws/#site.docs.3.1?locale=en&log_level=INFO **/ public String getHref() { return href; @@ -71,7 +70,7 @@ } /** - * sample: /kune/ + * sample: /ws/ * * @return */ @@ -143,7 +142,7 @@ } private native String unescape(String val) /*-{ - return unescape(val); - }-*/; + return unescape(val); + }-*/; } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -53,8 +53,8 @@ private Listener0 onHideListener; private final ArrayList<Button> buttons; - public AbstractTabbedDialogPanel(String dialogId, String title, int width, int height, int minWidth, int minHeight, - boolean modal, Images images, String errorLabelId) { + public AbstractTabbedDialogPanel(final String dialogId, final String title, final int width, final int height, + final int minWidth, final int minHeight, final boolean modal, final Images images, final String errorLabelId) { this.dialogId = dialogId; this.title = title; this.width = width; @@ -67,7 +67,7 @@ buttons = new ArrayList<Button>(); } - public void activateTab(int index) { + public void activateTab(final int index) { createDialogIfNecessary(); tabPanel.activate(index); } @@ -77,7 +77,7 @@ * * @param button */ - public void addButton(Button button) { + public void addButton(final Button button) { buttons.add(button); } @@ -88,7 +88,7 @@ } } - public void addTab(View view) { + public void addTab(final View view) { addTabPanel(castPanel(view)); doLayoutIfNeeded(); } @@ -98,6 +98,13 @@ setFirstTabActive(); } + public void destroy() { + if (dialog != null) { + dialog.destroy(); + dialog = null; + } + } + public void doLayoutIfNeeded() { if (dialog.isRendered()) { dialog.doLayout(false); @@ -116,7 +123,7 @@ } } - public void insertTab(int index, View view) { + public void insertTab(final int index, final View view) { insertTabPanel(index, castPanel(view)); doLayoutIfNeeded(); } @@ -134,14 +141,14 @@ tabPanel.setActiveTab(0); } - public void setIconCls(String iconCls) { + public void setIconCls(final String iconCls) { this.iconCls = iconCls; if (dialog != null) { dialog.setIconCls(iconCls); } } - public void setTitle(String title) { + public void setTitle(final String title) { this.title = title; if (dialog != null) { dialog.setTitle(title); @@ -156,23 +163,23 @@ private void addHideListener() { dialog.addListener(new WindowListenerAdapter() { @Override - public void onClose(Panel panel) { + public void onClose(final Panel panel) { onHideListener.onEvent(); } @Override - public void onHide(Component component) { + public void onHide(final Component component) { onHideListener.onEvent(); } }); } - private void addTabPanel(Panel newTab) { + private void addTabPanel(final Panel newTab) { createDialogIfNecessary(); tabPanel.add(newTab); } - private Panel castPanel(View view) { + private Panel castPanel(final View view) { Panel panel; if (view instanceof Panel) { panel = (Panel) view; @@ -210,7 +217,7 @@ } } - private void insertTabPanel(int index, Panel newTab) { + private void insertTabPanel(final int index, final Panel newTab) { createDialogIfNecessary(); tabPanel.insert(index, newTab); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -30,6 +30,8 @@ void createAndShow(); + void destroy(); + void hide(); void hideMessages(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -31,8 +31,8 @@ public class FileDownloadUtils { - private static final String DOWNLOADSERVLET = "/kune/servlets/FileDownloadManager"; - private static final String LOGODOWNLOADSERVLET = "/kune/servlets/EntityLogoDownloadManager"; + private static final String DOWNLOADSERVLET = "/ws/servlets/FileDownloadManager"; + private static final String LOGODOWNLOADSERVLET = "/ws/servlets/EntityLogoDownloadManager"; private final Session session; private final ImageUtils imageUtils; Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/form/FileUploadFormSample.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/form/FileUploadFormSample.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/form/FileUploadFormSample.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -1,60 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package org.ourproject.kune.platf.client.ui.form; - -import com.google.gwt.user.client.ui.Button; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.FileUpload; -import com.google.gwt.user.client.ui.FormPanel; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.TextBox; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; - -public class FileUploadFormSample extends FormPanel { - private static final String MUSIC_UPLOAD_ACTION = "/services/fileupload"; - - public FileUploadFormSample() { - setAction(MUSIC_UPLOAD_ACTION); // set the action, must match with - // the servlet URL pattern - setEncoding(FormPanel.ENCODING_MULTIPART); - setMethod(FormPanel.METHOD_POST); - - VerticalPanel panel = new VerticalPanel(); - setWidget(panel); - - panel.add(new Label("Title")); - TextBox name = new TextBox(); - panel.add(name); - - panel.add(new Label("File")); - FileUpload upload = new FileUpload(); - upload.setName("someFile"); - panel.add(upload); - - Button submit = new Button("Submit"); - submit.addClickListener(new ClickListener() { - public void onClick(final Widget sender) { - submit(); // submit the form - } - }); - panel.add(submit); - } -} Modified: trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -106,7 +106,9 @@ groupManager.reIndex(); final Content defaultContent = siteGroup.getDefaultContent(); - contentManager.save(user, defaultContent, + contentManager.save( + user, + defaultContent, "<img src=\"http://kune.ourproject.org/IMG/cache-200x37/siteon0-200x37.png\" " + "align=\"right\">This a initial demo of " + "<a href=\"http://kune.ourproject.org\">kune</a>." @@ -128,7 +130,7 @@ + "Our main goal is to offer customs and configurable styles " + "for groups/users contents.</li></ul></ul><font size=\"4\"><br>" + "We need your feedback<br><br></font>Please help us to improve this software " - + "reporting <a href=\"http://code.google.com/p/kune/issues\">bugs and/or " + + "reporting <a href=\"http://ourproject.org/tracker/?atid=139&group_id=407&func=browse\">bugs and/or " + "suggestions</a>. Also you <a href=\"#translate\">help us to translate it</a> " + "into other languages.<br><br>Thank you,<br>" + "<br>--<br><span style=\"font-style: italic;\">" + "The kune development team</span><br><br>"); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -21,6 +21,7 @@ import org.ourproject.kune.platf.client.dto.LinkDTO; import org.ourproject.kune.platf.client.dto.SearchResultDTO; +import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.server.content.ContainerManager; import org.ourproject.kune.platf.server.content.ContentManager; import org.ourproject.kune.platf.server.domain.Container; @@ -28,7 +29,6 @@ import org.ourproject.kune.platf.server.manager.impl.SearchResult; import org.ourproject.kune.platf.server.mapper.Mapper; import org.ourproject.kune.rack.filters.rest.REST; -import org.ourproject.kune.workspace.client.search.SearcherConstants; import com.google.inject.Inject; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -21,12 +21,12 @@ import org.ourproject.kune.platf.client.dto.LinkDTO; import org.ourproject.kune.platf.client.dto.SearchResultDTO; +import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.impl.SearchResult; import org.ourproject.kune.platf.server.mapper.Mapper; import org.ourproject.kune.rack.filters.rest.REST; -import org.ourproject.kune.workspace.client.search.SearcherConstants; import com.google.inject.Inject; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -23,12 +23,12 @@ import org.ourproject.kune.platf.client.dto.I18nTranslationDTO; import org.ourproject.kune.platf.client.dto.SearchResultDTO; +import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.server.domain.I18nTranslation; import org.ourproject.kune.platf.server.manager.I18nTranslationManager; import org.ourproject.kune.platf.server.manager.impl.SearchResult; import org.ourproject.kune.platf.server.mapper.Mapper; import org.ourproject.kune.rack.filters.rest.REST; -import org.ourproject.kune.workspace.client.search.SearcherConstants; import com.google.inject.Inject; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -21,12 +21,12 @@ import org.ourproject.kune.platf.client.dto.LinkDTO; import org.ourproject.kune.platf.client.dto.SearchResultDTO; +import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.UserManager; import org.ourproject.kune.platf.server.manager.impl.SearchResult; import org.ourproject.kune.platf.server.mapper.Mapper; import org.ourproject.kune.rack.filters.rest.REST; -import org.ourproject.kune.workspace.client.search.SearcherConstants; import com.google.inject.Inject; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -4,11 +4,11 @@ import org.ourproject.kune.platf.client.dto.LinkDTO; import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertImageAbstractPanel; import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; -import org.ourproject.kune.workspace.client.search.SearcherConstants; import com.calclab.suco.client.events.Listener; import com.gwtext.client.core.UrlParam; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -23,10 +23,10 @@ import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.dto.StateTokenUtils; import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPanel; import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; -import org.ourproject.kune.workspace.client.search.SearcherConstants; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.calclab.suco.client.events.Listener; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -4,10 +4,10 @@ import org.ourproject.kune.platf.client.dto.LinkDTO; import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPanel; import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; -import org.ourproject.kune.workspace.client.search.SearcherConstants; import com.calclab.suco.client.events.Listener; import com.gwtext.client.core.UrlParam; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -22,6 +22,7 @@ import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; +import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.AbstractSearcherPanel; import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; @@ -74,7 +75,7 @@ private final Images img; public I18nTranslatorPanel(final I18nTranslatorPresenter initPresenter, final I18nTranslationService i18n, - final LanguageSelector languageSelector, final WorkspaceSkeleton ws, Images img) { + final LanguageSelector languageSelector, final WorkspaceSkeleton ws, final Images img) { super(i18n); this.presenter = initPresenter; this.languageSelector = languageSelector; @@ -188,8 +189,8 @@ private GridPanel createGridPanel(final boolean translated) { final Renderer renderNT = new Renderer() { - public String render(Object value, CellMetadata cellMetadata, Record record, int rowIndex, int colNum, - Store store) { + public String render(final Object value, final CellMetadata cellMetadata, final Record record, + final int rowIndex, final int colNum, final Store store) { String renderer; String[] splitted = splitNT((String) value); if (splitted.length > 1) { @@ -209,11 +210,11 @@ new StringFieldDef(id) }; if (translated) { - final String url = "/kune/json/I18nTranslationJSONService/searchtranslated"; + final String url = SearcherConstants.I18N_JSON_SERVICE_TRANSLATED; transStore = createStore(fieldDefs, url, id); store = transStore; } else { - final String url = "/kune/json/I18nTranslationJSONService/search"; + final String url = SearcherConstants.I18N_JSON_SERVICE; unTransStore = createStore(fieldDefs, url, id); store = unTransStore; } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPresenter.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPresenter.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -29,9 +29,9 @@ EntityOptionsView view; - public EntityOptionsPresenter(StateManager stateManager) { + public EntityOptionsPresenter(final StateManager stateManager) { stateManager.onStateChanged(new Listener<StateAbstractDTO>() { - public void onEvent(StateAbstractDTO state) { + public void onEvent(final StateAbstractDTO state) { if (state.getGroup().isPersonal()) { view.setPersonalTitle(); } else { @@ -41,13 +41,13 @@ view.setButtonVisible(true); } else { view.setButtonVisible(false); - view.hide(); + view.destroy(); } } }); } - public void init(EntityOptionsView view) { + public void init(final EntityOptionsView view) { super.init(view); this.view = view; } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -44,7 +44,7 @@ public class EntityOptionsLogoPanel extends FormPanel implements EntityOptionsLogoView { - public static final String ICON_UPLOAD_SERVLET = "/kune/servlets/EntityLogoUploadManager"; + public static final String ICON_UPLOAD_SERVLET = "/ws/servlets/EntityLogoUploadManager"; public static final String SET_LOGO_ID = "k-eolp-sendb"; public static final String PANEL_ID = "k-eolp-pan"; private final Hidden userhashField; @@ -54,7 +54,7 @@ private final I18nTranslationService i18n; public EntityOptionsLogoPanel(final EntityOptionsLogoPresenter presenter, final WorkspaceSkeleton ws, - I18nTranslationService i18n) { + final I18nTranslationService i18n) { this.i18n = i18n; super.setHeight(EntityOptionsView.HEIGHT); super.setButtonAlign(Position.LEFT); @@ -70,15 +70,15 @@ super.setHideLabels(true); super.setPaddings(10); super.addFormListener(new FormListener() { - public boolean doBeforeAction(Form form) { + public boolean doBeforeAction(final Form form) { return true; } - public void onActionComplete(Form form, int httpStatus, String responseText) { + public void onActionComplete(final Form form, final int httpStatus, final String responseText) { presenter.onSubmitComplete(httpStatus, responseText); } - public void onActionFailed(Form form, int httpStatus, String responseText) { + public void onActionFailed(final Form form, final int httpStatus, final String responseText) { presenter.onSubmitFailed(httpStatus, responseText); } }); @@ -86,7 +86,7 @@ super.add(dialogInfoLabel); file = new TextField("File", FileConstants.LOGO_FORM_FIELD); EventCallback keyListener = new EventCallback() { - public void execute(EventObject e) { + public void execute(final EventObject e) { // setEnableFileField(); } }; @@ -100,7 +100,7 @@ super.add(file); FieldListenerAdapter changeListener = new FieldListenerAdapter() { @Override - public void onChange(Field field, Object newVal, Object oldVal) { + public void onChange(final Field field, final Object newVal, final Object oldVal) { NotifyUser.info("change"); // setEnableFileField(); } @@ -111,7 +111,7 @@ Button sendButton = new Button(i18n.t("Send"), new ButtonListenerAdapter() { @Override - public void onClick(Button button, EventObject e) { + public void onClick(final Button button, final EventObject e) { String filename = file.getValueAsString(); if (filename != null && filename.length() > 0) { getForm().submit(); @@ -153,7 +153,7 @@ doLayoutIfNeeded(); } - public void setUploadParams(String userHash, String token) { + public void setUploadParams(final String userHash, final String token) { userhashField.setValue(userHash); tokenField.setValue(token); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -2,6 +2,7 @@ import org.ourproject.kune.platf.client.dto.LinkDTO; import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import org.ourproject.kune.platf.client.services.SearcherConstants; import com.calclab.suco.client.events.Listener; import com.google.gwt.user.client.Command; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -22,6 +22,7 @@ import org.ourproject.kune.platf.client.dto.LinkDTO; import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; @@ -77,10 +78,10 @@ String dataProxyUrl = ""; switch (searchType) { case groups: - dataProxyUrl = "/kune/json/GroupJSONService/search"; + dataProxyUrl = SearcherConstants.GROUP_DATA_PROXY_URL; break; case users: - dataProxyUrl = "/kune/json/UserJSONService/search"; + dataProxyUrl = SearcherConstants.USER_DATA_PROXY_URL; break; default: break; Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherConstants.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherConstants.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherConstants.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -1,16 +0,0 @@ -package org.ourproject.kune.workspace.client.search; - -public interface SearcherConstants { - - String START_PARAM = "start"; - String LIMIT_PARAM = "limit"; - String QUERY_PARAM = "query"; - String MIMETYPE_PARAM = "mimetype"; - String MIMETYPE2_PARAM = "mimetype2"; - String GROUP_PARAM = "group"; - - String CONTENT_DATA_PROXY_URL = "/kune/json/ContentJSONService/search"; - String CONTENT_TEMPLATE_TEXT_PREFIX = "<div class=\"search-item\"><span class=\"kune-IconHyperlink\"><img src=\""; - String CONTENT_TEMPLATE_TEXT_SUFFIX = "\" style=\"height: 16px; width: 16px;\" />{shortName}: {longName}</span></div>"; - -} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -20,6 +20,7 @@ package org.ourproject.kune.workspace.client.search; import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.AbstractSearcherPanel; import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; @@ -95,7 +96,7 @@ } } - public void setTextToSearch(String text) { + public void setTextToSearch(final String text) { searchField.setValue(text); } @@ -222,10 +223,10 @@ switch (type) { case group_user: - store = groupStore = createStore(fieldDefs, "/kune/json/GroupJSONService/search", id); + store = groupStore = createStore(fieldDefs, SearcherConstants.GROUP_DATA_PROXY_URL, id); break; case content: - store = contentStore = createStore(fieldDefs, "/kune/json/ContentJSONService/search", id); + store = contentStore = createStore(fieldDefs, SearcherConstants.CONTENT_DATA_PROXY_URL, id); break; default: throw new RuntimeException("Unknown type of search"); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -56,21 +56,24 @@ } }); - final Item testRTE = new Item(i18n.t("Test new RTE"), new BaseItemListenerAdapter() { - @Override - public void onClick(final BaseItem item, final EventObject e) { - editor.get().show(); - } - }, ""); + // final Item testRTE = new Item(i18n.t("Test new RTE"), new + // BaseItemListenerAdapter() { + // @Override + // public void onClick(final BaseItem item, final EventObject e) { + // editor.get().show(); + // } + // }, ""); + // + // final Item testRTEbasic = new + // Item(i18n.t("Test new RTE (basic mode)"), new + // BaseItemListenerAdapter() { + // @Override + // public void onClick(final BaseItem item, final EventObject e) { + // editor.get().setExtended(false); + // editor.get().show(); + // } + // }, ""); - final Item testRTEbasic = new Item(i18n.t("Test new RTE (basic mode)"), new BaseItemListenerAdapter() { - @Override - public void onClick(final BaseItem item, final EventObject e) { - editor.get().setExtended(false); - editor.get().show(); - } - }, ""); - final Item linkHelpInTrans = new Item(i18n.t("Help with the translation"), new BaseItemListenerAdapter() { @Override public void onClick(final BaseItem item, final EventObject e) { @@ -86,8 +89,6 @@ KuneWindowUtils.open("http://ourproject.org/tracker/?group_id=407"); } }, "images/kuneicon16.gif"); - optionsMenu.addItem(testRTE); - optionsMenu.addItem(testRTEbasic); optionsMenu.addItem(linkHelpInTrans); optionsMenu.addItem(linkKuneBugs); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java 2009-05-03 15:08:43 UTC (rev 1106) @@ -40,7 +40,7 @@ protected static final String SITE_FILE_UPLOADER = "k-site-file-uploader"; - private static final String URL = "/kune/servlets/FileUploadManager"; + private static final String URL = "/ws/servlets/FileUploadManager"; private UploadDialog dialog; private ToolbarButton traybarButton; Modified: trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml 2009-04-29 22:05:47 UTC (rev 1105) +++ trunk/src/main/webapp/WEB-INF/web.xml 2009-05-03 15:08:43 UTC (rev 1106) @@ -3,8 +3,8 @@ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - <display-name>kune</display-name> - <description>kune</description> + <display-name>ws</display-name> + <description>kune workspace</description> <context-param> <param-name>jruby.standalone</param-name>

1 0

r1105 - trunk
by Samer . 29 Apr '09

29 Apr '09

Author: shevek Date: 2009-04-30 00:05:47 +0200 (Thu, 30 Apr 2009) New Revision: 1105 Modified: trunk/TODO Log: TODO update with insights from a discussion Vic-Sam Modified: trunk/TODO =================================================================== --- trunk/TODO 2009-04-29 14:46:29 UTC (rev 1104) +++ trunk/TODO 2009-04-29 22:05:47 UTC (rev 1105) @@ -120,10 +120,12 @@ * MID-TERM ** TODO <v,s> harden our privacy policy. Goals: - - permit user/projects/contents how much private or public are. - - APIs public only to associated sites (in study) + - permit user/projects/contents how much private or public are + - APIs public only to associated sites (in study) ( http://oauth.net ? ) - the social net info (xmpp ids) must follow the mobile numbers/email info interchange mode (if I don't have yor email/mobile, I can't contact you) - keep always the user informed + - consider integration of chryptopgraphy (keyczar.org ? ) + - encourage the use of nicknames; discourage the use of real names (as in Facebook). If a political group uses real names, an undercover would have too much info ** <v> trash icon area d&d ** vjrj <v> shortcuts enhacement *** Clarify the keycodes vs utf8 chars Shortcut definition (Function keys and so on...)

1 0

r1104 - trunk
by vjrj 29 Apr '09

29 Apr '09

Author: vjrj Date: 2009-04-29 16:46:29 +0200 (Wed, 29 Apr 2009) New Revision: 1104 Modified: trunk/TODO Log: About privacy in TODO Modified: trunk/TODO =================================================================== --- trunk/TODO 2009-04-29 12:01:29 UTC (rev 1103) +++ trunk/TODO 2009-04-29 14:46:29 UTC (rev 1104) @@ -119,6 +119,11 @@ ** vjrj <v> IconHyperlink.java and IconLabel.java to gwt1.5 * MID-TERM +** TODO <v,s> harden our privacy policy. Goals: + - permit user/projects/contents how much private or public are. + - APIs public only to associated sites (in study) + - the social net info (xmpp ids) must follow the mobile numbers/email info interchange mode (if I don't have yor email/mobile, I can't contact you) + - keep always the user informed ** <v> trash icon area d&d ** vjrj <v> shortcuts enhacement *** Clarify the keycodes vs utf8 chars Shortcut definition (Function keys and so on...)

1 0

r1103 - in trunk: . script src/main/java/org/ourproject/kune/platf/client/ui/rte/basic src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia src/main/java/org/ourproject/kune/workspace/client/cnt
by vjrj 29 Apr '09

29 Apr '09

Author: vjrj Date: 2009-04-29 14:01:29 +0200 (Wed, 29 Apr 2009) New Revision: 1103 Modified: trunk/DEV-GUIDE trunk/INSTALL trunk/TROUBLESHOOT trunk/script/liquibase-migrate.sh trunk/script/liquibase-rollback.sh trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java Log: Centered videos preview. Some doc improved. Modified: trunk/DEV-GUIDE =================================================================== --- trunk/DEV-GUIDE 2009-04-28 12:53:10 UTC (rev 1102) +++ trunk/DEV-GUIDE 2009-04-29 12:01:29 UTC (rev 1103) @@ -179,7 +179,7 @@ For start the hosted mode, you can both execute from command line: - mvn gwt:gwt + mvn com.totsp.gwt:maven-googlewebtoolkit2-plugin:gwt Also, you can generate a hosted mode launch configuration in eclipse. We have a "Run configuration" (Run > Open Run Dialog) in eclipse with Project: "org.ourproject.kune" with Main class: "com.google.gwt.dev.GWTShell", with this program arguments (or similar): "-noserver -out gwt-out /kune/?locale=en&log_level=INFO -port 8080" and in the "Classpath User Entries": * gwt-dev-[linux|mac|windows].jar (Add External Jar and choose it from your gwt installation directory) @@ -190,7 +190,7 @@ -Xmx512M before run hosted mode compile once with: - mvn gwt:compile + mvn com.totsp.gwt:maven-googlewebtoolkit2-plugin:compile and deploy with: script/deploy_gwt.sh and then we run jetty (with "script/server.sh" also you can run server in debug mode, see TROUBLESHOOT). This is quite useful to put breakpoints in the server code. Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2009-04-28 12:53:10 UTC (rev 1102) +++ trunk/INSTALL 2009-04-29 12:01:29 UTC (rev 1103) @@ -49,7 +49,7 @@ - Compile with maven: # (in the trunk directory) mvn compile -Dliquibase.should.run=false - mvn gwt:compile + mvn com.totsp.gwt:maven-googlewebtoolkit2-plugin:compile - Copy the target to src directory (only for test): ./script/deploy_gwt.sh Modified: trunk/TROUBLESHOOT =================================================================== --- trunk/TROUBLESHOOT 2009-04-28 12:53:10 UTC (rev 1102) +++ trunk/TROUBLESHOOT 2009-04-29 12:01:29 UTC (rev 1103) @@ -16,4 +16,13 @@ ==Emite troubleshooting== See: -http://code.google.com/p/emite/wiki/Troubleshooting \ No newline at end of file +http://code.google.com/p/emite/wiki/Troubleshooting + +==Liquibase== + +=== Checksum errors === + +Migration Failed: Validation Failed:1 change sets failed MD5Sum Check src/main/resources/db/liquibase_changelog.xml :: 18 :: vjrj :: (MD5Sum: bde0aa519108e1e3d1f29bb2483bc9) + +Don't try to update the liquibase changelogs you have already use. Better create new ones to delete, update, and so on. If you are developing and want to clear the checksums, you can use the command "clearCheckSums". See script/liquibase-* and http://www.liquibase.org/manual/command_line + Modified: trunk/script/liquibase-migrate.sh =================================================================== --- trunk/script/liquibase-migrate.sh 2009-04-28 12:53:10 UTC (rev 1102) +++ trunk/script/liquibase-migrate.sh 2009-04-29 12:01:29 UTC (rev 1103) @@ -1,6 +1,6 @@ java -jar $M2_REPO/org/liquibase/liquibase-core/1.4.1/liquibase-core-1.4.1.jar \ --driver=com.mysql.jdbc.Driver \ - --classpath=~/.m2/repository/mysql/mysql-connector-java/5.0.5/mysql-connector-java-5.0.5.jar \ + --classpath=$M2_REPO/mysql/mysql-connector-java/5.0.5/mysql-connector-java-5.0.5.jar \ --changeLogFile=src/main/resources/db/liquibase_changelog.xml \ --url="jdbc:mysql://localhost/kune_dev" \ --username=kune \ Modified: trunk/script/liquibase-rollback.sh =================================================================== --- trunk/script/liquibase-rollback.sh 2009-04-28 12:53:10 UTC (rev 1102) +++ trunk/script/liquibase-rollback.sh 2009-04-29 12:01:29 UTC (rev 1103) @@ -1,6 +1,6 @@ java -jar $M2_REPO/org/liquibase/liquibase-core/1.4.1/liquibase-core-1.4.1.jar \ --driver=com.mysql.jdbc.Driver \ - --classpath=~/.m2/repository/mysql/mysql-connector-java/5.0.5/mysql-connector-java-5.0.5.jar \ + --classpath=$M2_REPO/mysql/mysql-connector-java/5.0.5/mysql-connector-java-5.0.5.jar \ --changeLogFile=src/main/resources/db/liquibase_changelog.xml \ --url="jdbc:mysql://localhost/kune_dev" \ --username=kune \ Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2009-04-28 12:53:10 UTC (rev 1102) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2009-04-29 12:01:29 UTC (rev 1103) @@ -40,8 +40,8 @@ public class RTEditorPresenter implements RTEditor { private final String fontNames[] = { "Times New Roman", "Arial", "Courier New", "Georgia", "Trebuchet", "Verdana" }; - private final String fontSizes[] = { "Extra small", "Very small", "Small", "Medium", "Large", "Very large", - "Extra large" }; + private final String fontSizes[] = { "Extra small", "Very small (normal)", "Small", "Medium", "Large", + "Very large", "Extra large" }; private static final RichTextArea.FontSize[] fontSizesConstants = new RichTextArea.FontSize[] { RichTextArea.FontSize.XX_SMALL, RichTextArea.FontSize.X_SMALL, RichTextArea.FontSize.SMALL, RichTextArea.FontSize.MEDIUM, RichTextArea.FontSize.LARGE, RichTextArea.FontSize.X_LARGE, Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java 2009-04-28 12:53:10 UTC (rev 1102) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java 2009-04-29 12:01:29 UTC (rev 1103) @@ -5,6 +5,7 @@ import com.google.gwt.dom.client.Element; import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.ui.HTML; public class ContentPosition { @@ -16,18 +17,6 @@ private static Object[][] positionObjs; - public static Element getElementPosition(final Element element, final boolean wraptext, final String position) { - if (!wraptext || position.equals(ContentPosition.CENTER)) { - com.google.gwt.user.client.Element divEl = DOM.createDiv(); - CSS.setProperty(divEl, CSS.A.TEXT_ALIGN, position); - divEl.setInnerHTML(element.getString()); - return divEl; - } else { - CSS.setProperty(element, CSS.A.FLOAT, position); - return element; - } - } - public static Object[][] getPositions() { if (positionObjs == null) { String[][] values = positions; @@ -40,4 +29,26 @@ } return positionObjs; } + + public static String setCenterPosition(final String elementCode) { + return setPosition(elementCode, false, CENTER); + } + + public static Element setPosition(final Element element, final boolean wraptext, final String position) { + if (!wraptext || position.equals(ContentPosition.CENTER)) { + com.google.gwt.user.client.Element divEl = DOM.createDiv(); + CSS.setProperty(divEl, CSS.A.TEXT_ALIGN, position); + divEl.setInnerHTML(element.getString()); + return divEl; + } else { + CSS.setProperty(element, CSS.A.FLOAT, position); + return element; + } + } + + public static String setPosition(final String elementCode, final boolean wraptext, final String position) { + HTML html = new HTML(elementCode); + html.removeStyleName("gwt-HTML"); + return setPosition(html.getElement(), wraptext, position).getString(); + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java 2009-04-28 12:53:10 UTC (rev 1102) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java 2009-04-29 12:01:29 UTC (rev 1103) @@ -105,7 +105,7 @@ com.google.gwt.user.client.Element img = DOM.createImg(); DOM.setElementProperty(img, "src", src); CSS.setProperty(img, CSS.A.WIDTH, getStyleSize()); - return ContentPosition.getElementPosition(img, wraptext, position); + return ContentPosition.setPosition(img, wraptext, position); } private String getStyleSize() { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java 2009-04-28 12:53:10 UTC (rev 1102) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java 2009-04-29 12:01:29 UTC (rev 1103) @@ -5,7 +5,6 @@ import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertElementAbstractPanel; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialogView; -import com.google.gwt.user.client.ui.HTML; import com.gwtext.client.widgets.Component; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.form.TextField; @@ -60,7 +59,7 @@ } public String setPosition(final String embedElement) { - return ContentPosition.getElementPosition(new HTML(embedElement).getElement(), getWrapText(), getPosition()).getString(); + return ContentPosition.setPosition(embedElement, getWrapText(), getPosition()); } private void defValues() { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2009-04-28 12:53:10 UTC (rev 1102) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2009-04-29 12:01:29 UTC (rev 1103) @@ -3,6 +3,7 @@ import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition; public class MediaUtils { @@ -18,23 +19,27 @@ } public String getAviEmbed(final StateToken token) { - return session.getInitData().getAviEmbedObject().replace(DOC_URL_TAG, - session.getSiteUrl() + downloadUtils.getUrl(token)); + return setCenterPosition(session.getInitData().getAviEmbedObject().replace(DOC_URL_TAG, + session.getSiteUrl() + downloadUtils.getUrl(token))); } public String getFlvEmbed(final StateToken token) { - return session.getInitData().getFlvEmbedObject().replace(DOC_URL_TAG, - session.getSiteUrl() + downloadUtils.getUrl(token)); + return setCenterPosition(session.getInitData().getFlvEmbedObject().replace(DOC_URL_TAG, + session.getSiteUrl() + downloadUtils.getUrl(token))); } public String getMp3Embed(final StateToken token) { - return session.getInitData().getMp3EmbedObject().replace(DOC_URL_TAG, - session.getSiteUrl() + downloadUtils.getUrl(token)); + return setCenterPosition(session.getInitData().getMp3EmbedObject().replace(DOC_URL_TAG, + session.getSiteUrl() + downloadUtils.getUrl(token))); } public String getOggEmbed(final StateToken token) { - return session.getInitData().getOggEmbedObject().replace(DOC_URL_TAG, - session.getSiteUrl() + downloadUtils.getUrl(token)); + return setCenterPosition(session.getInitData().getOggEmbedObject().replace(DOC_URL_TAG, + session.getSiteUrl() + downloadUtils.getUrl(token))); } + private String setCenterPosition(final String elementCode) { + return ContentPosition.setCenterPosition(elementCode); + } + } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2009-04-28 12:53:10 UTC (rev 1102) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2009-04-29 12:01:29 UTC (rev 1103) @@ -89,13 +89,13 @@ view.showImage(fileDownloadUtils.getImageUrl(token), fileDownloadUtils.getImageResizedUrl(token, ImageSize.sized), true); } else if (mimeType.isMp3()) { - view.setContent(mediaUtils.get().getMp3Embed(token), false); + view.setRawContent(mediaUtils.get().getMp3Embed(token)); } else if (mimeType.isOgg()) { - view.setContent(mediaUtils.get().getOggEmbed(token), false); + view.setRawContent(mediaUtils.get().getOggEmbed(token)); } else if (mimeType.isFlv()) { - view.setContent(mediaUtils.get().getFlvEmbed(token), false); + view.setRawContent(mediaUtils.get().getFlvEmbed(token)); } else if (mimeType.isAvi()) { - view.setContent(mediaUtils.get().getAviEmbed(token), false); + view.setRawContent(mediaUtils.get().getAviEmbed(token)); } else if (mimeType.isText()) { view.setContent(contentBody, true); } else {

1 0

28 Apr '09

Author: vjrj Date: 2009-04-28 14:53:10 +0200 (Tue, 28 Apr 2009) New Revision: 1102 Added: trunk/src/main/java/org/ourproject/kune/platf/client/dto/ExtMediaDescripDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertElementAbstractPanel.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/ExtMediaDescrip.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/ExtMediaDescripManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ExtMediaDescripManagerDefault.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherConstants.java trunk/src/main/resources/db/update-0014-extmedia.sql Removed: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptor.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherContants.java Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/LicenseManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java trunk/src/main/resources/db/liquibase_changelog.xml trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptorTest.java Log: Incomplete - task Insert Media dialog Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2009-04-28 12:53:10 UTC (rev 1102) @@ -41,4 +41,4 @@ padding: 1px 0px 1px 1px; text-decoration:none; } -*/.x-tree-node .k-ctn-status-normal a span{}.x-tree-node .k-ctn-status-deleted a span{text-decoration:line-through;color:gray;}.x-tree-node .k-ctn-status-rejected a span{text-decoration:line-through;/* color: #FF6633; */color:#F30;}.x-tree-node .k-ctn-status-editing a span{font-style:italic;color:gray;}.x-tree-node .k-ctn-status-submitted a span{color:green;}.k-info-links{text-decoration:underline;color:gray;cursor:pointer;}.x-tool-kmenu{background-position:0 -75px;}.x-tool-kmenu-over{background-position:-15px -75px;}.k-border-openbox{border-bottom:1px #D0D0D0 solid;border-right:1px #D0D0D0 solid;border-left:1px #D0D0D0 solid;}/* SiteToastMessages */.k-stm-info-icon{background-image:url(img/info.gif)!important;}.k-stm-imp-icon{background-image:url(img/alert.gif)!important;}.k-stm-verimp-icon{background-image:url(img/important.gif)!important;}.k-stm-error-icon{background-image:url(img/error.gif)!important;}.k-error-tb{background:#FFB380 none repeat scroll 0 50%;color:#250;}.k-infod-head{font-size:108%;margin-bottom:10px;}.gwt-DisclosurePanel{}.gwt-DisclosurePanel-open{}.gwt-DisclosurePanel-closed{}.gwt-DisclosurePanel .header,.gwt-DisclosurePanel .header a,.gwt-DisclosurePanel .header td{text-decoration:none;/* Remove underline from header */color:#000;cursor:pointer;cursor:hand;}.gwt-DisclosurePanel .content{border-left:3px solid #e8eef7;padding:4px 0 4px 8px;margin-left:6px;}.k-basic-thumb{background:#FAFAFA none repeat scroll 0 50%;border:1px solid #EBEBEB;padding:3px;margin:3px;}.k-basic-thumb td{padding:2px 3px;border:none;}.k-text-gray{color:gray;}.k-elp-limg{margin-top:4px;margin-left:5px;cursor:pointer;overflow:hidden;}.k-tsp-tag{float:left;padding:3px;cursor:pointer;color:#00F;}.k-tsp-cloud{line-height:1.5em;text-align:center;}.k-link-icon{background-image:url(img/link.gif)!important;}.k-options-icon{background-image:url(img/emblem-system.gif)!important;}.k-copyleft-icon{background-image:url(img/copyleft.png)!important;}.k-picture-icon{background-image:url(img/picture.png)!important;}.k-film-icon{background-image:url(img/film.png)!important;}.k-specialchars-icon{background-image:url(img/specialchars.png)!important;}.k-info-icon{background-image:url(img/info.gif)!important;}.k-newgroup-icon{background-image:url(img/kune-icon16.png)!important;}.k-colors-icon{background-image:url(img/colors.gif)!important;}.x-toolbar-body table{/* width: 100%; */}.k-preview-msg{background:#FCA;}.k-preview-msg-lab{background:#FCA;padding:0 5px;}.k-eil-edit{border:thin solid #000;}/* duplicated in rte.css */.k-rte-comment{border:1px dashed silver;line-height:1.4;padding:1px;background-color:#D7FFD7;}.k-specialchar-grid{border:1px solid #ACA899;}.k-specialchar-grid table{}.k-specialchar-grid div{line-height:22px;}.k-specialchar-grid td{padding:1px;}.k-specialchar-pb{border:1px solid #EBE8D7;cursor:pointer;font-size:108%!important;text-align:center;vertical-align:middle;width:18px;height:18px;}.k-specialchar-pb-up{}.k-specialchar-big{padding:3px;line-height:22px;font-size:153.899994%!important;}.k-specialchar-adv-label{margin-left:-10px;}.k-specialchar-popup,{border:1px px solid silver;z-index:9999!important;background-color:#FFF;}.k-specialchar-pb-down{color:#161616;}.k-specialchar-pb-up-hovering{border:thin solid #ACA899;}.k-specialchar-pb-down-hovering{color:#161616;}.k-preview-panel{border:dashed 1px gray;}.k-rte-changelink{white-space:nowrap;color:navy;cursor:pointer;text-decoration:underline;margin:5px;}.k-rte-changelink-popup{border:1px solid silver;z-index:9999!important;background-color:#ECECEC;}.e-ui-room{height:27px;line-height:22px;}.e-ui-room input{font-size:100%;margin-left:0;margin-top:0;} \ No newline at end of file +*/.x-tree-node .k-ctn-status-normal a span{}.x-tree-node .k-ctn-status-deleted a span{text-decoration:line-through;color:gray;}.x-tree-node .k-ctn-status-rejected a span{text-decoration:line-through;/* color: #FF6633; */color:#F30;}.x-tree-node .k-ctn-status-editing a span{font-style:italic;color:gray;}.x-tree-node .k-ctn-status-submitted a span{color:green;}.k-info-links{text-decoration:underline;color:gray;cursor:pointer;}.x-tool-kmenu{background-position:0 -75px;}.x-tool-kmenu-over{background-position:-15px -75px;}.k-border-openbox{border-bottom:1px #D0D0D0 solid;border-right:1px #D0D0D0 solid;border-left:1px #D0D0D0 solid;}/* SiteToastMessages */.k-stm-info-icon{background-image:url(img/info.gif)!important;}.k-stm-imp-icon{background-image:url(img/alert.gif)!important;}.k-stm-verimp-icon{background-image:url(img/important.gif)!important;}.k-stm-error-icon{background-image:url(img/error.gif)!important;}.k-error-tb{background:#FFB380 none repeat scroll 0 50%;color:#250;}.k-infod-head{font-size:108%;margin-bottom:10px;}.gwt-DisclosurePanel{}.gwt-DisclosurePanel-open{}.gwt-DisclosurePanel-closed{}.gwt-DisclosurePanel .header,.gwt-DisclosurePanel .header a,.gwt-DisclosurePanel .header td{text-decoration:none;/* Remove underline from header */color:#000;cursor:pointer;cursor:hand;}.gwt-DisclosurePanel .content{border-left:3px solid #e8eef7;padding:4px 0 4px 8px;margin-left:6px;}.k-basic-thumb{background:#FAFAFA none repeat scroll 0 50%;border:1px solid #EBEBEB;padding:3px;margin:3px;}.k-basic-thumb td{padding:2px 3px;border:none;}.k-text-gray{color:gray;}.k-elp-limg{margin-top:4px;margin-left:5px;cursor:pointer;overflow:hidden;}.k-tsp-tag{float:left;padding:3px;cursor:pointer;color:#00F;}.k-tsp-cloud{line-height:1.5em;text-align:center;}.k-link-icon{background-image:url(img/link.gif)!important;}.k-options-icon{background-image:url(img/emblem-system.gif)!important;}.k-copyleft-icon{background-image:url(img/copyleft.png)!important;}.k-picture-icon{background-image:url(img/picture.png)!important;}.k-film-icon{background-image:url(img/film.png)!important;}.k-specialchars-icon{background-image:url(img/specialchars.png)!important;}.k-info-icon{background-image:url(img/info.gif)!important;}.k-newgroup-icon{background-image:url(img/kune-icon16.png)!important;}.k-colors-icon{background-image:url(img/colors.gif)!important;}.x-toolbar-body table{/* width: 100%; */}.k-preview-msg{background:#FCA;}.k-preview-msg-lab{background:#FCA;padding:0 5px;}.k-eil-edit{border:thin solid #000;}/* duplicated in rte.css */.k-rte-comment{border:1px dashed silver;line-height:1.4;padding:1px;background-color:#D7FFD7;}.k-specialchar-grid{border:1px solid #ACA899;}.k-specialchar-grid table{}.k-specialchar-grid div{line-height:22px;}.k-specialchar-grid td{padding:1px;}.k-specialchar-pb{border:1px solid #EBE8D7;cursor:pointer;font-size:108%!important;text-align:center;vertical-align:middle;width:18px;height:18px;}.k-specialchar-pb-up{}.k-specialchar-big{padding:3px;line-height:22px;font-size:153.899994%!important;}.k-specialchar-adv-label{margin-left:-10px;}.k-specialchar-popup,{border:1px px solid silver;z-index:9999!important;background-color:#FFF;}.k-specialchar-pb-down{color:#161616;}.k-specialchar-pb-up-hovering{border:thin solid #ACA899;}.k-specialchar-pb-down-hovering{color:#161616;}.k-preview-panel{border:dashed 1px gray;padding:5px;}.k-rte-changelink{white-space:nowrap;color:navy;cursor:pointer;text-decoration:underline;margin:5px;}.k-rte-changelink-popup{border:1px solid silver;z-index:9999!important;background-color:#ECECEC;}.e-ui-room{height:27px;line-height:22px;}.e-ui-room input{font-size:100%;margin-left:0;margin-top:0;} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2009-04-28 12:53:10 UTC (rev 1102) @@ -973,6 +973,7 @@ .k-preview-panel { border: dashed 1px gray; + padding: 5px; } .k-rte-changelink { Copied: trunk/src/main/java/org/ourproject/kune/platf/client/dto/ExtMediaDescripDTO.java (from rev 1100, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptor.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptor.java 2009-04-24 02:28:18 UTC (rev 1100) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/ExtMediaDescripDTO.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -0,0 +1,107 @@ +package org.ourproject.kune.platf.client.dto; + +import com.google.gwt.user.client.rpc.IsSerializable; + +public class ExtMediaDescripDTO implements IsSerializable { + + public static final String URL = "###URL###"; + public static final String HEIGHT = "###HEIGHT###"; + public static final String WIDTH = "###WIDTH###"; + + private String name; + private String siteurl; + private String detectRegex; + private String idRegex; + private String embedTemplate; + private int width; + + private int height; + + public ExtMediaDescripDTO() { + this(null, null, null, null, null, 0, 0); + } + + public ExtMediaDescripDTO(final String name, final String siteurl, final String detectRegex, + final String idRegex, final String embedTemplate, final int defWidth, final int defHeight) { + this.name = name; + this.siteurl = siteurl; + this.detectRegex = detectRegex; + this.idRegex = idRegex; + this.embedTemplate = embedTemplate; + width = defWidth; + height = defHeight; + } + + public String getDetectRegex() { + return detectRegex; + } + + public String getEmbed(final String url) { + String id = getId(url); + String result = embedTemplate.replaceAll(URL, id); + result = result.replaceAll(HEIGHT, "" + height); + result = result.replaceAll(WIDTH, "" + width); + return result; + } + + public String getEmbedTemplate() { + return embedTemplate; + } + + public int getHeight() { + return height; + } + + public String getId(final String url) { + String id = url.replaceFirst(idRegex, "$1"); + return id; + } + + public String getIdRegex() { + return idRegex; + } + + public String getName() { + return name; + } + + public String getSiteurl() { + return siteurl; + } + + public int getWidth() { + return width; + } + + public boolean is(final String url) { + return url.matches(detectRegex); + } + + public void setDetectRegex(final String detectRegex) { + this.detectRegex = detectRegex; + } + + public void setEmbedTemplate(final String embedTemplate) { + this.embedTemplate = embedTemplate; + } + + public void setHeight(final int height) { + this.height = height; + } + + public void setIdRegex(final String idRegex) { + this.idRegex = idRegex; + } + + public void setName(final String name) { + this.name = name; + } + + public void setSiteurl(final String siteurl) { + this.siteurl = siteurl; + } + + public void setWidth(final int width) { + this.width = width; + } +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -20,6 +20,7 @@ package org.ourproject.kune.platf.client.dto; import java.util.ArrayList; +import java.util.List; import com.google.gwt.user.client.rpc.IsSerializable; @@ -48,14 +49,11 @@ private int imgIconsize; private ArrayList<ToolSimpleDTO> userTools; private ArrayList<ToolSimpleDTO> groupTools; - private String flvEmbedObject; - private String oggEmbedObject; - private String mp3EmbedObject; - private String aviEmbedObject; + private List<ExtMediaDescripDTO> extMediaDescrips; public String getAviEmbedObject() { return aviEmbedObject; @@ -89,6 +87,10 @@ return defaultWsTheme; } + public List<ExtMediaDescripDTO> getExtMediaDescrips() { + return extMediaDescrips; + } + public String getFlvEmbedObject() { return flvEmbedObject; } @@ -201,6 +203,10 @@ this.defaultWsTheme = defaultWsTheme; } + public void setExtMediaDescrips(final List<ExtMediaDescripDTO> extMediaDescrips) { + this.extMediaDescrips = extMediaDescrips; + } + public void setFlvEmbedObject(final String flvEmbedObject) { this.flvEmbedObject = flvEmbedObject; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -520,7 +520,7 @@ register(Singleton.class, new Factory<ExternalMediaRegistry>(ExternalMediaRegistry.class) { @Override public ExternalMediaRegistry create() { - return new ExternalMediaRegistry(); + return new ExternalMediaRegistry($(Session.class).getInitData().getExtMediaDescrips()); }}); $(ApplicationComponentGroup.class).createAll(); Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -0,0 +1,43 @@ +package org.ourproject.kune.platf.client.ui.rte.insertimg; + +import org.cobogw.gwt.user.client.CSS; +import org.ourproject.kune.platf.client.i18n.Resources; + +import com.google.gwt.dom.client.Element; +import com.google.gwt.user.client.DOM; + +public class ContentPosition { + + public static final String LEFT = "left"; + public static final String CENTER = "center"; + public static final String RIGHT = "right"; + + public static String[][] positions = { new String[] { LEFT }, new String[] { CENTER }, new String[] { RIGHT } }; + + private static Object[][] positionObjs; + + public static Element getElementPosition(final Element element, final boolean wraptext, final String position) { + if (!wraptext || position.equals(ContentPosition.CENTER)) { + com.google.gwt.user.client.Element divEl = DOM.createDiv(); + CSS.setProperty(divEl, CSS.A.TEXT_ALIGN, position); + divEl.setInnerHTML(element.getString()); + return divEl; + } else { + CSS.setProperty(element, CSS.A.FLOAT, position); + return element; + } + } + + public static Object[][] getPositions() { + if (positionObjs == null) { + String[][] values = positions; + positionObjs = new Object[values.length][1]; + int i = 0; + for (String[] position : values) { + final Object[] obj = new Object[] { position[0], Resources.i18n.t(position[0]) }; + positionObjs[i++] = obj; + } + } + return positionObjs; + } +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -18,13 +18,7 @@ public static final String SIZE_M = "m"; public static final String SIZE_L = "l"; public static final String SIZE_XL = "xl"; - public static final String POSITION_LEFT = "left"; - public static final String POSITION_CENTER = "center"; - public static final String POSITION_RIGHT = "right"; - public static String[][] positions = { new String[] { POSITION_LEFT }, new String[] { POSITION_CENTER }, - new String[] { POSITION_RIGHT } }; - public static String[][] sizes = { new String[] { SIZE_ORIGINAL, "Original image size", "" }, new String[] { SIZE_FIT, "Fit page width", "100%" }, new String[] { SIZE_XS, "Thumbnail, up to 160 pixels wide", "160px" }, @@ -111,15 +105,7 @@ com.google.gwt.user.client.Element img = DOM.createImg(); DOM.setElementProperty(img, "src", src); CSS.setProperty(img, CSS.A.WIDTH, getStyleSize()); - if (!wraptext || position.equals(POSITION_CENTER)) { - com.google.gwt.user.client.Element divEl = DOM.createDiv(); - CSS.setProperty(divEl, CSS.A.TEXT_ALIGN, position); - divEl.setInnerHTML(img.getString()); - return divEl; - } else { - CSS.setProperty(img, CSS.A.FLOAT, position); - return img; - } + return ContentPosition.getElementPosition(img, wraptext, position); } private String getStyleSize() { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -46,6 +46,6 @@ private void initImageInfo() { imageInfo = new ImageInfo("", ImageInfo.DEF_WRAP_VALUE, ImageInfo.DEF_CLICK_ORIGINAL_VALUE, - ImageInfo.POSITION_LEFT, ImageInfo.SIZE_ORIGINAL); + ContentPosition.LEFT, ImageInfo.SIZE_ORIGINAL); } } Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertElementAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertElementAbstractPanel.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertElementAbstractPanel.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -0,0 +1,117 @@ +package org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg; + +import org.ourproject.kune.platf.client.i18n.Resources; +import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; +import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition; +import org.ourproject.kune.platf.client.ui.rte.insertimg.ImageInfo; + + +import com.gwtext.client.data.Record; +import com.gwtext.client.data.SimpleStore; +import com.gwtext.client.data.Store; +import com.gwtext.client.widgets.Component; +import com.gwtext.client.widgets.form.Checkbox; +import com.gwtext.client.widgets.form.ComboBox; +import com.gwtext.client.widgets.form.FieldSet; +import com.gwtext.client.widgets.form.Label; +import com.gwtext.client.widgets.form.event.ComboBoxListenerAdapter; + +public class InsertElementAbstractPanel extends DefaultForm { + + protected final ComboBox positionCombo; + protected final Checkbox wrapText; + protected final Label intro; + protected final FieldSet advanced; + + public InsertElementAbstractPanel(final String title, final int height) { + super(title); + super.setAutoWidth(true); + super.setHeight(height); + super.getFormPanel().setLabelWidth(DEF_FIELD_LABEL_WITH + 20); + + intro = new Label(); + + final Store storePositions = new SimpleStore(new String[] { "abbr", "trans" }, ContentPosition.getPositions()); + storePositions.load(); + + positionCombo = createCombo(storePositions, Resources.i18n.t("Position")); + + wrapText = new Checkbox(Resources.i18n.t("Wrap text around")); + wrapText.setChecked(ImageInfo.DEF_WRAP_VALUE); + + positionCombo.addListener(new ComboBoxListenerAdapter() { + @Override + public void onSelect(final ComboBox comboBox, final Record record, final int index) { + String pos = record.getAsString("abbr"); + // presenter.setPosition(pos); + setWrapVisible(pos); + } + }); + + advanced = new FieldSet(Resources.i18n.t("More options")); + advanced.setCollapsible(true); + advanced.setCollapsed(true); + advanced.setAutoHeight(true); + advanced.setAutoWidth(true); + advanced.setAutoScroll(false); + advanced.addClass("kune-Margin-Large-t"); + // advanced.setPaddings(10, 0, 0, 0); + + advanced.add(positionCombo); + advanced.add(wrapText); + add(intro); + add(advanced); + } + + public String getPosition() { + return positionCombo.getValueAsString(); + } + + public String getSrc() { + return null; + } + + public boolean getWrapText() { + return wrapText.getValue(); + } + + @Override + public void insert(final int index, final Component component) { + super.insert(index, component); + } + + public void setIntro(final String text) { + intro.setHtml(text); + } + + private ComboBox createCombo(final Store storeSizes, final String title) { + ComboBox cb = new ComboBox(); + cb.setEditable(false); + cb.setForceSelection(true); + cb.setMinChars(1); + cb.setFieldLabel(title); + cb.setStore(storeSizes); + cb.setDisplayField("trans"); + cb.setValueField("abbr"); + cb.setMode(ComboBox.LOCAL); + cb.setTriggerAction(ComboBox.ALL); + cb.setTypeAhead(true); + cb.setSelectOnFocus(true); + cb.setWidth(DEF_FIELD_WIDTH); + cb.setHideTrigger(false); + cb.setAllowBlank(false); + cb.setValidationEvent(false); + cb.setListWidth(DEF_FIELD_WIDTH + 30); + cb.setResizable(true); + return cb; + } + + private void setWrapVisible(final String position) { + if (position.equals(ContentPosition.CENTER)) { + wrapText.setVisible(false); + } else { + wrapText.setVisible(true); + } + } + +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -1,7 +1,7 @@ package org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg; import org.ourproject.kune.platf.client.i18n.Resources; -import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; +import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition; import org.ourproject.kune.platf.client.ui.rte.insertimg.ImageInfo; import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialogView; @@ -12,44 +12,26 @@ import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.form.Checkbox; import com.gwtext.client.widgets.form.ComboBox; -import com.gwtext.client.widgets.form.FieldSet; -import com.gwtext.client.widgets.form.Label; import com.gwtext.client.widgets.form.event.CheckboxListenerAdapter; import com.gwtext.client.widgets.form.event.ComboBoxListenerAdapter; import com.gwtext.client.widgets.form.event.FormPanelListenerAdapter; -public class InsertImageAbstractPanel extends DefaultForm implements InsertImageAbstractView { +public class InsertImageAbstractPanel extends InsertElementAbstractPanel implements InsertImageAbstractView { private Object[][] sizesObjs; - private Object[][] positionObjs; private final ComboBox sizeCombo; - private final ComboBox positionCombo; - protected final Checkbox wrapText; protected final Checkbox clickOriginal; - private final Label intro; private final InsertImageAbstractPresenter presenter; public InsertImageAbstractPanel(final String title, final InsertImageAbstractPresenter presenter) { - super(title); + super(title, InsertImageDialogView.HEIGHT); this.presenter = presenter; - super.setAutoWidth(true); - super.setHeight(InsertImageDialogView.HEIGHT); - super.getFormPanel().setLabelWidth(DEF_FIELD_LABEL_WITH + 20); - intro = new Label(); - final Store storeSizes = new SimpleStore(new String[] { "abbr", "trans", "size" }, getSizes()); storeSizes.load(); - final Store storePositions = new SimpleStore(new String[] { "abbr", "trans" }, getPositions()); - storePositions.load(); - sizeCombo = createCombo(storeSizes, Resources.i18n.t("Size")); - positionCombo = createCombo(storePositions, Resources.i18n.t("Position")); - wrapText = new Checkbox(Resources.i18n.t("Wrap text around image")); - wrapText.setChecked(ImageInfo.DEF_WRAP_VALUE); - clickOriginal = new Checkbox(Resources.i18n.t("Clicking this image links to the original image file")); clickOriginal.setChecked(ImageInfo.DEF_CLICK_ORIGINAL_VALUE); clickOriginal.setWidth(DEF_FIELD_WIDTH); @@ -65,9 +47,9 @@ positionCombo.addListener(new ComboBoxListenerAdapter() { @Override public void onSelect(final ComboBox comboBox, final Record record, final int index) { + super.onSelect(comboBox, record, index); String pos = record.getAsString("abbr"); presenter.setPosition(pos); - setWrapVisible(pos); } }); @@ -94,27 +76,15 @@ } }); - FieldSet advanced = new FieldSet(Resources.i18n.t("More options")); - advanced.setCollapsible(true); - advanced.setCollapsed(true); - advanced.setAutoHeight(true); - advanced.setAutoWidth(true); - advanced.setAutoScroll(false); - advanced.addClass("kune-Margin-Large-t"); - // advanced.setPaddings(10, 0, 0, 0); - advanced.add(sizeCombo); - advanced.add(positionCombo); - advanced.add(wrapText); advanced.add(clickOriginal); - add(intro); - add(advanced); } public boolean getClickOriginal() { return clickOriginal.getValue(); } + @Override public String getPosition() { return positionCombo.getValueAsString(); } @@ -123,10 +93,12 @@ return sizeCombo.getValueAsString(); } + @Override public String getSrc() { return null; } + @Override public boolean getWrapText() { return wrapText.getValue(); } @@ -143,6 +115,7 @@ updateValues(linkImage); } + @Override public void setIntro(final String text) { intro.setHtml(text); } @@ -178,19 +151,6 @@ return cb; } - private Object[][] getPositions() { - if (positionObjs == null) { - String[][] values = ImageInfo.positions; - positionObjs = new Object[values.length][1]; - int i = 0; - for (String[] position : values) { - final Object[] obj = new Object[] { position[0], Resources.i18n.t(position[0]) }; - positionObjs[i++] = obj; - } - } - return positionObjs; - } - private Object[][] getSizes() { if (sizesObjs == null) { String[][] values = ImageInfo.sizes; @@ -205,7 +165,7 @@ } private void setWrapVisible(final String position) { - if (position.equals(ImageInfo.POSITION_CENTER)) { + if (position.equals(ContentPosition.CENTER)) { wrapText.setVisible(false); } else { wrapText.setVisible(true); Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptor.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptor.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -1,68 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.insertmedia; - -public class ExternalMediaDescriptor { - - public static final String URL = "###URL###"; - public static final String HEIGHT = "###HEIGHT###"; - public static final String WIDTH = "###WIDTH###"; - - private final String name; - private final String siteurl; - private final String detectRegex; - private final String idRegex; - private final String embedTemplate; - private int width; - private int height; - - public ExternalMediaDescriptor(final String name, final String siteurl, final String detectRegex, - final String idRegex, final String embedTemplate, final int defWidth, final int defHeight) { - this.name = name; - this.siteurl = siteurl; - this.detectRegex = detectRegex; - this.idRegex = idRegex; - this.embedTemplate = embedTemplate; - width = defWidth; - height = defHeight; - } - - public String getEmbed(final String url) { - String id = getId(url); - String result = embedTemplate.replaceAll(URL, id); - result = result.replaceAll(HEIGHT, "" + height); - result = result.replaceAll(WIDTH, "" + width); - return result; - } - - public int getHeight() { - return height; - } - - public String getId(final String url) { - String id = url.replaceFirst(idRegex, "$1"); - return id; - } - - public String getName() { - return name; - } - - public String getSiteurl() { - return siteurl; - } - - public int getWidth() { - return width; - } - - public boolean is(final String url) { - return url.matches(detectRegex); - } - - public void setHeight(final int height) { - this.height = height; - } - - public void setWidth(final int width) { - this.width = width; - } -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -2,16 +2,23 @@ import java.util.ArrayList; import java.util.Iterator; +import java.util.List; -public class ExternalMediaRegistry extends ArrayList<ExternalMediaDescriptor> { +import org.ourproject.kune.platf.client.dto.ExtMediaDescripDTO; +import org.ourproject.kune.platf.client.ui.TextUtils; +public class ExternalMediaRegistry extends ArrayList<ExtMediaDescripDTO> { + private static final long serialVersionUID = 1L; - public static final ExternalMediaDescriptor NO_MEDIA = new ExternalMediaDescriptor(null, null, null, null, null, 0, - 0); + public static final ExtMediaDescripDTO NO_MEDIA = new ExtMediaDescripDTO(null, null, null, null, null, 0, 0); - public ExternalMediaDescriptor get(final String url) { - for (ExternalMediaDescriptor media : this) { + public ExternalMediaRegistry(final List<ExtMediaDescripDTO> extMediaDescrips) { + super(extMediaDescrips); + } + + public ExtMediaDescripDTO get(final String url) { + for (ExtMediaDescripDTO media : this) { if (media.is(url)) { return media; } @@ -22,9 +29,9 @@ public String getNames() { String names = ""; - for (Iterator<ExternalMediaDescriptor> iterator = this.iterator(); iterator.hasNext();) { - ExternalMediaDescriptor elem = iterator.next(); - names += elem.getName(); + for (Iterator<ExtMediaDescripDTO> iterator = this.iterator(); iterator.hasNext();) { + ExtMediaDescripDTO elem = iterator.next(); + names += TextUtils.generateHtmlLink(elem.getSiteurl(), elem.getName()); if (iterator.hasNext()) { names += ", "; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogView.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogView.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -4,6 +4,6 @@ public interface InsertMediaDialogView extends View { - int HEIGHT = 150; + int HEIGHT = 250; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -1,27 +1,23 @@ package org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia; import org.ourproject.kune.platf.client.i18n.Resources; -import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; +import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition; +import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertElementAbstractPanel; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialogView; +import com.google.gwt.user.client.ui.HTML; import com.gwtext.client.widgets.Component; import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.form.Label; import com.gwtext.client.widgets.form.TextField; import com.gwtext.client.widgets.form.event.FormPanelListenerAdapter; -public class InsertMediaAbstractPanel extends DefaultForm implements InsertMediaAbstractView { +public class InsertMediaAbstractPanel extends InsertElementAbstractPanel implements InsertMediaAbstractView { protected TextField hrefField; - private final Label intro; public InsertMediaAbstractPanel(final String title, final InsertMediaAbstractPresenter presenter) { - super(title); - super.setAutoWidth(true); - super.setHeight(InsertMediaDialogView.HEIGHT); + super(title, InsertMediaDialogView.HEIGHT); - intro = new Label(); - hrefField = new TextField(); hrefField.setTabIndex(1); hrefField.setLabel(Resources.i18n.t("Link")); @@ -38,10 +34,11 @@ } }); - add(intro); - add(hrefField); + insert(1, hrefField); + defValues(); } + @Override public String getSrc() { return hrefField.getRawValue(); } @@ -51,7 +48,24 @@ super.insert(index, component); } + @Override + public void reset() { + defValues(); + super.reset(); + } + + @Override public void setIntro(final String text) { intro.setHtml(text + "<br/>"); } + + public String setPosition(final String embedElement) { + return ContentPosition.getElementPosition(new HTML(embedElement).getElement(), getWrapText(), getPosition()).getString(); + } + + private void defValues() { + wrapText.setVisible(true); + wrapText.setChecked(true); + positionCombo.setValue(ContentPosition.RIGHT); + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractView.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractView.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -10,4 +10,6 @@ void reset(); + String setPosition(String embedElement); + } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPanel.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPanel.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -10,7 +10,8 @@ final ExternalMediaRegistry externalMediaRegistry) { super(i18n.t("External"), presenter); String supportedVideos = externalMediaRegistry.getNames(); - setIntro(i18n.t("Provide a link to the external video (supported videos: [%s])", supportedVideos) + "<br/>"); + setIntro(i18n.t("Provide a link to an external video (supported videos: [%s])", supportedVideos) + "<br/>"); + hrefField.setTitle(i18n.t("Write something like: http://www.youtube.com/watch?v=PxsGyljd6B0")); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -1,7 +1,7 @@ package org.ourproject.kune.platf.client.ui.rte.insertmedia.ext; +import org.ourproject.kune.platf.client.dto.ExtMediaDescripDTO; import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.ExternalMediaDescriptor; import org.ourproject.kune.platf.client.ui.rte.insertmedia.ExternalMediaRegistry; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPresenter; @@ -10,34 +10,12 @@ private InsertMediaExtView view; private final ExternalMediaRegistry externalMediaRegistry; - private ExternalMediaDescriptor mediaDescriptor; + private ExtMediaDescripDTO mediaDescriptor; public InsertMediaExtPresenter(final InsertMediaDialog insertMediaDialog, final ExternalMediaRegistry externalMediaRegistry) { super(insertMediaDialog); this.externalMediaRegistry = externalMediaRegistry; - - externalMediaRegistry.add(new ExternalMediaDescriptor( - "youtube", - "http://youtube.com", - ".*youtube.*", - ".*youtube.com/watch.*[\\?&]v=(.*)", - "<object width=\"###WIDTH###\" height=\"###HEIGHT###\"><param name=\"movie\" value=\"http://youtube.com/v/###URL###\" /><param name=\"wmode\" value=\"opaque\" /><embed src=\"http://youtube.com/v/###URL###\" type=\"application/x-shockwave-flash\" width=\"###WIDTH###\" height=\"###HEIGHT###\" wmode=\"opaque\"></embed></object>", - 480, 385)); - externalMediaRegistry.add(new ExternalMediaDescriptor( - "blip.tv", - "http://blip.tv", - ".*blip\\.tv.*", - ".*blip.tv/file/([0-9]+).*", - "<embed src=\"http://blip.tv/play/###URL###\" type=\"application/x-shockwave-flash\" width=\"###WIDTH###\" height=\"###HEIGHT###\" allowscriptaccess=\"always\" allowfullscreen=\"true\" wmode=\"opaque\" ></embed>", - 480, 385)); - externalMediaRegistry.add(new ExternalMediaDescriptor( - "google video", - "http://video.google.com/", - ".*video\\.google.*", - ".*video\\.google\\.com/videoplay.*docid=([0-9]+).*", - "<embed id=\"VideoPlayback\" src=\"http://video.google.com/googleplayer.swf?docid=###URL###&hl=es&fs=true\" style=\"width:###WIDTH###;height:###HEIGHT###\" allowFullScreen=\"true\" allowScriptAccess=\"always\" type=\"application/x-shockwave-flash\" wmode=\"opaque\" > </embed>", - 400, 326)); } public void init(final InsertMediaExtView view) { @@ -59,6 +37,6 @@ @Override protected String updateMediaInfo() { - return mediaDescriptor.getEmbed(view.getSrc()); + return view.setPosition(mediaDescriptor.getEmbed(view.getSrc())); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -24,7 +24,7 @@ private final TextField inputUnicodeField; private final TextField previewField; - public InsertSpecialUTF8CharPanel(I18nTranslationService i18n, final InsertSpecialCharDialog charDialog) { + public InsertSpecialUTF8CharPanel(final I18nTranslationService i18n, final InsertSpecialCharDialog charDialog) { super(i18n.t("Advanced")); setAutoWidth(true); setHeight(InsertSpecialCharDialogView.HEIGHT - 10); @@ -34,9 +34,8 @@ Label label = new Label(); label.setHtml(i18n.t("If you know a special character's [%s] value, enter it below.", - "<a href=\"http://unicode.org/charts/\" target=\"_blank\">Unicode</a>") + TextUtils.generateHtmlLink("http://unicode.org/charts/", "Unicode")) + "<br/><br/>"); - // label.setCls("k-specialchar-adv-label"); inputUnicodeField = new TextField(); inputUnicodeField.setTabIndex(4); @@ -57,7 +56,7 @@ previewField.setStyle("background-color:#FFF;background-image:none;color:#000;"); inputUnicodeField.addKeyPressListener(new EventCallback() { - public void execute(EventObject e) { + public void execute(final EventObject e) { refreshPreview(); } }); @@ -70,7 +69,7 @@ insert.addListener(new ButtonListenerAdapter() { @Override - public void onClick(Button button, EventObject e) { + public void onClick(final Button button, final EventObject e) { if (form.getFormPanel().getForm().isValid()) { charDialog.onInsert(getCharEntered()); } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.List; +import org.ourproject.kune.platf.server.domain.ExtMediaDescrip; import org.ourproject.kune.platf.server.domain.I18nCountry; import org.ourproject.kune.platf.server.domain.I18nLanguage; import org.ourproject.kune.platf.server.domain.License; @@ -53,6 +54,7 @@ private int imgIconsize; private ArrayList<ToolSimple> userTools; private ArrayList<ToolSimple> groupTools; + private List<ExtMediaDescrip> extMediaDescrips; private String flvEmbedObject; @@ -94,6 +96,10 @@ return defaultWsTheme; } + public List<ExtMediaDescrip> getExtMediaDescrips() { + return extMediaDescrips; + } + public String getFlvEmbedObject() { return flvEmbedObject; } @@ -202,6 +208,10 @@ this.defaultWsTheme = defaultWsTheme; } + public void setExtMediaDescrips(final List<ExtMediaDescrip> extMediaDescrips) { + this.extMediaDescrips = extMediaDescrips; + } + public void setFlvEmbedObject(final String flvEmbedObject) { this.flvEmbedObject = flvEmbedObject; } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -52,6 +52,7 @@ import org.ourproject.kune.platf.server.content.CreationService; import org.ourproject.kune.platf.server.content.CreationServiceDefault; import org.ourproject.kune.platf.server.i18n.I18nTranslationServiceDefault; +import org.ourproject.kune.platf.server.manager.ExtMediaDescripManager; import org.ourproject.kune.platf.server.manager.FileManager; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.I18nCountryManager; @@ -70,6 +71,7 @@ import org.ourproject.kune.platf.server.manager.file.FileDownloadManager; import org.ourproject.kune.platf.server.manager.file.FileManagerDefault; import org.ourproject.kune.platf.server.manager.file.FileUploadManager; +import org.ourproject.kune.platf.server.manager.impl.ExtMediaDescripManagerDefault; import org.ourproject.kune.platf.server.manager.impl.GroupManagerDefault; import org.ourproject.kune.platf.server.manager.impl.I18nCountryManagerDefault; import org.ourproject.kune.platf.server.manager.impl.I18nLanguageManagerDefault; @@ -140,6 +142,7 @@ bind(TagUserContentManager.class).to(TagUserContentManagerDefault.class); bind(CommentManager.class).to(CommentManagerDefault.class); bind(FileManager.class).to(FileManagerDefault.class); + bind(ExtMediaDescripManager.class).to(ExtMediaDescripManagerDefault.class); } private void bindRPC() { Added: trunk/src/main/java/org/ourproject/kune/platf/server/domain/ExtMediaDescrip.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/ExtMediaDescrip.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/ExtMediaDescrip.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -0,0 +1,119 @@ +package org.ourproject.kune.platf.server.domain; + +import java.util.List; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.hibernate.validator.Length; + +import com.wideplay.warp.persist.dao.Finder; + +@Entity +@Table(name = "ext_media_descriptors") +public class ExtMediaDescrip implements HasId { + + @Id + @GeneratedValue + private Long id; + @Column(nullable = false) + private String name; + @Column(nullable = false) + private String siteurl; + @Column(nullable = false) + private String detectRegex; + @Column(nullable = false) + private String idRegex; + @Column(nullable = false) + @Length(max = 1000) + private String embedTemplate; + private int width; + private int height; + + public ExtMediaDescrip() { + this(null, null, null, null, null, 0, 0); + } + + public ExtMediaDescrip(final String name, final String siteurl, final String detectRegex, final String idRegex, + final String embedTemplate, final int defWidth, final int defHeight) { + this.name = name; + this.siteurl = siteurl; + this.detectRegex = detectRegex; + this.idRegex = idRegex; + this.embedTemplate = embedTemplate; + width = defWidth; + height = defHeight; + } + + @Finder(query = "from ExtMediaDescrip") + public List<ExtMediaDescrip> getAll() { + return null; + } + + public String getDetectRegex() { + return detectRegex; + } + + public String getEmbedTemplate() { + return embedTemplate; + } + + public int getHeight() { + return height; + } + + public Long getId() { + return id; + } + + public String getIdRegex() { + return idRegex; + } + + public String getName() { + return name; + } + + public String getSiteurl() { + return siteurl; + } + + public int getWidth() { + return width; + } + + public void setDetectRegex(final String detectRegex) { + this.detectRegex = detectRegex; + } + + public void setEmbedTemplate(final String embedTemplate) { + this.embedTemplate = embedTemplate; + } + + public void setHeight(final int height) { + this.height = height; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setIdRegex(final String idRegex) { + this.idRegex = idRegex; + } + + public void setName(final String name) { + this.name = name; + } + + public void setSiteurl(final String siteurl) { + this.siteurl = siteurl; + } + + public void setWidth(final int width) { + this.width = width; + } +} Added: trunk/src/main/java/org/ourproject/kune/platf/server/manager/ExtMediaDescripManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/ExtMediaDescripManager.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/ExtMediaDescripManager.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -0,0 +1,28 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.ourproject.kune.platf.server.manager; + +import java.util.List; + +import org.ourproject.kune.platf.server.domain.ExtMediaDescrip; + +public interface ExtMediaDescripManager extends Manager<ExtMediaDescrip, Long> { + List<ExtMediaDescrip> getAll(); +} Added: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ExtMediaDescripManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ExtMediaDescripManagerDefault.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ExtMediaDescripManagerDefault.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -0,0 +1,29 @@ +package org.ourproject.kune.platf.server.manager.impl; + +import java.util.List; + +import javax.persistence.EntityManager; + +import org.ourproject.kune.platf.server.domain.ExtMediaDescrip; +import org.ourproject.kune.platf.server.manager.ExtMediaDescripManager; + +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.Singleton; + +@Singleton +public class ExtMediaDescripManagerDefault extends DefaultManager<ExtMediaDescrip, Long> implements + ExtMediaDescripManager { + + private final ExtMediaDescrip extMediaFinder; + + @Inject + public ExtMediaDescripManagerDefault(final Provider<EntityManager> provider, final ExtMediaDescrip extMediaFinder) { + super(provider, ExtMediaDescrip.class); + this.extMediaFinder = extMediaFinder; + } + + public List<ExtMediaDescrip> getAll() { + return extMediaFinder.getAll(); + } +} Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/LicenseManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/LicenseManagerDefault.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/LicenseManagerDefault.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -37,12 +37,14 @@ private final DatabaseProperties properties; @Inject - public LicenseManagerDefault(final Provider<EntityManager> provider, DatabaseProperties properties) { + public LicenseManagerDefault(final Provider<EntityManager> provider, final DatabaseProperties properties, + final License licenseFinder) { super(provider, License.class); this.properties = properties; + this.licenseFinder = licenseFinder; } - public License findByShortName(String shortName) { + public License findByShortName(final String shortName) { return licenseFinder.findByShortName(shortName); } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -28,7 +28,7 @@ import org.ourproject.kune.platf.server.manager.impl.SearchResult; import org.ourproject.kune.platf.server.mapper.Mapper; import org.ourproject.kune.rack.filters.rest.REST; -import org.ourproject.kune.workspace.client.search.SearcherContants; +import org.ourproject.kune.workspace.client.search.SearcherConstants; import com.google.inject.Inject; @@ -45,12 +45,12 @@ this.mapper = mapper; } - @REST(params = { SearcherContants.QUERY_PARAM }) + @REST(params = { SearcherConstants.QUERY_PARAM }) public SearchResultDTO<LinkDTO> search(final String search) { return search(search, null, null); } - @REST(params = { SearcherContants.QUERY_PARAM, SearcherContants.START_PARAM, SearcherContants.LIMIT_PARAM }) + @REST(params = { SearcherConstants.QUERY_PARAM, SearcherConstants.START_PARAM, SearcherConstants.LIMIT_PARAM }) public SearchResultDTO<LinkDTO> search(final String search, final Integer firstResult, final Integer maxResults) { SearchResult<Content> results = contentManager.search(search, firstResult, maxResults); SearchResult<Container> resultsContainer = containerManager.search(search, firstResult, maxResults); @@ -61,16 +61,16 @@ return resultMapped; } - @REST(params = { SearcherContants.QUERY_PARAM, SearcherContants.START_PARAM, SearcherContants.LIMIT_PARAM, - SearcherContants.GROUP_PARAM, SearcherContants.MIMETYPE_PARAM }) + @REST(params = { SearcherConstants.QUERY_PARAM, SearcherConstants.START_PARAM, SearcherConstants.LIMIT_PARAM, + SearcherConstants.GROUP_PARAM, SearcherConstants.MIMETYPE_PARAM }) public SearchResultDTO<LinkDTO> search(final String search, final Integer firstResult, final Integer maxResults, final String group, final String mimetype) { SearchResult<Content> results = contentManager.searchMime(search, firstResult, maxResults, group, mimetype); return map(results); } - @REST(params = { SearcherContants.QUERY_PARAM, SearcherContants.START_PARAM, SearcherContants.LIMIT_PARAM, - SearcherContants.GROUP_PARAM, SearcherContants.MIMETYPE_PARAM, SearcherContants.MIMETYPE2_PARAM }) + @REST(params = { SearcherConstants.QUERY_PARAM, SearcherConstants.START_PARAM, SearcherConstants.LIMIT_PARAM, + SearcherConstants.GROUP_PARAM, SearcherConstants.MIMETYPE_PARAM, SearcherConstants.MIMETYPE2_PARAM }) public SearchResultDTO<LinkDTO> search(final String search, final Integer firstResult, final Integer maxResults, final String group, final String mimetype, final String mimetype2) { return map(contentManager.searchMime(search, firstResult, maxResults, group, mimetype, mimetype2)); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -26,7 +26,7 @@ import org.ourproject.kune.platf.server.manager.impl.SearchResult; import org.ourproject.kune.platf.server.mapper.Mapper; import org.ourproject.kune.rack.filters.rest.REST; -import org.ourproject.kune.workspace.client.search.SearcherContants; +import org.ourproject.kune.workspace.client.search.SearcherConstants; import com.google.inject.Inject; @@ -40,12 +40,12 @@ this.mapper = mapper; } - @REST(params = { SearcherContants.QUERY_PARAM }) + @REST(params = { SearcherConstants.QUERY_PARAM }) public SearchResultDTO<LinkDTO> search(final String search) { return search(search, null, null); } - @REST(params = { SearcherContants.QUERY_PARAM, SearcherContants.START_PARAM, SearcherContants.LIMIT_PARAM }) + @REST(params = { SearcherConstants.QUERY_PARAM, SearcherConstants.START_PARAM, SearcherConstants.LIMIT_PARAM }) public SearchResultDTO<LinkDTO> search(final String search, final Integer firstResult, final Integer maxResults) { SearchResult<Group> results = manager.search(search, firstResult, maxResults); return mapper.mapSearchResult(results, LinkDTO.class); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -28,7 +28,7 @@ import org.ourproject.kune.platf.server.manager.impl.SearchResult; import org.ourproject.kune.platf.server.mapper.Mapper; import org.ourproject.kune.rack.filters.rest.REST; -import org.ourproject.kune.workspace.client.search.SearcherContants; +import org.ourproject.kune.workspace.client.search.SearcherConstants; import com.google.inject.Inject; @@ -42,26 +42,26 @@ this.mapper = mapper; } - @REST(params = { SearcherContants.QUERY_PARAM }) + @REST(params = { SearcherConstants.QUERY_PARAM }) public List<I18nTranslationDTO> search(final String language) { List<I18nTranslation> results = manager.getUntranslatedLexicon(language); return mapper.mapList(results, I18nTranslationDTO.class); } - @REST(params = { SearcherContants.QUERY_PARAM, SearcherContants.START_PARAM, SearcherContants.LIMIT_PARAM }) + @REST(params = { SearcherConstants.QUERY_PARAM, SearcherConstants.START_PARAM, SearcherConstants.LIMIT_PARAM }) public SearchResultDTO<I18nTranslationDTO> search(final String language, final Integer firstResult, final Integer maxResults) { SearchResult<I18nTranslation> results = manager.getUntranslatedLexicon(language, firstResult, maxResults); return mapper.mapSearchResult(results, I18nTranslationDTO.class); } - @REST(params = { SearcherContants.QUERY_PARAM }) + @REST(params = { SearcherConstants.QUERY_PARAM }) public List<I18nTranslationDTO> searchtranslated(final String language) { List<I18nTranslation> results = manager.getTranslatedLexicon(language); return mapper.mapList(results, I18nTranslationDTO.class); } - @REST(params = { SearcherContants.QUERY_PARAM, SearcherContants.START_PARAM, SearcherContants.LIMIT_PARAM }) + @REST(params = { SearcherConstants.QUERY_PARAM, SearcherConstants.START_PARAM, SearcherConstants.LIMIT_PARAM }) public SearchResultDTO<I18nTranslationDTO> searchtranslated(final String language, final Integer firstResult, final Integer maxResults) { SearchResult<I18nTranslation> results = manager.getTranslatedLexicon(language, firstResult, maxResults); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -26,7 +26,7 @@ import org.ourproject.kune.platf.server.manager.impl.SearchResult; import org.ourproject.kune.platf.server.mapper.Mapper; import org.ourproject.kune.rack.filters.rest.REST; -import org.ourproject.kune.workspace.client.search.SearcherContants; +import org.ourproject.kune.workspace.client.search.SearcherConstants; import com.google.inject.Inject; @@ -40,12 +40,12 @@ this.mapper = mapper; } - @REST(params = { SearcherContants.QUERY_PARAM }) + @REST(params = { SearcherConstants.QUERY_PARAM }) public SearchResultDTO<LinkDTO> search(final String search) { return search(search, null, null); } - @REST(params = { SearcherContants.QUERY_PARAM, SearcherContants.START_PARAM, SearcherContants.LIMIT_PARAM }) + @REST(params = { SearcherConstants.QUERY_PARAM, SearcherConstants.START_PARAM, SearcherConstants.LIMIT_PARAM }) public SearchResultDTO<LinkDTO> search(final String search, final Integer firstResult, final Integer maxResults) { SearchResult<User> results = manager.search(search, firstResult, maxResults); return mapper.mapSearchResult(results, LinkDTO.class); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -26,6 +26,7 @@ import org.ourproject.kune.platf.client.rpc.SiteService; import org.ourproject.kune.platf.server.InitData; import org.ourproject.kune.platf.server.UserSession; +import org.ourproject.kune.platf.server.manager.ExtMediaDescripManager; import org.ourproject.kune.platf.server.manager.I18nCountryManager; import org.ourproject.kune.platf.server.manager.I18nLanguageManager; import org.ourproject.kune.platf.server.manager.LicenseManager; @@ -54,6 +55,7 @@ private final I18nLanguageManager languageManager; private final I18nCountryManager countryManager; private final ServerToolRegistry serverToolRegistry; + private final ExtMediaDescripManager extMediaDescripManager; // TODO: refactor: too many parameters! refactor to Facade Pattern @Inject @@ -61,7 +63,7 @@ final UserInfoService userInfoService, final LicenseManager licenseManager, final Mapper mapper, final KuneProperties kuneProperties, final ChatProperties chatProperties, final I18nLanguageManager languageManager, final I18nCountryManager countryManager, - final ServerToolRegistry serverToolRegistry) { + final ServerToolRegistry serverToolRegistry, final ExtMediaDescripManager extMediaDescripManager) { this.userSessionProvider = userSessionProvider; this.userManager = userManager; this.userInfoService = userInfoService; @@ -72,6 +74,7 @@ this.languageManager = languageManager; this.countryManager = countryManager; this.serverToolRegistry = serverToolRegistry; + this.extMediaDescripManager = extMediaDescripManager; } @Transactional(type = TransactionType.READ_ONLY) @@ -107,6 +110,7 @@ data.setMp3EmbedObject(kuneProperties.get(KuneProperties.MP3_EMBEDED_OBJECT)); data.setOggEmbedObject(kuneProperties.get(KuneProperties.OGG_EMBEDED_OBJECT)); data.setAviEmbedObject(kuneProperties.get(KuneProperties.AVI_EMBEDED_OBJECT)); + data.setExtMediaDescrips(extMediaDescripManager.getAll()); return mapper.map(data, InitDataDTO.class); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -8,7 +8,7 @@ import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertImageAbstractPanel; import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; -import org.ourproject.kune.workspace.client.search.SearcherContants; +import org.ourproject.kune.workspace.client.search.SearcherConstants; import com.calclab.suco.client.events.Listener; import com.gwtext.client.core.UrlParam; @@ -24,9 +24,9 @@ super(i18n.t("Local"), presenter); final AbstractLiveSearcherField cb = new AbstractLiveSearcherField(i18n, - SearcherContants.CONTENT_TEMPLATE_TEXT_PREFIX + SearcherConstants.CONTENT_TEMPLATE_TEXT_PREFIX + downloadUtils.getLogoImageUrl(new StateToken("{shortName}")) - + SearcherContants.CONTENT_TEMPLATE_TEXT_SUFFIX, SearcherContants.CONTENT_DATA_PROXY_URL, + + SearcherConstants.CONTENT_TEMPLATE_TEXT_SUFFIX, SearcherConstants.CONTENT_DATA_PROXY_URL, new Listener<LinkDTO>() { public void onEvent(final LinkDTO link) { src = session.getSiteUrl() + downloadUtils.getImageUrl(new StateToken(link.getLink())); @@ -40,8 +40,8 @@ @Override public void onFocus(final Field field) { cb.setStoreBaseParams(new UrlParam[] { - new UrlParam(SearcherContants.GROUP_PARAM, presenter.getCurrentGroupName()), - new UrlParam(SearcherContants.MIMETYPE_PARAM, BasicMimeTypeDTO.IMAGE) }); + new UrlParam(SearcherConstants.GROUP_PARAM, presenter.getCurrentGroupName()), + new UrlParam(SearcherConstants.MIMETYPE_PARAM, BasicMimeTypeDTO.IMAGE) }); } }); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -26,7 +26,7 @@ import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPanel; import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; -import org.ourproject.kune.workspace.client.search.SearcherContants; +import org.ourproject.kune.workspace.client.search.SearcherConstants; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.calclab.suco.client.events.Listener; @@ -41,9 +41,9 @@ super(i18n.t("Local link"), presenter); AbstractLiveSearcherField cb = new AbstractLiveSearcherField(i18n, - SearcherContants.CONTENT_TEMPLATE_TEXT_PREFIX + SearcherConstants.CONTENT_TEMPLATE_TEXT_PREFIX + downloadUtils.getLogoImageUrl(new StateToken("{shortName}")) - + SearcherContants.CONTENT_TEMPLATE_TEXT_SUFFIX, SearcherContants.CONTENT_DATA_PROXY_URL, + + SearcherConstants.CONTENT_TEMPLATE_TEXT_SUFFIX, SearcherConstants.CONTENT_DATA_PROXY_URL, new Listener<LinkDTO>() { public void onEvent(final LinkDTO link) { href = stateTokenUtils.getPublicUrl(new StateToken(link.getLink())); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -7,7 +7,7 @@ import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPanel; import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; -import org.ourproject.kune.workspace.client.search.SearcherContants; +import org.ourproject.kune.workspace.client.search.SearcherConstants; import com.calclab.suco.client.events.Listener; import com.gwtext.client.core.UrlParam; @@ -23,9 +23,9 @@ super(i18n.t("Local"), presenter); final AbstractLiveSearcherField cb = new AbstractLiveSearcherField(i18n, - SearcherContants.CONTENT_TEMPLATE_TEXT_PREFIX + SearcherConstants.CONTENT_TEMPLATE_TEXT_PREFIX + downloadUtils.getLogoImageUrl(new StateToken("{shortName}")) - + SearcherContants.CONTENT_TEMPLATE_TEXT_SUFFIX, SearcherContants.CONTENT_DATA_PROXY_URL, + + SearcherConstants.CONTENT_TEMPLATE_TEXT_SUFFIX, SearcherConstants.CONTENT_DATA_PROXY_URL, new Listener<LinkDTO>() { public void onEvent(final LinkDTO link) { src = link.getLink(); @@ -39,9 +39,9 @@ @Override public void onFocus(final Field field) { cb.setStoreBaseParams(new UrlParam[] { - new UrlParam(SearcherContants.GROUP_PARAM, presenter.getCurrentGroupName()), - new UrlParam(SearcherContants.MIMETYPE_PARAM, BasicMimeTypeDTO.AUDIO), - new UrlParam(SearcherContants.MIMETYPE2_PARAM, BasicMimeTypeDTO.VIDEO) }); + new UrlParam(SearcherConstants.GROUP_PARAM, presenter.getCurrentGroupName()), + new UrlParam(SearcherConstants.MIMETYPE_PARAM, BasicMimeTypeDTO.AUDIO), + new UrlParam(SearcherConstants.MIMETYPE2_PARAM, BasicMimeTypeDTO.VIDEO) }); } }); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -31,6 +31,6 @@ @Override protected String updateMediaInfo() { // FIXME (avi, mp3, ...) - return mediaUtils.get().getFlvEmbed(new StateToken(view.getSrc())); + return view.setPosition(mediaUtils.get().getFlvEmbed(new StateToken(view.getSrc()))); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -21,10 +21,10 @@ import org.ourproject.kune.platf.client.dto.LicenseDTO; import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import org.ourproject.kune.platf.client.ui.KuneWindowUtils; import org.ourproject.kune.platf.client.ui.SimpleToolbar; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; @@ -56,7 +56,7 @@ licenseBar.add(licenseLabel); final ClickListener clickListener = new ClickListener() { - public void onClick(Widget arg0) { + public void onClick(final Widget arg0) { presenter.onLicenseClick(); } }; @@ -66,12 +66,12 @@ MouseListenerAdapter mouseListenerAdapter = new MouseListenerAdapter() { @Override - public void onMouseEnter(Widget sender) { + public void onMouseEnter(final Widget sender) { fade(true); } @Override - public void onMouseLeave(Widget sender) { + public void onMouseLeave(final Widget sender) { // fade(false); } }; @@ -94,7 +94,7 @@ } public void openWindow(final String url) { - Window.open(url, "_blank", ""); + KuneWindowUtils.open(url); } public void showLicense(final String groupName, final LicenseDTO licenseDTO) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -41,9 +41,9 @@ store = new Store(dataProxy, reader); - store.load(new UrlParam[] { new UrlParam(SearcherContants.QUERY_PARAM, "."), - new UrlParam(SearcherContants.START_PARAM, 0), - new UrlParam(SearcherContants.LIMIT_PARAM, PAGINATION_SIZE) }); + store.load(new UrlParam[] { new UrlParam(SearcherConstants.QUERY_PARAM, "."), + new UrlParam(SearcherConstants.START_PARAM, 0), + new UrlParam(SearcherConstants.LIMIT_PARAM, PAGINATION_SIZE) }); final Template resultTpl = new Template(templateText); super.setStore(store); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -86,9 +86,9 @@ break; } - String templateText = SearcherContants.CONTENT_TEMPLATE_TEXT_PREFIX + String templateText = SearcherConstants.CONTENT_TEMPLATE_TEXT_PREFIX + downloadUtils.getLogoImageUrl(new StateToken("{shortName}")) - + SearcherContants.CONTENT_TEMPLATE_TEXT_SUFFIX; + + SearcherConstants.CONTENT_TEMPLATE_TEXT_SUFFIX; liveSearcher = new AbstractLiveSearcherPanel(i18n, templateText, dataProxyUrl, new Listener<LinkDTO>() { public void onEvent(final LinkDTO link) { Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherConstants.java (from rev 1096, trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherContants.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherContants.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherConstants.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -0,0 +1,16 @@ +package org.ourproject.kune.workspace.client.search; + +public interface SearcherConstants { + + String START_PARAM = "start"; + String LIMIT_PARAM = "limit"; + String QUERY_PARAM = "query"; + String MIMETYPE_PARAM = "mimetype"; + String MIMETYPE2_PARAM = "mimetype2"; + String GROUP_PARAM = "group"; + + String CONTENT_DATA_PROXY_URL = "/kune/json/ContentJSONService/search"; + String CONTENT_TEMPLATE_TEXT_PREFIX = "<div class=\"search-item\"><span class=\"kune-IconHyperlink\"><img src=\""; + String CONTENT_TEMPLATE_TEXT_SUFFIX = "\" style=\"height: 16px; width: 16px;\" />{shortName}: {longName}</span></div>"; + +} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherContants.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherContants.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherContants.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -1,16 +0,0 @@ -package org.ourproject.kune.workspace.client.search; - -public interface SearcherContants { - - String START_PARAM = "start"; - String LIMIT_PARAM = "limit"; - String QUERY_PARAM = "query"; - String MIMETYPE_PARAM = "mimetype"; - String MIMETYPE2_PARAM = "mimetype2"; - String GROUP_PARAM = "group"; - - String CONTENT_DATA_PROXY_URL = "/kune/json/ContentJSONService/search"; - String CONTENT_TEMPLATE_TEXT_PREFIX = "<div class=\"search-item\"><span class=\"kune-IconHyperlink\"><img src=\""; - String CONTENT_TEMPLATE_TEXT_SUFFIX = "\" style=\"height: 16px; width: 16px;\" />{shortName}: {longName}</span></div>"; - -} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -20,12 +20,12 @@ package org.ourproject.kune.workspace.client.sitebar.siteoptions; import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; +import org.ourproject.kune.platf.client.ui.KuneWindowUtils; import org.ourproject.kune.platf.client.ui.rte.TestRTEDialog; import org.ourproject.kune.workspace.client.i18n.I18nTranslator; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.PushButton; import com.google.gwt.user.client.ui.Widget; @@ -58,14 +58,14 @@ final Item testRTE = new Item(i18n.t("Test new RTE"), new BaseItemListenerAdapter() { @Override - public void onClick(BaseItem item, EventObject e) { + public void onClick(final BaseItem item, final EventObject e) { editor.get().show(); } }, ""); final Item testRTEbasic = new Item(i18n.t("Test new RTE (basic mode)"), new BaseItemListenerAdapter() { @Override - public void onClick(BaseItem item, EventObject e) { + public void onClick(final BaseItem item, final EventObject e) { editor.get().setExtended(false); editor.get().show(); } @@ -73,7 +73,7 @@ final Item linkHelpInTrans = new Item(i18n.t("Help with the translation"), new BaseItemListenerAdapter() { @Override - public void onClick(BaseItem item, EventObject e) { + public void onClick(final BaseItem item, final EventObject e) { super.onClick(item, e); translatorProvider.get().doShowTranslator(); } @@ -81,9 +81,9 @@ final Item linkKuneBugs = new Item(i18n.t("Report kune bugs"), new BaseItemListenerAdapter() { @Override - public void onClick(BaseItem item, EventObject e) { + public void onClick(final BaseItem item, final EventObject e) { super.onClick(item, e); - Window.open("http://ourproject.org/tracker/?group_id=407", "_blank", null); + KuneWindowUtils.open("http://ourproject.org/tracker/?group_id=407"); } }, "images/kuneicon16.gif"); optionsMenu.addItem(testRTE); Modified: trunk/src/main/resources/db/liquibase_changelog.xml =================================================================== --- trunk/src/main/resources/db/liquibase_changelog.xml 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/resources/db/liquibase_changelog.xml 2009-04-28 12:53:10 UTC (rev 1102) @@ -119,4 +119,11 @@ encoding="utf8" stripComments="1" /> <rollback>SELECT * FROM globalize_countries;</rollback> </changeSet> + <changeSet id="18" author="vjrj"> + <comment>Initial External Media Descriptors</comment> + <sqlFile path="src/main/resources/db/update-0014-extmedia.sql" + encoding="utf8" stripComments="1" /> + <rollback>DELETE FROM `ext_media_descriptors` WHERE id BETWEEN 1 AND 6;</rollback> + </changeSet> + </databaseChangeLog> Added: trunk/src/main/resources/db/update-0014-extmedia.sql =================================================================== --- trunk/src/main/resources/db/update-0014-extmedia.sql 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/main/resources/db/update-0014-extmedia.sql 2009-04-28 12:53:10 UTC (rev 1102) @@ -0,0 +1,6 @@ +INSERT INTO `ext_media_descriptors` VALUES (1,'.*youtube.*','<object width=\"###WIDTH###\" height=\"###HEIGHT###\"><param name=\"movie\" value=\"http://youtube.com/v/###URL###\" /><param name=\"wmode\" value=\"opaque\" /><embed src=\"http://youtube.com/v/###URL###\" type=\"application/x-shockwave-flash\" width=\"###WIDTH###\" height=\"###HEIGHT###\" wmode=\"opaque\"></embed></object>',385,'.*youtube.com/watch.*[\\?&]v=(.*)','youtube','http://youtube.com',480); +INSERT INTO `ext_media_descriptors` VALUES (2,'.*blip\\.tv.*','<embed src=\"http://blip.tv/play/###URL###\" type=\"application/x-shockwave-flash\" width=\"###WIDTH###\" height=\"###HEIGHT###\" allowscriptaccess=\"always\" allowfullscreen=\"true\" wmode=\"opaque\" ></embed>',385,'.*blip.tv/file/([0-9]+).*','blip.tv','http://blip.tv',480); +INSERT INTO `ext_media_descriptors` VALUES (3,'.*video\\.google.*','<embed id=\"VideoPlayback\" src=\"http://video.google.com/googleplayer.swf?docid=###URL###&hl=es&fs=true\" style=\"width:###WIDTH###;height:###HEIGHT###\" allowFullScreen=\"true\" allowScriptAccess=\"always\" type=\"application/x-shockwave-flash\" wmode=\"opaque\" > </embed>',326,'.*video\\.google\\.com/videoplay.*docid=([0-9]+).*','google video','http://video.google.com/',400); +INSERT INTO `ext_media_descriptors` VALUES (4,'.*video\\.yahoo.*','<object width=\"###WIDTH###\" height=\"###HEIGHT###\"><param name=\"movie\" value=\"http://d.yimg.com/static.video.yahoo.com/yep/YV_YEP.swf?ver=2.2.30\" /><param name=\"allowFullScreen\" value=\"true\" /><param name=\"AllowScriptAccess\" VALUE=\"always\" /><param name=\"bgcolor\" value=\"#000000\" /><param name=\"flashVars\" value=\"id=###URL###&embed=1\" /><embed src=\"http://d.yimg.com/static.video.yahoo.com/yep/YV_YEP.swf?ver=2.2.30\" type=\"application/x-shockwave-flash\" width=\"###WIDTH###\" height=\"###HEIGHT###\" allowFullScreen=\"true\" AllowScriptAccess=\"always\" bgcolor=\"#000000\" wmode=\"opaque\" flashVars=\"id=###URL###&embed=1\" ></embed></object>',322,'.*video.yahoo.com/watch/(.*)','yahoo video','http://video.yahoo.com/',512); +INSERT INTO `ext_media_descriptors` VALUES (5,'.*vimeo\\.com/.*','<object width=\"###WIDTH###\" height=\"###HEIGHT###\"><param name=\"allowfullscreen\" value=\"true\" /><param name=\"allowscriptaccess\" value=\"always\" /><param name=\"movie\" value=\"http://vimeo.com/moogaloop.swf?clip_id=###URL###&server=vimeo.com&s…" /><embedsrc=\"http://vimeo.com/moogaloop.swf?clip_id=###URL###&server=vimeo.com&s…" type=\"application/x-shockwave-flash\" allowfullscreen=\"true\" wmode=\"opaque\" allowscriptaccess=\"always\" width=\"###WIDTH###\" height=\"###HEIGHT###\"></embed></object><br />',342,'.*vimeo\\.com/(.*)','vimeo','http://vimeo.com',400); +INSERT INTO `ext_media_descriptors` VALUES (6,'.*dailymotion\\.com.*','<object type=\"application/x-shockwave-flash\" data=\"http://www.dailymotion.com/swf/###URL###\" width=\"###WIDTH###\" height=\"###HEIGHT###\"><param name=\"movie\" value=\"http://www.dailymotion.com/swf/###URL###\" /><param name=\"wmode\" value=\"transparent\" /></object>',339,'.*www\\.dailymotion\\.com.*video/([^_]+).*$','daylymotion','http://www.dailymotion.com/',420); Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptorTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptorTest.java 2009-04-24 20:53:42 UTC (rev 1101) +++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptorTest.java 2009-04-28 12:53:10 UTC (rev 1102) @@ -6,37 +6,61 @@ import org.junit.Before; import org.junit.Test; +import org.ourproject.kune.platf.client.dto.ExtMediaDescripDTO; public class ExternalMediaDescriptorTest { - private ExternalMediaDescriptor ytmedia; - private ExternalMediaDescriptor btmedia; - private ExternalMediaDescriptor gvmedia; + private ExtMediaDescripDTO ytmedia; + private ExtMediaDescripDTO btmedia; + private ExtMediaDescripDTO gvmedia; + private ExtMediaDescripDTO yvmedia; + private ExtMediaDescripDTO vimedia; + private ExtMediaDescripDTO dmmedia; @Before public void before() { - ytmedia = new ExternalMediaDescriptor( + ytmedia = new ExtMediaDescripDTO( "youtube", "http://youtube.com", ".*youtube.*", ".*youtube.com/watch.*[\\?&]v=(.*)", "<object width=\"###WIDTH###\" height=\"###HEIGHT###\"><param name=\"movie\" value=\"http://youtube.com/v/###URL###\" /><param name=\"wmode\" value=\"transparent\" /><embed src=\"http://youtube.com/v/###URL###\" type=\"application/x-shockwave-flash\" width=\"###WIDTH###\" height=\"###HEIGHT###\" wmode=\"transparent\"></embed></object>", 480, 385); - btmedia = new ExternalMediaDescriptor( + btmedia = new ExtMediaDescripDTO( "blip.tv", "http://blip.tv", ".*blip\\.tv.*", ".*blip.tv/file/([0-9]+).*", "<embed src=\"http://blip.tv/play/###URL###\" type=\"application/x-shockwave-flash\" width=\"###WIDTH###\" height=\"###HEIGHT###\" allowscriptaccess=\"always\" allowfullscreen=\"true\"></embed>", 480, 385); - gvmedia = new ExternalMediaDescriptor( + gvmedia = new ExtMediaDescripDTO( "google video", "http://video.google.com/", ".*video\\.google.*", ".*video\\.google\\.com/videoplay.*docid=([0-9]+).*", "<embed id=\"VideoPlayback\" src=\"http://video.google.com/googleplayer.swf?docid=###URL###&hl=es&fs=true\" style=\"width:###WIDTH###;height:###HEIGHT###\" allowFullScreen=\"true\" allowScriptAccess=\"always\" type=\"application/x-shockwave-flash\"> </embed>", 400, 326); - + yvmedia = new ExtMediaDescripDTO( + "yahoo video", + "http://video.yahoo.com/", + ".*video\\.yahoo.*", + ".*video.yahoo.com/watch/(.*)", + "<object width=\"###WIDTH###\" height=\"###HEIGHT###\"><param name=\"movie\" value=\"http://d.yimg.com/static.video.yahoo.com/yep/YV_YEP.swf?ver=2.2.30\" /><param name=\"allowFullScreen\" value=\"true\" /><param name=\"AllowScriptAccess\" VALUE=\"always\" /><param name=\"bgcolor\" value=\"#000000\" /><param name=\"flashVars\" value=\"id=###URL###&embed=1\" /><embed src=\"http://d.yimg.com/static.video.yahoo.com/yep/YV_YEP.swf?ver=2.2.30\" type=\"application/x-shockwave-flash\" width=\"###WIDTH###\" height=\"###HEIGHT###\" allowFullScreen=\"true\" AllowScriptAccess=\"always\" bgcolor=\"#000000\" flashVars=\"id=###URL###&embed=1\" ></embed></object>", + 512, 322); + vimedia = new ExtMediaDescripDTO( + "vimeo", + "http://vimeo.com", + ".*vimeo\\.com/.*", + ".*vimeo\\.com/(.*)", + "<object width=\"###WIDTH###\" height=\"###HEIGHT###\"><param name=\"allowfullscreen\" value=\"true\" /><param name=\"allowscriptaccess\" value=\"always\" /><param name=\"movie\" value=\"http://vimeo.com/moogaloop.swf?clip_id=###URL###&server=vimeo.com&s…" /><embed src=\"http://vimeo.com/moogaloop.swf?clip_id=###URL###&server=vimeo.com&s…" type=\"application/x-shockwave-flash\" allowfullscreen=\"true\" allowscriptaccess=\"always\" width=\"###WIDTH###\" height=\"###HEIGHT###\"></embed></object><br />", + 400, 342); + dmmedia = new ExtMediaDescripDTO( + "Daylymotion", + "http://www.dailymotion.com/", + ".*dailymotion\\.com.*", + ".*www\\.dailymotion\\.com.*video/([^_]+).*$", + "<object type=\"application/x-shockwave-flash\" data=\"http://www.dailymotion.com/swf/###URL###\" width=\"###WIDTH###\" height=\"###HEIGHT###\"><param name=\"movie\" value=\"http://www.dailymotion.com/swf/###URL###\" /><param name=\"wmode\" value=\"transparent\" /></object>", + 420, 339); } @Test @@ -59,14 +83,24 @@ gvmedia.getId("http://video.google.com/videoplay?docid=7360794370207355739&ei=VBPxSbXDLob2…")); assertEquals("7360794370207355739", gvmedia.getId("http://video.google.com/videoplay?docid=7360794370207355739")); + + assertEquals("1626663/5503240", yvmedia.getId("http://video.yahoo.com/watch/1626663/5503240")); + + assertEquals("1650316", vimedia.getId("http://vimeo.com/1650316")); + + assertEquals( + "x74yqa", + dmmedia.getId("http://www.dailymotion.com/relevance/search/free+software/video/x74yqa_step…")); + + // assertEquals("", gvmedia.getId("")); } @Test public void testGeEmb() { String result = ytmedia.getEmbed("http://www.youtube.com/watch?v=v2aKo6la7J4"); - assertFalse(result.matches(ExternalMediaDescriptor.HEIGHT)); - assertFalse(result.matches(ExternalMediaDescriptor.WIDTH)); - assertFalse(result.matches(ExternalMediaDescriptor.URL)); + assertFalse(result.matches(ExtMediaDescripDTO.HEIGHT)); + assertFalse(result.matches(ExtMediaDescripDTO.WIDTH)); + assertFalse(result.matches(ExtMediaDescripDTO.URL)); assertTrue(result.matches(".*v2aKo6la7J4.*")); }

1 0

r1101 - in trunk/src/main: java/org/ourproject/kune/app/public/others resources
by vjrj 24 Apr '09

24 Apr '09

Author: vjrj Date: 2009-04-24 22:53:42 +0200 (Fri, 24 Apr 2009) New Revision: 1101 Added: trunk/src/main/java/org/ourproject/kune/app/public/others/cortado-ovt-debug-0.2.2.1.jar trunk/src/main/java/org/ourproject/kune/app/public/others/cortado-ovt-stripped-0.2.2.1.jar Modified: trunk/src/main/java/org/ourproject/kune/app/public/others/cortado.jar trunk/src/main/resources/kune.properties Log: Incomplete - task Audio/Video contents player (ogg controls) Added: trunk/src/main/java/org/ourproject/kune/app/public/others/cortado-ovt-debug-0.2.2.1.jar =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/app/public/others/cortado-ovt-debug-0.2.2.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/app/public/others/cortado-ovt-stripped-0.2.2.1.jar =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/app/public/others/cortado-ovt-stripped-0.2.2.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/org/ourproject/kune/app/public/others/cortado.jar =================================================================== (Binary files differ) Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2009-04-24 02:28:18 UTC (rev 1100) +++ trunk/src/main/resources/kune.properties 2009-04-24 20:53:42 UTC (rev 1101) @@ -54,7 +54,7 @@ # The code used to play local embeded videos/audios. Change this with other player/code (include a ###DOC_URL### tag) kune.media.flvembededobject = <object width="400" height="300" data="http://flowplayer.org/swf/flowplayer-3.1.0.swf" type="application/x-shockwave-flash"> <param name="movie" value="http://flowplayer.org/swf/flowplayer-3.1.0.swf" /> <param name="allowfullscreen" value="true" /> <param name="allowscriptaccess" value="always" /> <param name="flashvars" value='config={"clip":{"url":"###DOC_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#CC6633"},"plugins":{"controls":{"time":true,"volume":false,"fullscreen":true}}}' /> <param name="wmode" value="opaque"> </object> kune.media.mp3embededobject = <object width="350" height="24" data="http://flowplayer.org/swf/flowplayer-3.1.0.swf" type="application/x-shockwave-flash"> <param name="movie" value="http://flowplayer.org/swf/flowplayer-3.1.0.swf" /> <param name="allowfullscreen" value="true" /> <param name="allowscriptaccess" value="always" /> <param name="flashvars" value='config={"clip":{"url":"###DOC_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#CC6633"},"plugins":{"audio":{"url":"http://flowplayer.org/swf/flowplayer.audio.swf"},"controls":{"time":true,"volume":true,"fullscreen":false}}}' /> <param name="wmode" value="opaque"> </object> -kune.media.oggembededobject = <applet code="com.fluendo.player.Cortado.class" archive="/kune/others/cortado.jar" width="352" height="288"> <param name="url" value="###DOC_URL###"/> <param name="local" value="false"/> <param name="duration" value="232"/> <param name="keepAspect" value="true"/> <param name="video" value="true"/> <param name="audio" value="true"/> <param name="bufferSize" value="200"/> <param name="userId" value="user"/> <param name="password" value="test"/> </applet> +kune.media.oggembededobject = <applet code="com.fluendo.player.Cortado.class" archive="/kune/others/cortado.jar" width="352" height="288"> <param name="url" value="###DOC_URL###"/> <param name="local" value="false"/> <param name="showStatus" value="show"/> <param name="keepAspect" value="true"/> <param name="autoPlay" value="false"/> <param name="video" value="true"/> <param name="audio" value="true"/> <param name="bufferSize" value="200"/> </applet> kune.media.aviembededobject = <object data="###DOC_URL###" type="video/msvideo" /> ### More info about properties

1 0

r1100 - in trunk: . src/main/java/org/ourproject/kune/app/public/others src/main/java/org/ourproject/kune/platf/client/dto src/main/java/org/ourproject/kune/platf/client/ui/download src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext src/main/java/org/ourproject/kune/workspace/client/cnt src/main/resources src/test/java/org/ourproj
by vjrj 24 Apr '09

24 Apr '09

Author: vjrj Date: 2009-04-24 04:28:18 +0200 (Fri, 24 Apr 2009) New Revision: 1100 Added: trunk/src/main/java/org/ourproject/kune/app/public/others/cortado.jar trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptorTest.java Modified: trunk/TODO trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java trunk/src/main/resources/kune.properties Log: Incomplete - task Audio/Video contents player. External videos easy embeding support (from youtube, google video, ... entering only the url) Modified: trunk/TODO =================================================================== --- trunk/TODO 2009-04-22 14:36:46 UTC (rev 1099) +++ trunk/TODO 2009-04-24 02:28:18 UTC (rev 1100) @@ -11,6 +11,11 @@ Use org-mode in emacs to easy manage this file * SHORT-TERM (URGENT) +** maven-gwt problem (using another plugin from codehaus) + mvn com.totsp.gwt:maven-googlewebtoolkit2-plugin:compile + and so on. + More info: + http://code.google.com/p/gwt-maven/wiki/M2FAQ ** vjrj use xwiki maven repo http://maven.xwiki.org/releases/com/xpn/xwiki/platform/xwiki-web-wysiwyg/1.… ** vjrj <v> better RTE @@ -157,8 +162,14 @@ see: svn checkout svn://anonsvn.it.su.se/su-smack su-smack ** TODO <v> study different embeded video solutions - for ogg :: http://www.flumotion.net/cortado/ - - for mp3+flv :: flowplayer - - for avi :: ?? + http://www.flumotion.net/cortado/ + https://code.fluendo.com/flumotion/trac/browser/cortado/trunk/README + http://en.flossmanuals.net/TheoraCookbook/Cortado + - for mp3+flv :: flowplayer + - for avi :: some links: + http://www.w3schools.com/media/media_browservideos.asp + http://www.solitude.dk/archives/embedquicktime/ + http://www.solitude.dk/archives/embedquicktime/jquery.embedquicktime-source… ** TODO <d> Inform to translators when original content changes ** TODO <v> Restarting server don't affect client session Now there are problems if client was started before server, when server restart (session persist) Added: trunk/src/main/java/org/ourproject/kune/app/public/others/cortado.jar =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/app/public/others/cortado.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java 2009-04-22 14:36:46 UTC (rev 1099) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java 2009-04-24 02:28:18 UTC (rev 1100) @@ -57,6 +57,11 @@ return type; } + public boolean isAvi() { + return type != null && subtype != null && type.equals("video") + && (subtype.equals("x-msvideo") || subtype.equals("msvideo")); + } + public boolean isFlv() { return type != null && subtype != null && type.equals("video") && (subtype.equals("flv") || subtype.equals("x-flv")); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2009-04-22 14:36:46 UTC (rev 1099) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2009-04-24 02:28:18 UTC (rev 1100) @@ -80,7 +80,10 @@ url.add(new UrlParam(FileConstants.DOWNLOAD, download)); } if (useHash) { - url.add(new UrlParam(FileConstants.HASH, session.getUserHash())); + String hash = session.getUserHash(); + if (hash != null) { + url.add(new UrlParam(FileConstants.HASH, hash)); + } } return url.toString(); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptor.java 2009-04-22 14:36:46 UTC (rev 1099) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptor.java 2009-04-24 02:28:18 UTC (rev 1100) @@ -2,30 +2,46 @@ public class ExternalMediaDescriptor { + public static final String URL = "###URL###"; + public static final String HEIGHT = "###HEIGHT###"; + public static final String WIDTH = "###WIDTH###"; + private final String name; private final String siteurl; private final String detectRegex; private final String idRegex; private final String embedTemplate; + private int width; + private int height; public ExternalMediaDescriptor(final String name, final String siteurl, final String detectRegex, - final String idRegex, final String embedTemplate) { + final String idRegex, final String embedTemplate, final int defWidth, final int defHeight) { this.name = name; this.siteurl = siteurl; this.detectRegex = detectRegex; this.idRegex = idRegex; this.embedTemplate = embedTemplate; + width = defWidth; + height = defHeight; } public String getEmbed(final String url) { - String id = url.replaceFirst(idRegex, "kk"); - return embedTemplate.replaceFirst("\\[%d\\]", id); + String id = getId(url); + String result = embedTemplate.replaceAll(URL, id); + result = result.replaceAll(HEIGHT, "" + height); + result = result.replaceAll(WIDTH, "" + width); + return result; } - public boolean is(final String url) { - return url.matches(detectRegex); + public int getHeight() { + return height; } + public String getId(final String url) { + String id = url.replaceFirst(idRegex, "$1"); + return id; + } + public String getName() { return name; } @@ -33,4 +49,20 @@ public String getSiteurl() { return siteurl; } + + public int getWidth() { + return width; + } + + public boolean is(final String url) { + return url.matches(detectRegex); + } + + public void setHeight(final int height) { + this.height = height; + } + + public void setWidth(final int width) { + this.width = width; + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java 2009-04-22 14:36:46 UTC (rev 1099) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java 2009-04-24 02:28:18 UTC (rev 1100) @@ -7,7 +7,8 @@ private static final long serialVersionUID = 1L; - public static final ExternalMediaDescriptor NO_MEDIA = new ExternalMediaDescriptor(null, null, null, null, null); + public static final ExternalMediaDescriptor NO_MEDIA = new ExternalMediaDescriptor(null, null, null, null, null, 0, + 0); public ExternalMediaDescriptor get(final String url) { for (ExternalMediaDescriptor media : this) { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java 2009-04-22 14:36:46 UTC (rev 1099) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java 2009-04-24 02:28:18 UTC (rev 1100) @@ -52,6 +52,6 @@ } public void setIntro(final String text) { - intro.setHtml(text); + intro.setHtml(text + "<br/>"); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2009-04-22 14:36:46 UTC (rev 1099) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2009-04-24 02:28:18 UTC (rev 1100) @@ -17,6 +17,11 @@ this.downloadUtils = downloadUtils; } + public String getAviEmbed(final StateToken token) { + return session.getInitData().getAviEmbedObject().replace(DOC_URL_TAG, + session.getSiteUrl() + downloadUtils.getUrl(token)); + } + public String getFlvEmbed(final StateToken token) { return session.getInitData().getFlvEmbedObject().replace(DOC_URL_TAG, session.getSiteUrl() + downloadUtils.getUrl(token)); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java 2009-04-22 14:36:46 UTC (rev 1099) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java 2009-04-24 02:28:18 UTC (rev 1100) @@ -17,8 +17,27 @@ super(insertMediaDialog); this.externalMediaRegistry = externalMediaRegistry; - externalMediaRegistry.add(new ExternalMediaDescriptor("youtube", "http://youtube.com", - "http://[a-z]*.youtube.com/watch?v=.*", "FIXME", "<embed [%d]>")); + externalMediaRegistry.add(new ExternalMediaDescriptor( + "youtube", + "http://youtube.com", + ".*youtube.*", + ".*youtube.com/watch.*[\\?&]v=(.*)", + "<object width=\"###WIDTH###\" height=\"###HEIGHT###\"><param name=\"movie\" value=\"http://youtube.com/v/###URL###\" /><param name=\"wmode\" value=\"opaque\" /><embed src=\"http://youtube.com/v/###URL###\" type=\"application/x-shockwave-flash\" width=\"###WIDTH###\" height=\"###HEIGHT###\" wmode=\"opaque\"></embed></object>", + 480, 385)); + externalMediaRegistry.add(new ExternalMediaDescriptor( + "blip.tv", + "http://blip.tv", + ".*blip\\.tv.*", + ".*blip.tv/file/([0-9]+).*", + "<embed src=\"http://blip.tv/play/###URL###\" type=\"application/x-shockwave-flash\" width=\"###WIDTH###\" height=\"###HEIGHT###\" allowscriptaccess=\"always\" allowfullscreen=\"true\" wmode=\"opaque\" ></embed>", + 480, 385)); + externalMediaRegistry.add(new ExternalMediaDescriptor( + "google video", + "http://video.google.com/", + ".*video\\.google.*", + ".*video\\.google\\.com/videoplay.*docid=([0-9]+).*", + "<embed id=\"VideoPlayback\" src=\"http://video.google.com/googleplayer.swf?docid=###URL###&hl=es&fs=true\" style=\"width:###WIDTH###;height:###HEIGHT###\" allowFullScreen=\"true\" allowScriptAccess=\"always\" type=\"application/x-shockwave-flash\" wmode=\"opaque\" > </embed>", + 400, 326)); } public void init(final InsertMediaExtView view) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2009-04-22 14:36:46 UTC (rev 1099) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2009-04-24 02:28:18 UTC (rev 1100) @@ -94,6 +94,8 @@ view.setContent(mediaUtils.get().getOggEmbed(token), false); } else if (mimeType.isFlv()) { view.setContent(mediaUtils.get().getFlvEmbed(token), false); + } else if (mimeType.isAvi()) { + view.setContent(mediaUtils.get().getAviEmbed(token), false); } else if (mimeType.isText()) { view.setContent(contentBody, true); } else { Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2009-04-22 14:36:46 UTC (rev 1099) +++ trunk/src/main/resources/kune.properties 2009-04-24 02:28:18 UTC (rev 1100) @@ -54,7 +54,9 @@ # The code used to play local embeded videos/audios. Change this with other player/code (include a ###DOC_URL### tag) kune.media.flvembededobject = <object width="400" height="300" data="http://flowplayer.org/swf/flowplayer-3.1.0.swf" type="application/x-shockwave-flash"> <param name="movie" value="http://flowplayer.org/swf/flowplayer-3.1.0.swf" /> <param name="allowfullscreen" value="true" /> <param name="allowscriptaccess" value="always" /> <param name="flashvars" value='config={"clip":{"url":"###DOC_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#CC6633"},"plugins":{"controls":{"time":true,"volume":false,"fullscreen":true}}}' /> <param name="wmode" value="opaque"> </object> kune.media.mp3embededobject = <object width="350" height="24" data="http://flowplayer.org/swf/flowplayer-3.1.0.swf" type="application/x-shockwave-flash"> <param name="movie" value="http://flowplayer.org/swf/flowplayer-3.1.0.swf" /> <param name="allowfullscreen" value="true" /> <param name="allowscriptaccess" value="always" /> <param name="flashvars" value='config={"clip":{"url":"###DOC_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#CC6633"},"plugins":{"audio":{"url":"http://flowplayer.org/swf/flowplayer.audio.swf"},"controls":{"time":true,"volume":true,"fullscreen":false}}}' /> <param name="wmode" value="opaque"> </object> -kune.media.aviembededobject = <object > </object> -kune.media.oggembededobject = <applet code="com.fluendo.player.Cortado.class" archive="/kune/others/cortado-ovt-debug-0.2.2.jar" width="352" height="288"> <param name="url" value="###DOC_URL###"/> <param name="local" value="false"/> <param name="duration" value="232"/> <param name="keepAspect" value="true"/> <param name="video" value="true"/> <param name="audio" value="true"/> <param name="bufferSize" value="200"/> <param name="userId" value="user"/> <param name="password" value="test"/> </applet> -# http://www.flumotion.net/cortado/ -# https://code.fluendo.com/flumotion/trac/browser/cortado/trunk/README +kune.media.oggembededobject = <applet code="com.fluendo.player.Cortado.class" archive="/kune/others/cortado.jar" width="352" height="288"> <param name="url" value="###DOC_URL###"/> <param name="local" value="false"/> <param name="duration" value="232"/> <param name="keepAspect" value="true"/> <param name="video" value="true"/> <param name="audio" value="true"/> <param name="bufferSize" value="200"/> <param name="userId" value="user"/> <param name="password" value="test"/> </applet> +kune.media.aviembededobject = <object data="###DOC_URL###" type="video/msvideo" /> + +### More info about properties +# http://en.wikipedia.org/wiki/.properties +# http://java.sun.com/javase/6/docs/api/java/util/Properties.html#load(java.i… Added: trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptorTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptorTest.java 2009-04-22 14:36:46 UTC (rev 1099) +++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptorTest.java 2009-04-24 02:28:18 UTC (rev 1100) @@ -0,0 +1,83 @@ +package org.ourproject.kune.platf.client.ui.rte.insertmedia; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Before; +import org.junit.Test; + +public class ExternalMediaDescriptorTest { + + private ExternalMediaDescriptor ytmedia; + private ExternalMediaDescriptor btmedia; + private ExternalMediaDescriptor gvmedia; + + @Before + public void before() { + ytmedia = new ExternalMediaDescriptor( + "youtube", + "http://youtube.com", + ".*youtube.*", + ".*youtube.com/watch.*[\\?&]v=(.*)", + "<object width=\"###WIDTH###\" height=\"###HEIGHT###\"><param name=\"movie\" value=\"http://youtube.com/v/###URL###\" /><param name=\"wmode\" value=\"transparent\" /><embed src=\"http://youtube.com/v/###URL###\" type=\"application/x-shockwave-flash\" width=\"###WIDTH###\" height=\"###HEIGHT###\" wmode=\"transparent\"></embed></object>", + 480, 385); + btmedia = new ExternalMediaDescriptor( + "blip.tv", + "http://blip.tv", + ".*blip\\.tv.*", + ".*blip.tv/file/([0-9]+).*", + "<embed src=\"http://blip.tv/play/###URL###\" type=\"application/x-shockwave-flash\" width=\"###WIDTH###\" height=\"###HEIGHT###\" allowscriptaccess=\"always\" allowfullscreen=\"true\"></embed>", + 480, 385); + gvmedia = new ExternalMediaDescriptor( + "google video", + "http://video.google.com/", + ".*video\\.google.*", + ".*video\\.google\\.com/videoplay.*docid=([0-9]+).*", + "<embed id=\"VideoPlayback\" src=\"http://video.google.com/googleplayer.swf?docid=###URL###&hl=es&fs=true\" style=\"width:###WIDTH###;height:###HEIGHT###\" allowFullScreen=\"true\" allowScriptAccess=\"always\" type=\"application/x-shockwave-flash\"> </embed>", + 400, 326); + + } + + @Test + public void getIds() { + assertEquals("v2aKo6la7J4", ytmedia.getId("http://www.youtube.com/watch?v=v2aKo6la7J4")); + assertEquals("v2aKo6la7J4", ytmedia.getId("http://de.youtube.com/watch?v=v2aKo6la7J4")); + assertEquals("v2aKo6la7J4", ytmedia.getId("http://www.youtube.com/watch?gl=ES&hl=es&v=v2aKo6la7J4")); + assertEquals("v2aKo6la7J4", ytmedia.getId("http://youtube.com/watch?gl=ES&hl=es&v=v2aKo6la7J4")); + + assertEquals("1646241", btmedia.getId("http://vjrj.blip.tv/file/1646241/")); + assertEquals("1646241", + btmedia.getId("http://blip.tv/file/1646241?utm_source=featured_ep&utm_medium=featured_ep")); + assertEquals("1646241", btmedia.getId("http://blip.tv/file/1646241")); + + assertEquals( + "7360794370207355739", + gvmedia.getId("http://video.google.com/videoplay?ei=VBPxSbXDLob2-Aabu9B-&q=chomsky&docid=7…")); + assertEquals( + "7360794370207355739", + gvmedia.getId("http://video.google.com/videoplay?docid=7360794370207355739&ei=VBPxSbXDLob2…")); + assertEquals("7360794370207355739", + gvmedia.getId("http://video.google.com/videoplay?docid=7360794370207355739")); + } + + @Test + public void testGeEmb() { + String result = ytmedia.getEmbed("http://www.youtube.com/watch?v=v2aKo6la7J4"); + assertFalse(result.matches(ExternalMediaDescriptor.HEIGHT)); + assertFalse(result.matches(ExternalMediaDescriptor.WIDTH)); + assertFalse(result.matches(ExternalMediaDescriptor.URL)); + assertTrue(result.matches(".*v2aKo6la7J4.*")); + } + + @Test + public void testMatch() { + assertTrue(ytmedia.is("sdfklasdfayoutubekasdf")); + } + + @Test + public void testNoMatch() { + assertFalse(ytmedia.is("sdfklasdfakasdf")); + } + +}

1 0