April 2009 - kune-commits - lists.ourproject.org

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

22 Apr '09

Author: vjrj Date: 2009-04-22 16:36:46 +0200 (Wed, 22 Apr 2009) New Revision: 1099 Added: trunk/src/main/java/org/ourproject/kune/app/public/others/ trunk/src/main/java/org/ourproject/kune/app/public/others/cortado-ovt-debug-0.2.2.jar trunk/src/main/java/org/ourproject/kune/app/public/others/cortado-ovt-stripped-0.2.2.jar Modified: trunk/COPYRIGHT trunk/TODO trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java trunk/src/main/resources/kune.properties Log: Incomplete - task Audio/Video contents player (ogg support) Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2009-04-22 01:29:14 UTC (rev 1098) +++ trunk/COPYRIGHT 2009-04-22 14:36:46 UTC (rev 1099) @@ -115,6 +115,11 @@ Copyright: under GNU Lesser General Public License http://www.gnu.org/licenses/lgpl.html +cortado: + A video player java applet (Ogg Theora, Ogg Vorbis) + http://www.flumotion.net/cortado/ + Copyright: (C) 2004 Fluendo S.L under GNU General Public License + some license description: from Wikipedia Copyright: under GFDL http://www.gnu.org/copyleft/fdl.html Modified: trunk/TODO =================================================================== --- trunk/TODO 2009-04-22 01:29:14 UTC (rev 1098) +++ trunk/TODO 2009-04-22 14:36:46 UTC (rev 1099) @@ -157,7 +157,8 @@ 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+ogg :: flowplayer + - for mp3+flv :: flowplayer + - for avi :: ?? ** 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-ovt-debug-0.2.2.jar =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/app/public/others/cortado-ovt-debug-0.2.2.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.jar =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/app/public/others/cortado-ovt-stripped-0.2.2.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 01:29:14 UTC (rev 1098) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java 2009-04-22 14:36:46 UTC (rev 1099) @@ -76,6 +76,11 @@ && (subtype.equals("mp3") || subtype.equals("x-mp3") || (subtype.equals("mpeg"))); } + public boolean isOgg() { + // http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions + return type != null && subtype != null && subtype.equals("ogg"); + } + /** * Duplicate code in BMT * 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-22 01:29:14 UTC (rev 1098) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java 2009-04-22 14:36:46 UTC (rev 1099) @@ -48,8 +48,19 @@ private int imgIconsize; private ArrayList<ToolSimpleDTO> userTools; private ArrayList<ToolSimpleDTO> groupTools; - private String mediaEmbedObject; + private String flvEmbedObject; + + private String oggEmbedObject; + + private String mp3EmbedObject; + + private String aviEmbedObject; + + public String getAviEmbedObject() { + return aviEmbedObject; + } + public String getChatDomain() { return chatDomain; } @@ -78,6 +89,10 @@ return defaultWsTheme; } + public String getFlvEmbedObject() { + return flvEmbedObject; + } + public String getGalleryPermittedExtensions() { return galleryPermittedExtensions; } @@ -114,10 +129,14 @@ return maxFileSizeInMb; } - public String getMediaEmbedObject() { - return mediaEmbedObject; + public String getMp3EmbedObject() { + return mp3EmbedObject; } + public String getOggEmbedObject() { + return oggEmbedObject; + } + public String getSiteDomain() { return siteDomain; } @@ -150,6 +169,10 @@ return getUserInfo() != null; } + public void setAviEmbedObject(final String aviEmbedObject) { + this.aviEmbedObject = aviEmbedObject; + } + public void setChatDomain(final String chatDomain) { this.chatDomain = chatDomain; } @@ -178,6 +201,10 @@ this.defaultWsTheme = defaultWsTheme; } + public void setFlvEmbedObject(final String flvEmbedObject) { + this.flvEmbedObject = flvEmbedObject; + } + public void setGalleryPermittedExtensions(final String galleryPermittedExtensions) { this.galleryPermittedExtensions = galleryPermittedExtensions; } @@ -214,10 +241,14 @@ this.maxFileSizeInMb = maxFileSizeInMb; } - public void setMediaEmbedObject(final String mediaEmbedObject) { - this.mediaEmbedObject = mediaEmbedObject; + public void setMp3EmbedObject(final String mp3EmbedObject) { + this.mp3EmbedObject = mp3EmbedObject; } + public void setOggEmbedObject(final String oggEmbedObject) { + this.oggEmbedObject = oggEmbedObject; + } + public void setSiteDomain(final String siteDomain) { this.siteDomain = siteDomain; } 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 01:29:14 UTC (rev 1098) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2009-04-22 14:36:46 UTC (rev 1099) @@ -6,7 +6,7 @@ public class MediaUtils { - public static final String DOC_FLV_URL_TAG = "###DOC_FLV_URL###"; + public static final String DOC_URL_TAG = "###DOC_URL###"; private final Session session; @@ -17,8 +17,19 @@ this.downloadUtils = downloadUtils; } - public String getEmbed(final StateToken token) { - return session.getInitData().getMediaEmbedObject().replace(DOC_FLV_URL_TAG, + public String getFlvEmbed(final StateToken token) { + return 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)); + } + + public String getOggEmbed(final StateToken token) { + return session.getInitData().getOggEmbedObject().replace(DOC_URL_TAG, + session.getSiteUrl() + downloadUtils.getUrl(token)); + } + } 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-22 01:29:14 UTC (rev 1098) +++ trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java 2009-04-22 14:36:46 UTC (rev 1099) @@ -29,6 +29,7 @@ import org.ourproject.kune.platf.server.users.UserInfo; public class InitData { + private String siteUrl; private List<License> licenses; private List<I18nLanguage> languages; @@ -52,8 +53,19 @@ private int imgIconsize; private ArrayList<ToolSimple> userTools; private ArrayList<ToolSimple> groupTools; - private String mediaEmbedObject; + private String flvEmbedObject; + + private String oggEmbedObject; + + private String mp3EmbedObject; + + private String aviEmbedObject; + + public String getAviEmbedObject() { + return aviEmbedObject; + } + public String getChatDomain() { return chatDomain; } @@ -82,6 +94,10 @@ return defaultWsTheme; } + public String getFlvEmbedObject() { + return flvEmbedObject; + } + public String getGalleryPermittedExtensions() { return galleryPermittedExtensions; } @@ -118,10 +134,14 @@ return maxFileSizeInMb; } - public String getMediaEmbedObject() { - return mediaEmbedObject; + public String getMp3EmbedObject() { + return mp3EmbedObject; } + public String getOggEmbedObject() { + return oggEmbedObject; + } + public String getSiteDomain() { return siteDomain; } @@ -150,6 +170,10 @@ return wsThemes; } + public void setAviEmbedObject(final String aviEmbedObject) { + this.aviEmbedObject = aviEmbedObject; + } + public void setChatDomain(final String chatDomain) { this.chatDomain = chatDomain; } @@ -178,6 +202,10 @@ this.defaultWsTheme = defaultWsTheme; } + public void setFlvEmbedObject(final String flvEmbedObject) { + this.flvEmbedObject = flvEmbedObject; + } + public void setGalleryPermittedExtensions(final String galleryPermittedExtensions) { this.galleryPermittedExtensions = galleryPermittedExtensions; } @@ -214,10 +242,14 @@ this.maxFileSizeInMb = maxFileSizeInMb; } - public void setMediaEmbedObject(final String mediaEmbedObject) { - this.mediaEmbedObject = mediaEmbedObject; + public void setMp3EmbedObject(final String mp3EmbedObject) { + this.mp3EmbedObject = mp3EmbedObject; } + public void setOggEmbedObject(final String oggEmbedObject) { + this.oggEmbedObject = oggEmbedObject; + } + public void setSiteDomain(final String siteDomain) { this.siteDomain = siteDomain; } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java 2009-04-22 01:29:14 UTC (rev 1098) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java 2009-04-22 14:36:46 UTC (rev 1099) @@ -29,6 +29,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.errors.ContentNotFoundException; import org.ourproject.kune.platf.client.ui.download.FileConstants; @@ -59,6 +61,7 @@ static final String APPLICATION_X_DOWNLOAD = "application/x-download"; private static final long serialVersionUID = 1L; + public static final Log log = LogFactory.getLog(FileDownloadManager.class); @Inject ContentManager contentManager; @@ -120,11 +123,16 @@ final File file = new File(absFilename); resp.setContentLength((int) file.length()); + + String contentType; if (mimeType == null || download) { - resp.setContentType(APPLICATION_X_DOWNLOAD); + contentType = APPLICATION_X_DOWNLOAD; } else { - resp.setContentType(mimeType.toString()); + contentType = mimeType.toString(); } + resp.setContentType(contentType); + log.info("Content type returned: " + contentType); + resp.setHeader(RESP_HEADER_CONTEND_DISP, RESP_HEADER_ATTACHMENT_FILENAME + title + extension + RESP_HEADER_END); return absFilename; } 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-04-22 01:29:14 UTC (rev 1098) +++ trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java 2009-04-22 14:36:46 UTC (rev 1099) @@ -37,7 +37,10 @@ String IMAGES_THUMBSIZE = "kune.images.thumbsize"; String IMAGES_CROPSIZE = "kune.images.cropsize"; String IMAGES_ICONSIZE = "kune.images.iconsize"; - String MEDIA_EMBEDED_OBJECT = "kune.media.embededobject"; + String FLV_EMBEDED_OBJECT = "kune.media.flvembededobject"; + String OGG_EMBEDED_OBJECT = "kune.media.oggembededobject"; + String MP3_EMBEDED_OBJECT = "kune.media.mp3embededobject"; + String AVI_EMBEDED_OBJECT = "kune.media.aviembededobject"; String get(String key); 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-22 01:29:14 UTC (rev 1098) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java 2009-04-22 14:36:46 UTC (rev 1099) @@ -103,7 +103,10 @@ data.setImgThumbsize(new Integer(kuneProperties.get(KuneProperties.IMAGES_THUMBSIZE))); data.setImgCropsize(new Integer(kuneProperties.get(KuneProperties.IMAGES_CROPSIZE))); data.setImgIconsize(new Integer(kuneProperties.get(KuneProperties.IMAGES_ICONSIZE))); - data.setMediaEmbedObject(kuneProperties.get(KuneProperties.MEDIA_EMBEDED_OBJECT)); + data.setFlvEmbedObject(kuneProperties.get(KuneProperties.FLV_EMBEDED_OBJECT)); + data.setMp3EmbedObject(kuneProperties.get(KuneProperties.MP3_EMBEDED_OBJECT)); + data.setOggEmbedObject(kuneProperties.get(KuneProperties.OGG_EMBEDED_OBJECT)); + data.setAviEmbedObject(kuneProperties.get(KuneProperties.AVI_EMBEDED_OBJECT)); return mapper.map(data, InitDataDTO.class); } 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 01:29:14 UTC (rev 1098) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2009-04-22 14:36:46 UTC (rev 1099) @@ -88,8 +88,12 @@ } else if (mimeType.isPdf()) { view.showImage(fileDownloadUtils.getImageUrl(token), fileDownloadUtils.getImageResizedUrl(token, ImageSize.sized), true); - } else if (mimeType.isMp3() || mimeType.isFlv()) { - view.setContent(mediaUtils.get().getEmbed(token), false); + } else if (mimeType.isMp3()) { + view.setContent(mediaUtils.get().getMp3Embed(token), false); + } else if (mimeType.isOgg()) { + view.setContent(mediaUtils.get().getOggEmbed(token), false); + } else if (mimeType.isFlv()) { + view.setContent(mediaUtils.get().getFlvEmbed(token), false); } else if (mimeType.isText()) { view.setContent(contentBody, true); } else { 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-22 01:29:14 UTC (rev 1098) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java 2009-04-22 14:36:46 UTC (rev 1099) @@ -30,6 +30,7 @@ @Override protected String updateMediaInfo() { - return mediaUtils.get().getEmbed(new StateToken(view.getSrc())); + // FIXME (avi, mp3, ...) + return mediaUtils.get().getFlvEmbed(new StateToken(view.getSrc())); } } Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2009-04-22 01:29:14 UTC (rev 1098) +++ trunk/src/main/resources/kune.properties 2009-04-22 14:36:46 UTC (rev 1099) @@ -51,6 +51,10 @@ ### Media options -# The code used to play local embeded videos/audios. Change this with other player/code (include a ###DOC_FLV_URL### tag) -kune.media.embededobject = <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_FLV_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#112233"},"plugins":{"controls":{"time":true,"volume":false,"fullscreen":true}}}' /> <param name="wmode" value="opaque"> </object> - +# 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

1 0

r1098 - in trunk/src/main: java/org/ourproject/kune/platf/client/dto java/org/ourproject/kune/platf/client/ui/download resources
by vjrj 22 Apr '09

22 Apr '09

Author: vjrj Date: 2009-04-22 03:29:14 +0200 (Wed, 22 Apr 2009) New Revision: 1098 Modified: 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/resources/kune.properties Log: Complete - task Flash content and z-index problem Incomplete - task Audio contents player 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 00:41:57 UTC (rev 1097) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java 2009-04-22 01:29:14 UTC (rev 1098) @@ -58,7 +58,8 @@ } public boolean isFlv() { - return type != null && subtype != null && type.equals("video") && subtype.equals("flv"); + 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 00:41:57 UTC (rev 1097) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2009-04-22 01:29:14 UTC (rev 1098) @@ -75,8 +75,10 @@ } private String calculateUrl(final StateToken token, final boolean download, final boolean useHash) { - Url url = new Url(DOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, token.toString()), new UrlParam( - FileConstants.DOWNLOAD, download)); + Url url = new Url(DOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, token.toString())); + if (download) { + url.add(new UrlParam(FileConstants.DOWNLOAD, download)); + } if (useHash) { url.add(new UrlParam(FileConstants.HASH, session.getUserHash())); } Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2009-04-22 00:41:57 UTC (rev 1097) +++ trunk/src/main/resources/kune.properties 2009-04-22 01:29:14 UTC (rev 1098) @@ -52,5 +52,5 @@ ### Media options # The code used to play local embeded videos/audios. Change this with other player/code (include a ###DOC_FLV_URL### tag) -kune.media.embededobject = <object width="300" height="200" 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_FLV_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#112233"},"plugins":{"controls":{"time":true,"volume":false,"fullscreen":true}}}' /> <param name="wmode" value="opaque"> </object> +kune.media.embededobject = <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_FLV_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#112233"},"plugins":{"controls":{"time":true,"volume":false,"fullscreen":true}}}' /> <param name="wmode" value="opaque"> </object>

1 0

22 Apr '09

Author: vjrj Date: 2009-04-22 02:41:57 +0200 (Wed, 22 Apr 2009) New Revision: 1097 Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/music.gif trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/music.png Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateTokenUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.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/insertimg/abstractimg/InsertImageAbstractPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/utils/Url.java trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.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/tool/FoldableAbstractClientTool.java trunk/src/main/resources/kune.properties Log: Incomplete - task flash flv tests for embed video and audio Incomplete - task Insert Media dialog Incomplete - task Audio contents player Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -39,6 +39,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; @@ -97,7 +98,7 @@ public BlogViewer create() { final BlogViewerPresenter presenter = new BlogViewerPresenter($(StateManager.class), $(Session.class), $(I18nUITranslationService.class), $(ActionContentToolbar.class), - $(ContentActionRegistry.class), $$(FileDownloadUtils.class)); + $(ContentActionRegistry.class), $$(FileDownloadUtils.class), $$(MediaUtils.class)); final BlogViewerView view = new BlogViewerPanel($(WorkspaceSkeleton.class), $(I18nTranslationService.class)); presenter.init(view); @@ -110,7 +111,7 @@ public BlogFolderContent create() { final BlogFolderContentPresenter presenter = new BlogFolderContentPresenter($(StateManager.class), $(Session.class), $(ActionContentToolbar.class), $(ContentActionRegistry.class), - $(I18nTranslationService.class), $$(FileDownloadUtils.class)); + $(I18nTranslationService.class), $$(FileDownloadUtils.class), $$(MediaUtils.class)); final BlogFolderContentView view = new BlogFolderContentPanel($(WorkspaceSkeleton.class), $(I18nTranslationService.class)); presenter.init(view); Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -27,6 +27,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; @@ -37,10 +38,11 @@ private BlogFolderContentView view; private final I18nTranslationService i18n; - public BlogFolderContentPresenter(StateManager stateManager, Session session, ActionContentToolbar toolbar, - final ActionRegistry<StateToken> actionRegistry, I18nTranslationService i18n, - Provider<FileDownloadUtils> downloadProvider) { - super(BlogClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n); + public BlogFolderContentPresenter(final StateManager stateManager, final Session session, + final ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, + final I18nTranslationService i18n, final Provider<FileDownloadUtils> downloadProvider, + final Provider<MediaUtils> mediaUtils) { + super(BlogClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, mediaUtils); this.i18n = i18n; } @@ -50,7 +52,7 @@ } @Override - protected void setState(StateContainerDTO state) { + protected void setState(final StateContainerDTO state) { if (state.getTypeId().equals(BlogClientTool.TYPE_ROOT)) { if (state.getRootContainer().getChilds().size() == 0) { view.setInfo(i18n.t("This group has no blogs")); Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -25,6 +25,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; @@ -33,18 +34,19 @@ public class BlogViewerPresenter extends FoldableContentPresenter implements BlogViewer { - public BlogViewerPresenter(StateManager stateManager, Session session, I18nUITranslationService i18n, - ActionContentToolbar toolbar, ContentActionRegistry actionRegistry, - Provider<FileDownloadUtils> downloadProvider) { - super(BlogClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n); + public BlogViewerPresenter(final StateManager stateManager, final Session session, + final I18nUITranslationService i18n, final ActionContentToolbar toolbar, + final ContentActionRegistry actionRegistry, final Provider<FileDownloadUtils> downloadProvider, + final Provider<MediaUtils> mediaUtils) { + super(BlogClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, mediaUtils); } - public void init(BlogViewerView view) { + public void init(final BlogViewerView view) { super.init(view); } @Override - protected void setState(StateContentDTO state) { + protected void setState(final StateContentDTO state) { super.setState(state); super.setContent(state, BlogClientTool.TYPE_UPLOADEDFILE); } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -37,6 +37,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; @@ -97,7 +98,7 @@ public ChatRoom create() { final ChatRoomPresenter presenter = new ChatRoomPresenter($(StateManager.class), $(Session.class), $(I18nUITranslationService.class), $(ActionContentToolbar.class), - $(ContentActionRegistry.class), $$(FileDownloadUtils.class)); + $(ContentActionRegistry.class), $$(FileDownloadUtils.class), $$(MediaUtils.class)); final ChatRoomPanel panel = new ChatRoomPanel($(WorkspaceSkeleton.class), $(I18nTranslationService.class)); presenter.init(panel); Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -28,6 +28,7 @@ import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; @@ -38,10 +39,11 @@ private ChatRoomView view; private final I18nUITranslationService i18n; - public ChatRoomPresenter(StateManager stateManager, Session session, I18nUITranslationService i18n, - ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, - Provider<FileDownloadUtils> downloadProvider) { - super(ChatClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n); + public ChatRoomPresenter(final StateManager stateManager, final Session session, + final I18nUITranslationService i18n, final ActionContentToolbar toolbar, + final ActionRegistry<StateToken> actionRegistry, final Provider<FileDownloadUtils> downloadProvider, + final Provider<MediaUtils> mediaUtils) { + super(ChatClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, mediaUtils); this.i18n = i18n; } @@ -51,7 +53,7 @@ } @Override - protected void setState(StateContainerDTO state) { + protected void setState(final StateContainerDTO state) { if (state.getTypeId().equals(ChatClientTool.TYPE_ROOT)) { if (state.getRootContainer().getChilds().size() == 0) { view.setInfo(i18n.t("This group has no chat rooms.")); Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -39,6 +39,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; @@ -78,8 +79,8 @@ $(Session.class), $(StateManager.class), $(DeferredCommandWrapper.class), $$(ContentServiceAsync.class), $$(GroupServiceAsync.class), $$(FileUploader.class), $(ContentActionRegistry.class), $(ContextActionRegistry.class), $$(FileDownloadUtils.class), - $(EntityHeader.class), $$(ContentEditor.class), $(ErrorHandler.class), - $(DocumentViewer.class), $$(ContextPropEditor.class), $(SitePublicSpaceLink.class)); + $(EntityHeader.class), $$(ContentEditor.class), $(ErrorHandler.class), $(DocumentViewer.class), + $$(ContextPropEditor.class), $(SitePublicSpaceLink.class)); } }); @@ -97,7 +98,7 @@ public DocumentViewer create() { final DocumentViewerPresenter presenter = new DocumentViewerPresenter($(StateManager.class), $(Session.class), $(I18nUITranslationService.class), $(ActionContentToolbar.class), - $(ContentActionRegistry.class), $$(FileDownloadUtils.class)); + $(ContentActionRegistry.class), $$(FileDownloadUtils.class), $$(MediaUtils.class)); final DocumentViewerView view = new DocumentViewerPanel($(WorkspaceSkeleton.class), $(I18nTranslationService.class)); presenter.init(view); @@ -110,7 +111,7 @@ public DocFolderContent create() { final DocFolderContentPresenter presenter = new DocFolderContentPresenter($(StateManager.class), $(Session.class), $(ActionContentToolbar.class), $(ContentActionRegistry.class), - $$(FileDownloadUtils.class), $(I18nTranslationService.class)); + $$(FileDownloadUtils.class), $(I18nTranslationService.class), $$(MediaUtils.class)); final DocFolderContentView view = new DocFolderContentPanel($(WorkspaceSkeleton.class), $(I18nTranslationService.class)); presenter.init(view); Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -26,6 +26,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; @@ -33,10 +34,12 @@ public class DocFolderContentPresenter extends FoldableContentPresenter implements DocFolderContent { - public DocFolderContentPresenter(StateManager stateManager, Session session, ActionContentToolbar toolbar, - final ActionRegistry<StateToken> actionRegistry, Provider<FileDownloadUtils> downloadProvider, - I18nTranslationService i18n) { - super(DocumentClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n); + public DocFolderContentPresenter(final StateManager stateManager, final Session session, + final ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, + final Provider<FileDownloadUtils> downloadProvider, final I18nTranslationService i18n, + final Provider<MediaUtils> mediaUtils) { + super(DocumentClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, + mediaUtils); } public void init(final DocFolderContentView view) { Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -25,6 +25,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; @@ -33,18 +34,20 @@ public class DocumentViewerPresenter extends FoldableContentPresenter implements DocumentViewer { - public DocumentViewerPresenter(StateManager stateManager, Session session, I18nUITranslationService i18n, - ActionContentToolbar toolbar, ContentActionRegistry actionRegistry, - Provider<FileDownloadUtils> downloadProvider) { - super(DocumentClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n); + public DocumentViewerPresenter(final StateManager stateManager, final Session session, + final I18nUITranslationService i18n, final ActionContentToolbar toolbar, + final ContentActionRegistry actionRegistry, final Provider<FileDownloadUtils> downloadProvider, + final Provider<MediaUtils> mediaUtils) { + super(DocumentClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, + mediaUtils); } - public void init(DocumentViewerView view) { + public void init(final DocumentViewerView view) { super.init(view); } @Override - protected void setState(StateContentDTO state) { + protected void setState(final StateContentDTO state) { super.setState(state); setContent(state, DocumentClientTool.TYPE_UPLOADEDFILE); } Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -39,6 +39,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; @@ -78,8 +79,8 @@ $(Session.class), $(StateManager.class), $(DeferredCommandWrapper.class), $$(ContentServiceAsync.class), $$(GroupServiceAsync.class), $$(FileUploader.class), $(ContentActionRegistry.class), $(ContextActionRegistry.class), $$(FileDownloadUtils.class), - $(EntityHeader.class), $$(ContentEditor.class), $(ErrorHandler.class), - $(GalleryViewer.class), $$(ContextPropEditor.class), $(SitePublicSpaceLink.class)); + $(EntityHeader.class), $$(ContentEditor.class), $(ErrorHandler.class), $(GalleryViewer.class), + $$(ContextPropEditor.class), $(SitePublicSpaceLink.class)); } }); @@ -97,7 +98,7 @@ public GalleryViewer create() { final GalleryViewerPresenter presenter = new GalleryViewerPresenter($(StateManager.class), $(Session.class), $(I18nUITranslationService.class), $(ActionContentToolbar.class), - $(ContentActionRegistry.class), $$(FileDownloadUtils.class)); + $(ContentActionRegistry.class), $$(FileDownloadUtils.class), $$(MediaUtils.class)); final GalleryViewerView view = new GalleryViewerPanel($(WorkspaceSkeleton.class), $(I18nTranslationService.class)); presenter.init(view); @@ -111,7 +112,7 @@ final GalleryFolderContentPresenter presenter = new GalleryFolderContentPresenter( $(StateManager.class), $(Session.class), $(ActionContentToolbar.class), $(ContentActionRegistry.class), $(I18nTranslationService.class), $$(FileDownloadUtils.class), - $$(FileDownloadUtils.class)); + $$(FileDownloadUtils.class), $$(MediaUtils.class)); final GalleryFolderContentView view = new GalleryFolderContentPanel($(WorkspaceSkeleton.class), $(I18nTranslationService.class), $(StateManager.class), $(Session.class)); presenter.init(view); Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -30,6 +30,7 @@ import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.download.ImageSize; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; @@ -41,10 +42,12 @@ private final I18nTranslationService i18n; private final Provider<FileDownloadUtils> downloadUtils; - public GalleryFolderContentPresenter(StateManager stateManager, Session session, ActionContentToolbar toolbar, - final ActionRegistry<StateToken> actionRegistry, I18nTranslationService i18n, - Provider<FileDownloadUtils> downloadUtils, Provider<FileDownloadUtils> downloadProvider) { - super(GalleryClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n); + public GalleryFolderContentPresenter(final StateManager stateManager, final Session session, + final ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, + final I18nTranslationService i18n, final Provider<FileDownloadUtils> downloadUtils, + final Provider<FileDownloadUtils> downloadProvider, final Provider<MediaUtils> mediaUtils) { + super(GalleryClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, + mediaUtils); this.i18n = i18n; this.downloadUtils = downloadUtils; } @@ -55,7 +58,7 @@ } @Override - protected void setState(StateContainerDTO state) { + protected void setState(final StateContainerDTO state) { if (state.getTypeId().equals(GalleryClientTool.TYPE_ROOT)) { ContainerDTO rootContainer = state.getRootContainer(); if (rootContainer.getChilds().size() == 0 && rootContainer.getContents().size() == 0) { Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -25,6 +25,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; @@ -33,18 +34,20 @@ public class GalleryViewerPresenter extends FoldableContentPresenter implements GalleryViewer { - public GalleryViewerPresenter(StateManager stateManager, Session session, I18nUITranslationService i18n, - ActionContentToolbar toolbar, ContentActionRegistry actionRegistry, - Provider<FileDownloadUtils> downloadProvider) { - super(GalleryClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n); + public GalleryViewerPresenter(final StateManager stateManager, final Session session, + final I18nUITranslationService i18n, final ActionContentToolbar toolbar, + final ContentActionRegistry actionRegistry, final Provider<FileDownloadUtils> downloadProvider, + final Provider<MediaUtils> mediaUtils) { + super(GalleryClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, + mediaUtils); } - public void init(GalleryViewerView view) { + public void init(final GalleryViewerView view) { super.init(view); } @Override - protected void setState(StateContentDTO state) { + protected void setState(final StateContentDTO state) { super.setState(state); setContent(state, GalleryClientTool.TYPE_UPLOADEDFILE); } 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-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -57,6 +57,10 @@ return type; } + public boolean isFlv() { + return type != null && subtype != null && type.equals("video") && subtype.equals("flv"); + } + /** * Duplicate code in BMT * @@ -66,6 +70,11 @@ return type != null && type.equals(IMAGE); } + public boolean isMp3() { + return type != null && subtype != null && type.equals("audio") + && (subtype.equals("mp3") || subtype.equals("x-mp3") || (subtype.equals("mpeg"))); + } + /** * Duplicate code in BMT * 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-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -24,6 +24,8 @@ import com.google.gwt.user.client.rpc.IsSerializable; public class InitDataDTO implements IsSerializable { + + private String siteUrl; private UserInfoDTO userInfo; private ArrayList<LicenseDTO> licenses; private ArrayList<I18nLanguageSimpleDTO> languages; @@ -46,6 +48,7 @@ private int imgIconsize; private ArrayList<ToolSimpleDTO> userTools; private ArrayList<ToolSimpleDTO> groupTools; + private String mediaEmbedObject; public String getChatDomain() { return chatDomain; @@ -111,6 +114,10 @@ return maxFileSizeInMb; } + public String getMediaEmbedObject() { + return mediaEmbedObject; + } + public String getSiteDomain() { return siteDomain; } @@ -119,6 +126,10 @@ return siteLogoUrl; } + public String getSiteUrl() { + return siteUrl; + } + public String[] getTimezones() { return timezones; } @@ -155,11 +166,11 @@ this.countries = countries; } - public void setCurrentCCversion(String currentCCversion) { + public void setCurrentCCversion(final String currentCCversion) { this.currentCCversion = currentCCversion; } - public void setDefaultLicense(LicenseDTO defaultLicense) { + public void setDefaultLicense(final LicenseDTO defaultLicense) { this.defaultLicense = defaultLicense; } @@ -171,23 +182,23 @@ this.galleryPermittedExtensions = galleryPermittedExtensions; } - public void setGroupTools(ArrayList<ToolSimpleDTO> groupTools) { + public void setGroupTools(final ArrayList<ToolSimpleDTO> groupTools) { this.groupTools = groupTools; } - public void setImgCropsize(int imgCropsize) { + public void setImgCropsize(final int imgCropsize) { this.imgCropsize = imgCropsize; } - public void setImgIconsize(int imgIconsize) { + public void setImgIconsize(final int imgIconsize) { this.imgIconsize = imgIconsize; } - public void setImgResizewidth(int imgResizewidth) { + public void setImgResizewidth(final int imgResizewidth) { this.imgResizewidth = imgResizewidth; } - public void setImgThumbsize(int imgThumbsize) { + public void setImgThumbsize(final int imgThumbsize) { this.imgThumbsize = imgThumbsize; } @@ -203,6 +214,10 @@ this.maxFileSizeInMb = maxFileSizeInMb; } + public void setMediaEmbedObject(final String mediaEmbedObject) { + this.mediaEmbedObject = mediaEmbedObject; + } + public void setSiteDomain(final String siteDomain) { this.siteDomain = siteDomain; } @@ -211,6 +226,10 @@ this.siteLogoUrl = siteLogoUrl; } + public void setSiteUrl(final String siteUrl) { + this.siteUrl = siteUrl; + } + public void setTimezones(final String[] timezones) { this.timezones = timezones; } @@ -219,7 +238,7 @@ this.userInfo = currentUser; } - public void setUserTools(ArrayList<ToolSimpleDTO> userTools) { + public void setUserTools(final ArrayList<ToolSimpleDTO> userTools) { this.userTools = userTools; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateTokenUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateTokenUtils.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateTokenUtils.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -1,9 +1,15 @@ package org.ourproject.kune.platf.client.dto; -import org.ourproject.kune.platf.client.ui.WindowUtils; +import org.ourproject.kune.platf.client.state.Session; public class StateTokenUtils { + private final Session session; + + public StateTokenUtils(final Session session) { + this.session = session; + } + public String getPublicUrl(final StateToken token) { String publicUrl = ""; String separator = "."; @@ -13,7 +19,7 @@ String folder = token.getFolder(); String document = token.getDocument(); - publicUrl += WindowUtils.getPublicHost() + "/public"; + publicUrl += session.getSiteUrl() + "/public"; if (group != null) { publicUrl += "/" + group; 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-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -92,6 +92,7 @@ import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialogPanel; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialogPresenter; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaGroup; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.ext.InsertMediaExt; import org.ourproject.kune.platf.client.ui.rte.insertmedia.ext.InsertMediaExtPanel; import org.ourproject.kune.platf.client.ui.rte.insertmedia.ext.InsertMediaExtPresenter; @@ -489,6 +490,13 @@ } }); + + register(MediaUtils.class, new Factory<MediaUtils>(MediaUtils.class) { + @Override + public MediaUtils create() { + return new MediaUtils($(Session.class), $(FileDownloadUtils.class)); + }}); + register(InsertMediaGroup.class, new Factory<InsertMediaExt>(InsertMediaExt.class) { @Override public InsertMediaExt create() { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -105,6 +105,8 @@ int getImgThumbsize(); + InitDataDTO getInitData(); + List<I18nLanguageSimpleDTO> getLanguages(); Object[][] getLanguagesArray(); @@ -113,6 +115,8 @@ boolean getShowDeletedContent(); + String getSiteUrl(); + Object[][] getTimezones(); String getUserHash(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -147,6 +147,10 @@ return initData.getImgThumbsize(); } + public InitDataDTO getInitData() { + return initData; + } + public List<I18nLanguageSimpleDTO> getLanguages() { return initData.getLanguages(); } @@ -166,6 +170,10 @@ return currentUserInfo == null ? false : currentUserInfo.getShowDeletedContent(); } + public String getSiteUrl() { + return initData.getSiteUrl(); + } + public Object[][] getTimezones() { if (timezonesArray == null) { mapTimezones(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -30,42 +30,36 @@ return result; } - public static String getPublicHost() { - // FIXME: Maybe get from InitData the site.domain - String port = WindowUtils.getLocation().getPort(); - return "http://" + WindowUtils.getLocation().getHostName() + (port == null ? "" : ":" + port); - } - private static native String getHash() /*-{ - return $wnd.location.hash; - }-*/; + return $wnd.location.hash; + }-*/; private static native String getHost() /*-{ - return $wnd.location.host; - }-*/; + return $wnd.location.host; + }-*/; private static native String getHostName() /*-{ - return $wnd.location.hostname; - }-*/; + return $wnd.location.hostname; + }-*/; private static native String getHref() /*-{ - return $wnd.location.href; - }-*/; + return $wnd.location.href; + }-*/; private static native String getPath() /*-{ - return $wnd.location.pathname; - }-*/; + return $wnd.location.pathname; + }-*/; private static native String getPort() /*-{ - return $wnd.location.port; - }-*/; + return $wnd.location.port; + }-*/; private static native String getProtocol() /*-{ - return $wnd.location.protocol; - }-*/; + return $wnd.location.protocol; + }-*/; private static native String getQueryString() /*-{ - return $wnd.location.search; - }-*/; + return $wnd.location.search; + }-*/; } \ No newline at end of file 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-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -43,20 +43,20 @@ } public void downloadFile(final StateToken token) { - final String url = calculateUrl(token, true); + final String url = calculateUrl(token, true, true); DOM.setElementAttribute(RootPanel.get("__download").getElement(), "src", url); } - public String getImageResizedUrl(final StateToken token, ImageSize imageSize) { - return calculateUrl(token, false) + "&" + new UrlParam(FileConstants.IMGSIZE, imageSize.toString()); + public String getImageResizedUrl(final StateToken token, final ImageSize imageSize) { + return calculateUrl(token, false, true) + "&" + new UrlParam(FileConstants.IMGSIZE, imageSize.toString()); } public String getImageUrl(final StateToken token) { - return calculateUrl(token, false); + return calculateUrl(token, false, true); } - public String getLogoAvatarHtml(StateToken groupToken, boolean groupHasLogo, boolean isPersonal, int size, - int hvspace) { + public String getLogoAvatarHtml(final StateToken groupToken, final boolean groupHasLogo, final boolean isPersonal, + final int size, final int hvspace) { if (groupHasLogo) { return "<img hspace='" + hvspace + "' vspace='" + hvspace + "' align='left' style='width: " + size + "px; height: " + size + "px;' src='" + getLogoImageUrl(groupToken) + "'>"; @@ -66,13 +66,20 @@ } } - public String getLogoImageUrl(StateToken token) { + public String getLogoImageUrl(final StateToken token) { return new Url(LOGODOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, token.toString())).toString(); } - private String calculateUrl(final StateToken token, final boolean download) { - return new Url(DOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, token.toString()), new UrlParam(FileConstants.HASH, - session.getUserHash()), new UrlParam(FileConstants.DOWNLOAD, download)).toString(); + public String getUrl(final StateToken token) { + return calculateUrl(token, false, false); } + private String calculateUrl(final StateToken token, final boolean download, final boolean useHash) { + Url url = new Url(DOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, token.toString()), new UrlParam( + FileConstants.DOWNLOAD, download)); + if (useHash) { + url.add(new UrlParam(FileConstants.HASH, session.getUserHash())); + } + return url.toString(); + } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPresenter.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -53,11 +53,6 @@ insertImageDialog.getImageInfo().setClickOriginal(checked); } - public void onInsert(final ImageInfo linkInfo) { - insertImageDialog.fireOnInsertImage(linkInfo); - reset(); - } - public void onPositionFieldChanged(final String position) { insertImageDialog.getImageInfo().setPosition(position); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPresenter.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -67,11 +67,6 @@ editorInsertDialog.setOnInsertLinkPressed(onInsertLinkPressed); } - public void onInsert(final LinkInfo linkInfo) { - editorInsertDialog.fireOnInsertLink(linkInfo); - reset(); - } - public void onOverFieldChanged(final String title) { editorInsertDialog.getLinkInfo().setTitle(title); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPresenter.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -43,11 +43,6 @@ insertMediaDialog.setOnInsertPressed(onInsertMediaPressed); } - public void onInsert(final String linkInfo) { - insertMediaDialog.fireOnInsertMedia(linkInfo); - reset(); - } - public void reset() { view.reset(); } Added: 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-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -0,0 +1,24 @@ +package org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia; + +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; + +public class MediaUtils { + + public static final String DOC_FLV_URL_TAG = "###DOC_FLV_URL###"; + + private final Session session; + + private final FileDownloadUtils downloadUtils; + + public MediaUtils(final Session session, final FileDownloadUtils downloadUtils) { + this.session = session; + this.downloadUtils = downloadUtils; + } + + public String getEmbed(final StateToken token) { + return session.getInitData().getMediaEmbedObject().replace(DOC_FLV_URL_TAG, + session.getSiteUrl() + downloadUtils.getUrl(token)); + } +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/utils/Url.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/utils/Url.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/client/utils/Url.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -25,18 +25,22 @@ private final String base; private final ArrayList<UrlParam> params; - public Url(String base) { + public Url(final String base) { this.base = base; params = new ArrayList<UrlParam>(); } - public Url(String base, UrlParam... iniParams) { + public Url(final String base, final UrlParam... iniParams) { this(base); for (UrlParam param : iniParams) { - params.add(param); + add(param); } } + public void add(final UrlParam param) { + params.add(param); + } + @Override public String toString() { String paramPart = ""; Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/music.gif =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/music.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/music.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/music.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream 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-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -29,6 +29,7 @@ import org.ourproject.kune.platf.server.users.UserInfo; public class InitData { + private String siteUrl; private List<License> licenses; private List<I18nLanguage> languages; private List<I18nCountry> countries; @@ -51,6 +52,7 @@ private int imgIconsize; private ArrayList<ToolSimple> userTools; private ArrayList<ToolSimple> groupTools; + private String mediaEmbedObject; public String getChatDomain() { return chatDomain; @@ -116,6 +118,10 @@ return maxFileSizeInMb; } + public String getMediaEmbedObject() { + return mediaEmbedObject; + } + public String getSiteDomain() { return siteDomain; } @@ -124,6 +130,10 @@ return siteLogoUrl; } + public String getSiteUrl() { + return siteUrl; + } + public String[] getTimezones() { return timezones; } @@ -156,11 +166,11 @@ this.countries = countries; } - public void setCurrentCCversion(String currentCCversion) { + public void setCurrentCCversion(final String currentCCversion) { this.currentCCversion = currentCCversion; } - public void setDefaultLicense(License defaultLicense) { + public void setDefaultLicense(final License defaultLicense) { this.defaultLicense = defaultLicense; } @@ -172,23 +182,23 @@ this.galleryPermittedExtensions = galleryPermittedExtensions; } - public void setGroupTools(ArrayList<ToolSimple> groupTools) { + public void setGroupTools(final ArrayList<ToolSimple> groupTools) { this.groupTools = groupTools; } - public void setImgCropsize(int imgCropsize) { + public void setImgCropsize(final int imgCropsize) { this.imgCropsize = imgCropsize; } - public void setImgIconsize(int imgIconsize) { + public void setImgIconsize(final int imgIconsize) { this.imgIconsize = imgIconsize; } - public void setImgResizewidth(int imgResizewidth) { + public void setImgResizewidth(final int imgResizewidth) { this.imgResizewidth = imgResizewidth; } - public void setImgThumbsize(int imgThumbsize) { + public void setImgThumbsize(final int imgThumbsize) { this.imgThumbsize = imgThumbsize; } @@ -204,6 +214,10 @@ this.maxFileSizeInMb = maxFileSizeInMb; } + public void setMediaEmbedObject(final String mediaEmbedObject) { + this.mediaEmbedObject = mediaEmbedObject; + } + public void setSiteDomain(final String siteDomain) { this.siteDomain = siteDomain; } @@ -212,6 +226,10 @@ this.siteLogoUrl = siteLogoUrl; } + public void setSiteUrl(final String siteUrl) { + this.siteUrl = siteUrl; + } + public void setTimezones(final String[] timezones) { this.timezones = timezones; } @@ -220,7 +238,7 @@ this.userInfo = currentUserInfo; } - public void setUserTools(ArrayList<ToolSimple> userTools) { + public void setUserTools(final ArrayList<ToolSimple> userTools) { this.userTools = userTools; } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -161,14 +161,14 @@ } } - @Finder(query = "FROM Content WHERE lastRevision.title LIKE :title AND (mimeType.mimetype=:mimetype OR mimeType.mimetype=:mimetype2) AND container.owner.shortName=:group AND status != 'inTheDustbin' ORDER BY lastRevision.title ASC") + @Finder(query = "FROM Content WHERE lastRevision.title LIKE :title AND (mimeType.mimetype=:mimetype OR mimeType.mimetype=:mimetype2) AND container.owner.shortName=:group AND deletedOn=null ORDER BY lastRevision.title ASC") public List<Content> find2Mime(@Named("group") final String groupShortName, @Named("title") final String title, @Named("mimetype") final String mimetype, @Named("mimetype2") final String mimetype2, @FirstResult final int offset, @MaxResults final int limit) { return null; } - @Finder(query = "SELECT count(id) FROM Content WHERE lastRevision.title LIKE :title AND (mimeType.mimetype=:mimetype OR mimeType.mimetype=:mimetype2) AND container.owner.shortName=:group AND status != 'inTheDustbin'") + @Finder(query = "SELECT count(id) FROM Content WHERE lastRevision.title LIKE :title AND (mimeType.mimetype=:mimetype OR mimeType.mimetype=:mimetype2) AND container.owner.shortName=:group AND deletedOn=null") public int find2MimeCount(@Named("group") final String groupShortName, @Named("title") final String title, @Named("mimetype") final String mimetype, @Named("mimetype2") final String mimetype2) { return 0; @@ -179,13 +179,13 @@ return null; } - @Finder(query = "FROM Content WHERE lastRevision.title LIKE :title AND mimeType.mimetype=:mimetype AND container.owner.shortName=:group AND status != 'inTheDustbin' ORDER BY lastRevision.title ASC") + @Finder(query = "FROM Content WHERE lastRevision.title LIKE :title AND mimeType.mimetype=:mimetype AND container.owner.shortName=:group AND deletedOn=null ORDER BY lastRevision.title ASC") public List<Content> findMime(@Named("group") final String groupShortName, @Named("title") final String title, @Named("mimetype") final String mimetype, @FirstResult final int offset, @MaxResults final int limit) { return null; } - @Finder(query = "SELECT count(id) FROM Content WHERE lastRevision.title LIKE :title AND mimeType.mimetype=:mimetype AND container.owner.shortName=:group AND status != 'inTheDustbin'") + @Finder(query = "SELECT count(id) FROM Content WHERE lastRevision.title LIKE :title AND mimeType.mimetype=:mimetype AND container.owner.shortName=:group AND deletedOn=null") public int findMimeCount(@Named("group") final String groupShortName, @Named("title") final String title, @Named("mimetype") final String mimetype) { return 0; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -87,8 +87,9 @@ } } - String buildResponse(final Content cnt, final StateToken stateToken, final String downloadS, String imageSizeS, - final HttpServletResponse resp, FileUtils fileUtils) throws FileNotFoundException, IOException { + String buildResponse(final Content cnt, final StateToken stateToken, final String downloadS, + final String imageSizeS, final HttpServletResponse resp, final FileUtils fileUtils) + throws FileNotFoundException, IOException { final ImageSize imgsize = imageSizeS == null ? null : ImageSize.valueOf(imageSizeS); final boolean download = downloadS != null && downloadS.equals("true") ? true : false; final String absDir = kuneProperties.get(KuneProperties.UPLOAD_LOCATION) + FileUtils.toDir(stateToken); @@ -121,10 +122,8 @@ resp.setContentLength((int) file.length()); if (mimeType == null || download) { resp.setContentType(APPLICATION_X_DOWNLOAD); - } else if (mimeType.isImage()) { - resp.setContentType(mimeType.toString()); } else { - resp.setContentType(APPLICATION_X_DOWNLOAD); + resp.setContentType(mimeType.toString()); } resp.setHeader(RESP_HEADER_CONTEND_DISP, RESP_HEADER_ATTACHMENT_FILENAME + title + extension + RESP_HEADER_END); return absFilename; 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-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/server/properties/KuneProperties.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -20,8 +20,9 @@ package org.ourproject.kune.platf.server.properties; public interface KuneProperties { + String SITE_URL = "kune.siteurl"; + String SITE_DOMAIN = "kune.site.domain"; String DEFAULT_SITE_SHORT_NAME = "kune.default.site.shortName"; - String SITE_DOMAIN = "kune.site.domain"; String CURRENT_CC_VERSION = "kune.currentccversion"; String CHAT_HTTP_BASE = "kune.chat.httpbase"; String CHAT_DOMAIN = "kune.chat.domain"; @@ -36,6 +37,7 @@ String IMAGES_THUMBSIZE = "kune.images.thumbsize"; String IMAGES_CROPSIZE = "kune.images.cropsize"; String IMAGES_ICONSIZE = "kune.images.iconsize"; + String MEDIA_EMBEDED_OBJECT = "kune.media.embededobject"; String get(String key); 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-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -79,6 +79,7 @@ final InitData data = new InitData(); final UserSession userSession = getUserSession(); + data.setSiteUrl(kuneProperties.get(KuneProperties.SITE_URL)); data.setLicenses(licenseManager.getAll()); data.setLanguages(languageManager.getAll()); data.setCountries(countryManager.getAll()); @@ -102,6 +103,7 @@ data.setImgThumbsize(new Integer(kuneProperties.get(KuneProperties.IMAGES_THUMBSIZE))); data.setImgCropsize(new Integer(kuneProperties.get(KuneProperties.IMAGES_CROPSIZE))); data.setImgIconsize(new Integer(kuneProperties.get(KuneProperties.IMAGES_ICONSIZE))); + data.setMediaEmbedObject(kuneProperties.get(KuneProperties.MEDIA_EMBEDED_OBJECT)); return mapper.map(data, InitDataDTO.class); } Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -29,6 +29,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import org.ourproject.kune.wiki.client.cnt.WikiFolderContent; import org.ourproject.kune.wiki.client.cnt.WikiFolderContentPanel; @@ -97,7 +98,7 @@ public WikiViewer create() { final WikiViewerPresenter presenter = new WikiViewerPresenter($(StateManager.class), $(Session.class), $(I18nUITranslationService.class), $(ActionContentToolbar.class), - $(ContentActionRegistry.class), $$(FileDownloadUtils.class)); + $(ContentActionRegistry.class), $$(FileDownloadUtils.class), $$(MediaUtils.class)); final WikiViewerView view = new WikiViewerPanel($(WorkspaceSkeleton.class), $(I18nTranslationService.class)); presenter.init(view); @@ -110,7 +111,7 @@ public WikiFolderContent create() { final WikiFolderContentPresenter presenter = new WikiFolderContentPresenter($(StateManager.class), $(Session.class), $(ActionContentToolbar.class), $(ContentActionRegistry.class), - $(I18nTranslationService.class), $$(FileDownloadUtils.class)); + $(I18nTranslationService.class), $$(FileDownloadUtils.class), $$(MediaUtils.class)); final WikiFolderContentView view = new WikiFolderContentPanel($(WorkspaceSkeleton.class), $(I18nTranslationService.class)); presenter.init(view); Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -27,6 +27,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.wiki.client.WikiClientTool; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; @@ -38,10 +39,11 @@ private WikiFolderContentView view; private final I18nTranslationService i18n; - public WikiFolderContentPresenter(StateManager stateManager, Session session, ActionContentToolbar toolbar, - final ActionRegistry<StateToken> actionRegistry, I18nTranslationService i18n, - Provider<FileDownloadUtils> downloadProvider) { - super(WikiClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n); + public WikiFolderContentPresenter(final StateManager stateManager, final Session session, + final ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, + final I18nTranslationService i18n, final Provider<FileDownloadUtils> downloadProvider, + final Provider<MediaUtils> mediaUtils) { + super(WikiClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, mediaUtils); this.i18n = i18n; } @@ -51,7 +53,7 @@ } @Override - protected void setState(StateContainerDTO state) { + protected void setState(final StateContainerDTO state) { if (state.getTypeId().equals(WikiClientTool.TYPE_ROOT)) { ContainerDTO rootContainer = state.getRootContainer(); if (rootContainer.getChilds().size() == 0 && rootContainer.getContents().size() == 0) { Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -24,6 +24,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.wiki.client.WikiClientTool; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; @@ -33,18 +34,19 @@ public class WikiViewerPresenter extends FoldableContentPresenter implements WikiViewer { - public WikiViewerPresenter(StateManager stateManager, Session session, I18nUITranslationService i18n, - ActionContentToolbar toolbar, ContentActionRegistry actionRegistry, - Provider<FileDownloadUtils> downloadProvider) { - super(WikiClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n); + public WikiViewerPresenter(final StateManager stateManager, final Session session, + final I18nUITranslationService i18n, final ActionContentToolbar toolbar, + final ContentActionRegistry actionRegistry, final Provider<FileDownloadUtils> downloadProvider, + final Provider<MediaUtils> mediaUtils) { + super(WikiClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, mediaUtils); } - public void init(WikiViewerView view) { + public void init(final WikiViewerView view) { super.init(view); } @Override - protected void setState(StateContentDTO state) { + protected void setState(final StateContentDTO state) { super.setState(state); setContent(state, WikiClientTool.TYPE_UPLOADEDFILE); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -57,6 +57,7 @@ import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkGroup; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaGroup; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.platf.client.ui.rte.saving.RTESavingEditorPanel; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import org.ourproject.kune.platf.client.utils.TimerWrapper; @@ -80,9 +81,9 @@ import org.ourproject.kune.workspace.client.editor.insertlocallink.InsertLinkLocal; import org.ourproject.kune.workspace.client.editor.insertlocallink.InsertLinkLocalPanel; import org.ourproject.kune.workspace.client.editor.insertlocallink.InsertLinkLocalPresenter; +import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertMediaLocal; import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertMediaLocalPanel; import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertMediaLocalPresenter; -import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertMediaLocal; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.entityheader.EntityHeaderPanel; import org.ourproject.kune.workspace.client.entityheader.EntityHeaderPresenter; @@ -306,7 +307,7 @@ register(Singleton.class, new Factory<StateTokenUtils>(StateTokenUtils.class) { @Override public StateTokenUtils create() { - return new StateTokenUtils(); + return new StateTokenUtils($(Session.class)); } }); @@ -936,7 +937,7 @@ final InsertImageLocalPresenter presenter = new InsertImageLocalPresenter($(InsertImageDialog.class), $(Session.class)); final InsertImageLocalPanel panel = new InsertImageLocalPanel(presenter, - $(I18nTranslationService.class), $(FileDownloadUtils.class)); + $(I18nTranslationService.class), $(FileDownloadUtils.class), $(Session.class)); presenter.init(panel); return presenter; } @@ -975,7 +976,7 @@ @Override public InsertMediaLocal create() { final InsertMediaLocalPresenter presenter = new InsertMediaLocalPresenter($(InsertMediaDialog.class), - $(Session.class)); + $(Session.class), $$(MediaUtils.class)); final InsertMediaLocalPanel panel = new InsertMediaLocalPanel(presenter, $(I18nTranslationService.class), $(FileDownloadUtils.class)); presenter.init(panel); 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-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -32,6 +32,7 @@ import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.download.ImageSize; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; import com.calclab.suco.client.events.Listener; @@ -45,16 +46,19 @@ private final ActionContentToolbar toolbar; private final Provider<FileDownloadUtils> downloadProvider; private final I18nTranslationService i18n; + private final Provider<MediaUtils> mediaUtils; - public FoldableContentPresenter(final String toolName, StateManager stateManager, Session session, - final ActionContentToolbar toolbar, ActionRegistry<StateToken> actionRegistry, - Provider<FileDownloadUtils> downloadProvider, I18nTranslationService i18n) { + public FoldableContentPresenter(final String toolName, final StateManager stateManager, final Session session, + final ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, + final Provider<FileDownloadUtils> downloadProvider, final I18nTranslationService i18n, + final Provider<MediaUtils> mediaUtils) { this.toolName = toolName; this.session = session; this.toolbar = toolbar; this.actionRegistry = actionRegistry; this.downloadProvider = downloadProvider; this.i18n = i18n; + this.mediaUtils = mediaUtils; stateManager.onStateChanged(new Listener<StateAbstractDTO>() { public void onEvent(final StateAbstractDTO state) { setState(state); @@ -70,7 +74,7 @@ setState(session.getContentState()); } - protected void setContent(StateContentDTO state, String uploadedfileType) { + protected void setContent(final StateContentDTO state, final String uploadedfileType) { String typeId = state.getTypeId(); String contentBody = state.getContent(); StateToken token = state.getStateToken(); @@ -84,6 +88,8 @@ } else if (mimeType.isPdf()) { view.showImage(fileDownloadUtils.getImageUrl(token), fileDownloadUtils.getImageResizedUrl(token, ImageSize.sized), true); + } else if (mimeType.isMp3() || mimeType.isFlv()) { + view.setContent(mediaUtils.get().getEmbed(token), false); } else if (mimeType.isText()) { view.setContent(contentBody, true); } else { @@ -106,7 +112,7 @@ view.attach(); } - protected void setState(StateAbstractDTO state) { + protected void setState(final StateAbstractDTO state) { toolbar.detach(); if (state instanceof StateContainerDTO) { StateContainerDTO stateCntCtx = (StateContainerDTO) state; @@ -121,23 +127,24 @@ } } - protected void setState(StateContainerDTO state) { + protected void setState(final StateContainerDTO state) { ActionItemCollection<StateToken> collection = getActionCollection(state, state.getContainerRights()); setToolbar(collection); attach(); } - protected void setState(StateContentDTO state) { + protected void setState(final StateContentDTO state) { ActionItemCollection<StateToken> collection = getActionCollection(state, state.getContentRights()); setToolbar(collection); } - private ActionItemCollection<StateToken> getActionCollection(StateContainerDTO state, AccessRightsDTO rights) { + private ActionItemCollection<StateToken> getActionCollection(final StateContainerDTO state, + final AccessRightsDTO rights) { return actionRegistry.getCurrentActions(state.getStateToken(), state.getTypeId(), session.isLogged(), rights, true); } - private void setToolbar(ActionItemCollection<StateToken> collection) { + private void setToolbar(final ActionItemCollection<StateToken> collection) { toolbar.disableMenusAndClearButtons(); toolbar.addActions(collection, AbstractFoldableContentActions.CONTENT_TOPBAR); ; 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-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -4,7 +4,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.ui.WindowUtils; +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; @@ -20,7 +20,7 @@ protected String src; public InsertImageLocalPanel(final InsertImageLocalPresenter presenter, final I18nTranslationService i18n, - final FileDownloadUtils downloadUtils) { + final FileDownloadUtils downloadUtils, final Session session) { super(i18n.t("Local"), presenter); final AbstractLiveSearcherField cb = new AbstractLiveSearcherField(i18n, @@ -29,7 +29,7 @@ + SearcherContants.CONTENT_TEMPLATE_TEXT_SUFFIX, SearcherContants.CONTENT_DATA_PROXY_URL, new Listener<LinkDTO>() { public void onEvent(final LinkDTO link) { - src = WindowUtils.getPublicHost() + downloadUtils.getImageUrl(new StateToken(link.getLink())); + src = session.getSiteUrl() + downloadUtils.getImageUrl(new StateToken(link.getLink())); } }); cb.setLabel(i18n.t("Local images")); 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-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -4,7 +4,6 @@ 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.ui.WindowUtils; 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; @@ -29,7 +28,7 @@ + SearcherContants.CONTENT_TEMPLATE_TEXT_SUFFIX, SearcherContants.CONTENT_DATA_PROXY_URL, new Listener<LinkDTO>() { public void onEvent(final LinkDTO link) { - src = WindowUtils.getPublicHost() + downloadUtils.getImageUrl(new StateToken(link.getLink())); + src = link.getLink(); } }); cb.setLabel(i18n.t("Local media")); 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-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -1,16 +1,23 @@ package org.ourproject.kune.workspace.client.editor.insertlocalmedia; +import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPresenter; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; +import com.calclab.suco.client.ioc.Provider; + public class InsertMediaLocalPresenter extends InsertMediaAbstractPresenter implements InsertMediaLocal { private final Session session; + private final Provider<MediaUtils> mediaUtils; - public InsertMediaLocalPresenter(final InsertMediaDialog insertMediaDialog, final Session session) { + public InsertMediaLocalPresenter(final InsertMediaDialog insertMediaDialog, final Session session, + final Provider<MediaUtils> mediaUtils) { super(insertMediaDialog); this.session = session; + this.mediaUtils = mediaUtils; } public String getCurrentGroupName() { @@ -20,4 +27,9 @@ public void init(final InsertMediaLocalView view) { super.init(view); } + + @Override + protected String updateMediaInfo() { + return mediaUtils.get().getEmbed(new StateToken(view.getSrc())); + } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tool/FoldableAbstractClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tool/FoldableAbstractClientTool.java 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tool/FoldableAbstractClientTool.java 2009-04-22 00:41:57 UTC (rev 1097) @@ -29,9 +29,9 @@ protected final ContentCapabilitiesRegistry contentCapabilitiesRegistry; - public FoldableAbstractClientTool(String shortName, String longName, ToolSelector toolSelector, - WsThemePresenter wsThemePresenter, WorkspaceSkeleton ws, - ContentCapabilitiesRegistry contentCapabilitiesRegistry) { + public FoldableAbstractClientTool(final String shortName, final String longName, final ToolSelector toolSelector, + final WsThemePresenter wsThemePresenter, final WorkspaceSkeleton ws, + final ContentCapabilitiesRegistry contentCapabilitiesRegistry) { super(shortName, longName, toolSelector, wsThemePresenter, ws); this.contentCapabilitiesRegistry = contentCapabilitiesRegistry; } @@ -44,57 +44,58 @@ contentCapabilitiesRegistry.getIconsRegistry().registerContentTypeIcon(contentTypeId, iconUrl); } - protected void registerAclEditableTypes(String... typeIds) { + protected void registerAclEditableTypes(final String... typeIds) { contentCapabilitiesRegistry.getAclEditable().register(typeIds); } - protected void registerAuthorableTypes(String... typeIds) { + protected void registerAuthorableTypes(final String... typeIds) { contentCapabilitiesRegistry.getAuthorable().register(typeIds); } - protected void registerComentableTypes(String... typeIds) { + protected void registerComentableTypes(final String... typeIds) { contentCapabilitiesRegistry.getComentable().register(typeIds); } - protected void registerDragableTypes(String... typeIds) { + protected void registerDragableTypes(final String... typeIds) { contentCapabilitiesRegistry.getDragable().register(typeIds); } - protected void registerDropableTypes(String... typeIds) { + protected void registerDropableTypes(final String... typeIds) { contentCapabilitiesRegistry.getDropable().register(typeIds); } - protected void registerEmailSubscribeAbleTypes(String... typeIds) { + protected void registerEmailSubscribeAbleTypes(final String... typeIds) { contentCapabilitiesRegistry.getEmailSubscribeAble().register(typeIds); } - protected void registerLicensableTypes(String... typeIds) { + protected void registerLicensableTypes(final String... typeIds) { contentCapabilitiesRegistry.getLicensable().register(typeIds); } - protected void registerPublishModerableTypes(String... typeIds) { + protected void registerPublishModerableTypes(final String... typeIds) { contentCapabilitiesRegistry.getPublishModerable().register(typeIds); } - protected void registerRateableTypes(String... typeIds) { + protected void registerRateableTypes(final String... typeIds) { contentCapabilitiesRegistry.getRateable().register(typeIds); } - protected void registerRenamableTypes(String... typeIds) { + protected void registerRenamableTypes(final String... typeIds) { contentCapabilitiesRegistry.getRenamable().register(typeIds); } - protected void registerTageableTypes(String... typeIds) { + protected void registerTageableTypes(final String... typeIds) { contentCapabilitiesRegistry.getTageable().register(typeIds); } - protected void registerTranslatableTypes(String... typeIds) { + protected void registerTranslatableTypes(final String... typeIds) { contentCapabilitiesRegistry.getTranslatable().register(typeIds); } - protected void registerUploadTypesAndMimes(String typeUploadedfile) { + protected void registerUploadTypesAndMimes(final String typeUploadedfile) { registerContentTypeIcon(typeUploadedfile, new BasicMimeTypeDTO("image"), "images/nav/picture.png"); registerContentTypeIcon(typeUploadedfile, new BasicMimeTypeDTO("video"), "images/nav/film.png"); + registerContentTypeIcon(typeUploadedfile, new BasicMimeTypeDTO("audio"), "images/nav/music.png"); registerContentTypeIcon(typeUploadedfile, new BasicMimeTypeDTO("application", "pdf"), "images/nav/page_pdf.png"); registerContentTypeIcon(typeUploadedfile, new BasicMimeTypeDTO("application", "zip"), "images/nav/page_zip.png"); registerContentTypeIcon(typeUploadedfile, new BasicMimeTypeDTO("application", "zip"), "images/nav/page_zip.png"); @@ -108,15 +109,15 @@ registerContentTypeIcon(typeUploadedfile, "images/nav/page.png"); } - protected void registerVersionableTypes(String... typeIds) { + protected void registerVersionableTypes(final String... typeIds) { contentCapabilitiesRegistry.getVersionable().register(typeIds); } - protected void registerXmppComentableTypes(String... typeIds) { + protected void registerXmppComentableTypes(final String... typeIds) { contentCapabilitiesRegistry.getXmppComentable().register(typeIds); } - protected void registerXmppNotifyCapableTypes(String... typeIds) { + protected void registerXmppNotifyCapableTypes(final String... typeIds) { contentCapabilitiesRegistry.getXmppNotificyCapable().register(typeIds); } } Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2009-04-21 12:54:21 UTC (rev 1096) +++ trunk/src/main/resources/kune.properties 2009-04-22 00:41:57 UTC (rev 1097) @@ -1,14 +1,28 @@ +### kune.properties +### general + +kune.upload.location = /var/lib/kune/uploads/ + +### site config + +kune.siteurl = http://localhost:8080 + +kune.sitelogourl = images/kune-logo-16px.png + # Every kune site have a group with this name: kune.default.site.name = Site Administration kune.default.site.shortName = site kune.site.domain = localhost +### licenses + kune.default.license = by-sa-v3.0 # Current CC version, see license table and shortname field (for instance by-sa-v3.0) kune.currentccversion = v3.0 -# Superuser of a kune installation (is member of site group) +### Superuser of a kune installation (is member of site group) + kune.admin.name = Site Administrator kune.admin.shortName = admin kune.admin.email = admin(a)localhost.localdomain @@ -18,16 +32,14 @@ kune.chat.domain = localhost kune.chat.roomHost = rooms.localhost -# Workspace enabled themes +### Workspace enabled themes + # This names are also the name of the items in the theme menu and there are translated kune.wsthemes = default,green,blue,grey,purple,red kune.wsthemes.default = default -kune.sitelogourl = images/kune-logo-16px.png +### Gallery options -kune.upload.location = /var/lib/kune/uploads/ - -# Gallery options kune.upload.gallerypermittedextensions = jpg,jpeg,png,gif,bmp,svg,avi,mpg,mpeg,ogg,mov,tif,tiff,mp3,wav kune.upload.maxfilesizeinmegas = 10 # Images are resized to thumbsize pixels and later cropped (centered) to cropsize @@ -36,3 +48,9 @@ kune.images.thumbsize = 100 kune.images.cropsize = 85 kune.images.iconsize = 16 + +### Media options + +# The code used to play local embeded videos/audios. Change this with other player/code (include a ###DOC_FLV_URL### tag) +kune.media.embededobject = <object width="300" height="200" 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_FLV_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#112233"},"plugins":{"controls":{"time":true,"volume":false,"fullscreen":true}}}' /> <param name="wmode" value="opaque"> </object> +

1 0

21 Apr '09

Author: vjrj Date: 2009-04-21 14:54:21 +0200 (Tue, 21 Apr 2009) New Revision: 1096 Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaGroup.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExt.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/insertmedia/ext/InsertMediaExtView.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocal.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/editor/insertlocalmedia/InsertMediaLocalView.java Removed: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertMediaGroup.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMedia.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaView.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMedia.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaView.java Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/LinkDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/services/CoreModule.java trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.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/InsertMediaDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/Container.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherContants.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java Log: Incomplete - task Reset on insert image Incomplete - task Hibernate search improving Incomplete - task Field order problem in new user Incomplete - task Insert Media dialog Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/LinkDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/LinkDTO.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/LinkDTO.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -92,6 +92,6 @@ @Override public String toString() { - return "LinkDTO[(" + getLink() + "): " + getShortName() + "]"; + return "LinkDTO[" + getLink() + ": " + getLongName() + "]"; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/CoreModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/CoreModule.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/CoreModule.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -23,8 +23,8 @@ import org.ourproject.kune.platf.client.app.EntityOptionsGroup; import org.ourproject.kune.platf.client.app.ToolGroup; import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageGroup; -import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertMediaGroup; import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkGroup; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaGroup; import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharGroup; import com.calclab.suco.client.ioc.module.AbstractModule; 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-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -73,7 +73,6 @@ import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialogPanel; import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialogPresenter; import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageGroup; -import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertMediaGroup; import org.ourproject.kune.platf.client.ui.rte.insertimg.ext.InsertImageExt; import org.ourproject.kune.platf.client.ui.rte.insertimg.ext.InsertImageExtPanel; import org.ourproject.kune.platf.client.ui.rte.insertimg.ext.InsertImageExtPresenter; @@ -92,9 +91,10 @@ import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialogPanel; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialogPresenter; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.ext.InsertExtMedia; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.ext.InsertExtMediaPanel; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.ext.InsertExtMediaPresenter; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaGroup; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.ext.InsertMediaExt; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.ext.InsertMediaExtPanel; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.ext.InsertMediaExtPresenter; import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialog; import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialogPanel; import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialogPresenter; @@ -489,11 +489,11 @@ } }); - register(InsertMediaGroup.class, new Factory<InsertExtMedia>(InsertExtMedia.class) { + register(InsertMediaGroup.class, new Factory<InsertMediaExt>(InsertMediaExt.class) { @Override - public InsertExtMedia create() { - final InsertExtMediaPresenter presenter = new InsertExtMediaPresenter($(InsertMediaDialog.class), $(ExternalMediaRegistry.class)); - final InsertExtMediaPanel panel = new InsertExtMediaPanel(presenter, i18n, $(ExternalMediaRegistry.class)); + public InsertMediaExt create() { + final InsertMediaExtPresenter presenter = new InsertMediaExtPresenter($(InsertMediaDialog.class), $(ExternalMediaRegistry.class)); + final InsertMediaExtPanel panel = new InsertMediaExtPanel(presenter, i18n, $(ExternalMediaRegistry.class)); presenter.init(panel); return presenter; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -79,6 +79,8 @@ String getCurrentCCversion(); + String getCurrentGroupShortName(); + I18nLanguageDTO getCurrentLanguage(); StateAbstractDTO getCurrentState(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -95,6 +95,10 @@ return initData.getCurrentCCversion(); } + public String getCurrentGroupShortName() { + return currentState == null ? null : currentState.getStateToken().getGroup(); + } + public I18nLanguageDTO getCurrentLanguage() { return currentLanguage; } @@ -177,7 +181,7 @@ return initData.getUserTools(); } - public boolean inSameToken(StateToken token) { + public boolean inSameToken(final StateToken token) { return getCurrentStateToken().equals(token); } Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertMediaGroup.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertMediaGroup.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertMediaGroup.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -1,27 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.insertimg; - -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstract; - -import com.calclab.suco.client.ioc.Container; -import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.ioc.decorator.ProviderCollection; -import com.calclab.suco.client.ioc.decorator.Singleton; - -public class InsertMediaGroup extends ProviderCollection { - - public InsertMediaGroup(final Container container) { - super(container, Singleton.instance); - } - - public void createAll() { - for (final Provider<?> p : getProviders()) { - p.get(); - } - } - - public void resetAll() { - for (final Provider<?> p : getProviders()) { - ((InsertMediaAbstract) p.get()).reset(); - } - } -} 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-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -27,9 +27,11 @@ 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); + this.presenter = presenter; super.setAutoWidth(true); super.setHeight(InsertImageDialogView.HEIGHT); super.getFormPanel().setLabelWidth(DEF_FIELD_LABEL_WITH + 20); @@ -134,6 +136,13 @@ super.insert(index, component); } + @Override + public void reset() { + super.reset(); + ImageInfo linkImage = presenter.getImageInfo(); + updateValues(linkImage); + } + public void setIntro(final String text) { intro.setHtml(text); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -3,7 +3,6 @@ import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; -import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertMediaGroup; import com.calclab.suco.client.events.Listener0; import com.gwtext.client.core.EventObject; Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaGroup.java (from rev 1089, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertMediaGroup.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertMediaGroup.java 2009-03-30 13:48:35 UTC (rev 1089) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaGroup.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -0,0 +1,27 @@ +package org.ourproject.kune.platf.client.ui.rte.insertmedia; + +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstract; + +import com.calclab.suco.client.ioc.Container; +import com.calclab.suco.client.ioc.Provider; +import com.calclab.suco.client.ioc.decorator.ProviderCollection; +import com.calclab.suco.client.ioc.decorator.Singleton; + +public class InsertMediaGroup extends ProviderCollection { + + public InsertMediaGroup(final Container container) { + super(container, Singleton.instance); + } + + public void createAll() { + for (final Provider<?> p : getProviders()) { + p.get(); + } + } + + public void resetAll() { + for (final Provider<?> p : getProviders()) { + ((InsertMediaAbstract) p.get()).reset(); + } + } +} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMedia.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMedia.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMedia.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -1,7 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.insertmedia.ext; - -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstract; - -public interface InsertExtMedia extends InsertMediaAbstract { - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaPanel.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaPanel.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -1,16 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.insertmedia.ext; - -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.ExternalMediaRegistry; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPanel; - -public class InsertExtMediaPanel extends InsertMediaAbstractPanel implements InsertExtMediaView { - - public InsertExtMediaPanel(final InsertExtMediaPresenter presenter, final I18nTranslationService i18n, - 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/>"); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaPresenter.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -1,45 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.insertmedia.ext; - -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; - -public class InsertExtMediaPresenter extends InsertMediaAbstractPresenter implements InsertExtMedia { - - private InsertExtMediaView view; - private final ExternalMediaRegistry externalMediaRegistry; - private ExternalMediaDescriptor mediaDescriptor; - - public InsertExtMediaPresenter(final InsertMediaDialog insertMediaDialog, - final ExternalMediaRegistry externalMediaRegistry) { - super(insertMediaDialog); - this.externalMediaRegistry = externalMediaRegistry; - - externalMediaRegistry.add(new ExternalMediaDescriptor("youtube", "http://youtube.com", - "http://[a-z]*.youtube.com/watch?v=.*", "FIXME", "<embed [%d]>")); - } - - public void init(final InsertExtMediaView view) { - super.init(view); - this.view = view; - } - - @Override - public boolean isValid() { - String url = view.getSrc(); - mediaDescriptor = externalMediaRegistry.get(url); - if (mediaDescriptor.equals(ExternalMediaRegistry.NO_MEDIA)) { - insertMediaDialog.setErrorMessage("We cannot process this video link", Level.error); - return false; - } else { - return true; - } - } - - @Override - protected String updateMediaInfo() { - return mediaDescriptor.getEmbed(view.getSrc()); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaView.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaView.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -1,6 +0,0 @@ -package org.ourproject.kune.platf.client.ui.rte.insertmedia.ext; - -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractView; - -public interface InsertExtMediaView extends InsertMediaAbstractView { -} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExt.java (from rev 1089, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMedia.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMedia.java 2009-03-30 13:48:35 UTC (rev 1089) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExt.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -0,0 +1,7 @@ +package org.ourproject.kune.platf.client.ui.rte.insertmedia.ext; + +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstract; + +public interface InsertMediaExt extends InsertMediaAbstract { + +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPanel.java (from rev 1089, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaPanel.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaPanel.java 2009-03-30 13:48:35 UTC (rev 1089) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPanel.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -0,0 +1,16 @@ +package org.ourproject.kune.platf.client.ui.rte.insertmedia.ext; + +import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.ExternalMediaRegistry; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPanel; + +public class InsertMediaExtPanel extends InsertMediaAbstractPanel implements InsertMediaExtView { + + public InsertMediaExtPanel(final InsertMediaExtPresenter presenter, final I18nTranslationService i18n, + 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/>"); + } + +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java (from rev 1089, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaPresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaPresenter.java 2009-03-30 13:48:35 UTC (rev 1089) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -0,0 +1,45 @@ +package org.ourproject.kune.platf.client.ui.rte.insertmedia.ext; + +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; + +public class InsertMediaExtPresenter extends InsertMediaAbstractPresenter implements InsertMediaExt { + + private InsertMediaExtView view; + private final ExternalMediaRegistry externalMediaRegistry; + private ExternalMediaDescriptor mediaDescriptor; + + public InsertMediaExtPresenter(final InsertMediaDialog insertMediaDialog, + final ExternalMediaRegistry externalMediaRegistry) { + super(insertMediaDialog); + this.externalMediaRegistry = externalMediaRegistry; + + externalMediaRegistry.add(new ExternalMediaDescriptor("youtube", "http://youtube.com", + "http://[a-z]*.youtube.com/watch?v=.*", "FIXME", "<embed [%d]>")); + } + + public void init(final InsertMediaExtView view) { + super.init(view); + this.view = view; + } + + @Override + public boolean isValid() { + String url = view.getSrc(); + mediaDescriptor = externalMediaRegistry.get(url); + if (mediaDescriptor.equals(ExternalMediaRegistry.NO_MEDIA)) { + insertMediaDialog.setErrorMessage("We cannot process this video link", Level.error); + return false; + } else { + return true; + } + } + + @Override + protected String updateMediaInfo() { + return mediaDescriptor.getEmbed(view.getSrc()); + } +} Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtView.java (from rev 1089, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaView.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertExtMediaView.java 2009-03-30 13:48:35 UTC (rev 1089) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtView.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -0,0 +1,6 @@ +package org.ourproject.kune.platf.client.ui.rte.insertmedia.ext; + +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractView; + +public interface InsertMediaExtView extends InsertMediaAbstractView { +} Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -40,12 +40,7 @@ "language.code", "language.englishName", "language.nativeName", "lastRevision.body", "lastRevision.title", "mimeType.mimetype" }; - String[] DEF_GROUP_SEARCH_FIELDS = new String[] { "container.owner.shortName", "authors.name", "authors.shortName", - "container.name", "language.code", "language.englishName", "language.nativeName", "lastRevision.body", - "lastRevision.title" }; - - String[] DEF_GROUP_SEARCH_FIELDS_WITH_MIME = new String[] { "authors.name", "authors.shortName", "container.name", - "language.code", "language.englishName", "language.nativeName", "lastRevision.body", "lastRevision.title", + String[] DEF_GROUP_SEARCH_FIELDS_WITH_MIME = new String[] { "lastRevision.title", "container.owner_shortName", "mimeType.mimetype" }; void addAuthor(User user, Long contentId, String authorShortName) throws DefaultException; @@ -72,8 +67,12 @@ SearchResult<Content> search(String search, Integer firstResult, Integer maxResults); - SearchResult<Content> searchMime(String search, Integer firstResult, Integer maxResults, String mimetype); + SearchResult<Content> searchMime(String search, Integer firstResult, Integer maxResults, String group, + String mimetype); + SearchResult<?> searchMime(String search, Integer firstResult, Integer maxResults, String group, String mimetype, + String mimetype2); + I18nLanguage setLanguage(User user, Long contentId, String languageCode) throws DefaultException; void setPublishedOn(User user, Long contentId, Date publishedOn) throws DefaultException; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -20,6 +20,7 @@ package org.ourproject.kune.platf.server.content; import java.util.Date; +import java.util.List; import javax.persistence.EntityManager; @@ -27,7 +28,6 @@ import org.apache.lucene.queryParser.MultiFieldQueryParser; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; -import org.apache.lucene.search.BooleanClause.Occur; import org.ourproject.kune.platf.client.errors.DefaultException; import org.ourproject.kune.platf.client.errors.I18nNotFoundException; import org.ourproject.kune.platf.client.errors.NameInUseException; @@ -172,7 +172,7 @@ } public SearchResult<Content> search(final String search, final Integer firstResult, final Integer maxResults) { - final MultiFieldQueryParser parser = createParser(); + final MultiFieldQueryParser parser = createMultiFieldParser(); Query query; try { query = parser.parse(search); @@ -183,9 +183,19 @@ } public SearchResult<Content> searchMime(final String search, final Integer firstResult, final Integer maxResults, - final String mimetype) { - return search(getSearchQueries(search, mimetype), DEF_GLOBAL_SEARCH_FIELDS_WITH_MIME, getConditions(), + final String groupShortName, final String mimetype) { + List<Content> list = contentFinder.findMime(groupShortName, "%" + search + "%", mimetype, firstResult, + maxResults); + int count = contentFinder.findMimeCount(groupShortName, "%" + search + "%", mimetype); + return new SearchResult<Content>(count, list); + } + + public SearchResult<?> searchMime(final String search, final Integer firstResult, final Integer maxResults, + final String groupShortName, final String mimetype, final String mimetype2) { + List<Content> list = contentFinder.find2Mime(groupShortName, "%" + search + "%", mimetype, mimetype2, firstResult, maxResults); + int count = contentFinder.find2MimeCount(groupShortName, "%" + search + "%", mimetype, mimetype2); + return new SearchResult<Content>(count, list); } public I18nLanguage setLanguage(final User user, final Long contentId, final String languageCode) @@ -227,7 +237,7 @@ tagManager.setTags(user, content, tags); } - private MultiFieldQueryParser createParser() { + private MultiFieldQueryParser createMultiFieldParser() { final MultiFieldQueryParser parser = new MultiFieldQueryParser(DEF_GLOBAL_SEARCH_FIELDS, new StandardAnalyzer()); return parser; } @@ -239,25 +249,4 @@ } return initialTitle; } - - private Occur[] getConditions() { - String[] fields = ContentManager.DEF_GLOBAL_SEARCH_FIELDS_WITH_MIME; - Occur[] conditions = new Occur[fields.length]; - for (int i = 0; i < conditions.length; i++) { - conditions[i] = Occur.SHOULD; - } - conditions[conditions.length - 1] = Occur.MUST; - return conditions; - } - - private String[] getSearchQueries(final String search, final String mimetype) { - String[] fields = ContentManager.DEF_GLOBAL_SEARCH_FIELDS_WITH_MIME; - String[] query = new String[fields.length]; - for (int i = 0; i < query.length; i++) { - query[i] = search; - } - query[query.length - 1] = mimetype; - return query; - } - } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/Container.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/Container.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Container.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -73,7 +73,7 @@ @ManyToOne private I18nLanguage language; - @IndexedEmbedded + @IndexedEmbedded(depth = 1, prefix = "owner_") @OneToOne private Group owner; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -55,6 +55,8 @@ import com.google.inject.name.Named; import com.wideplay.warp.persist.dao.Finder; +import com.wideplay.warp.persist.dao.FirstResult; +import com.wideplay.warp.persist.dao.MaxResults; @Entity @Table(name = "contents") @@ -159,11 +161,36 @@ } } + @Finder(query = "FROM Content WHERE lastRevision.title LIKE :title AND (mimeType.mimetype=:mimetype OR mimeType.mimetype=:mimetype2) AND container.owner.shortName=:group AND status != 'inTheDustbin' ORDER BY lastRevision.title ASC") + public List<Content> find2Mime(@Named("group") final String groupShortName, @Named("title") final String title, + @Named("mimetype") final String mimetype, @Named("mimetype2") final String mimetype2, + @FirstResult final int offset, @MaxResults final int limit) { + return null; + } + + @Finder(query = "SELECT count(id) FROM Content WHERE lastRevision.title LIKE :title AND (mimeType.mimetype=:mimetype OR mimeType.mimetype=:mimetype2) AND container.owner.shortName=:group AND status != 'inTheDustbin'") + public int find2MimeCount(@Named("group") final String groupShortName, @Named("title") final String title, + @Named("mimetype") final String mimetype, @Named("mimetype2") final String mimetype2) { + return 0; + } + @Finder(query = "select count(*) from Container ctx, Content ctn where ctn.container.id = ctx.id and ctx = :container and ctn.lastRevision.title LIKE :title") public Long findIfExistsTitle(@Named("container") final Container container, @Named("title") final String title) { return null; } + @Finder(query = "FROM Content WHERE lastRevision.title LIKE :title AND mimeType.mimetype=:mimetype AND container.owner.shortName=:group AND status != 'inTheDustbin' ORDER BY lastRevision.title ASC") + public List<Content> findMime(@Named("group") final String groupShortName, @Named("title") final String title, + @Named("mimetype") final String mimetype, @FirstResult final int offset, @MaxResults final int limit) { + return null; + } + + @Finder(query = "SELECT count(id) FROM Content WHERE lastRevision.title LIKE :title AND mimeType.mimetype=:mimetype AND container.owner.shortName=:group AND status != 'inTheDustbin'") + public int findMimeCount(@Named("group") final String groupShortName, @Named("title") final String title, + @Named("mimetype") final String mimetype) { + return 0; + } + @Transient public AccessLists getAccessLists() { return hasAccessList() ? accessLists : getContainer().getAccessLists(); 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-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -62,21 +62,19 @@ } @REST(params = { SearcherContants.QUERY_PARAM, SearcherContants.START_PARAM, SearcherContants.LIMIT_PARAM, - SearcherContants.MIMETYPE_PARAM }) + SearcherContants.GROUP_PARAM, SearcherContants.MIMETYPE_PARAM }) public SearchResultDTO<LinkDTO> search(final String search, final Integer firstResult, final Integer maxResults, - final String mimetype) { - SearchResult<Content> results = contentManager.searchMime(search, firstResult, maxResults, mimetype); + 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.MIMETYPE_PARAM, SearcherContants.MIMETYPE2_PARAM }) + SearcherContants.GROUP_PARAM, SearcherContants.MIMETYPE_PARAM, SearcherContants.MIMETYPE2_PARAM }) public SearchResultDTO<LinkDTO> search(final String search, final Integer firstResult, final Integer maxResults, - final String mimetype, final String mimetype2) { - SearchResult<Content> results1st = contentManager.searchMime(search, firstResult, maxResults, mimetype); - SearchResult<Content> results2nd = contentManager.searchMime(search, firstResult, maxResults, mimetype2); - results1st.getList().addAll(results2nd.getList()); - return map(results1st); + final String group, final String mimetype, final String mimetype2) { + return map(contentManager.searchMime(search, firstResult, maxResults, group, mimetype, mimetype2)); + } private SearchResultDTO<LinkDTO> map(final SearchResult<?> results) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -53,10 +53,10 @@ import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialog; import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageGroup; -import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertMediaGroup; import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialog; import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkGroup; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaGroup; import org.ourproject.kune.platf.client.ui.rte.saving.RTESavingEditorPanel; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import org.ourproject.kune.platf.client.utils.TimerWrapper; @@ -80,9 +80,9 @@ import org.ourproject.kune.workspace.client.editor.insertlocallink.InsertLinkLocal; import org.ourproject.kune.workspace.client.editor.insertlocallink.InsertLinkLocalPanel; import org.ourproject.kune.workspace.client.editor.insertlocallink.InsertLinkLocalPresenter; -import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertLocalMedia; -import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertLocalMediaPanel; -import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertLocalMediaPresenter; +import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertMediaLocalPanel; +import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertMediaLocalPresenter; +import org.ourproject.kune.workspace.client.editor.insertlocalmedia.InsertMediaLocal; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.entityheader.EntityHeaderPanel; import org.ourproject.kune.workspace.client.entityheader.EntityHeaderPresenter; @@ -933,7 +933,8 @@ register(InsertImageGroup.class, new Factory<InsertImageLocal>(InsertImageLocal.class) { @Override public InsertImageLocal create() { - final InsertImageLocalPresenter presenter = new InsertImageLocalPresenter($(InsertImageDialog.class)); + final InsertImageLocalPresenter presenter = new InsertImageLocalPresenter($(InsertImageDialog.class), + $(Session.class)); final InsertImageLocalPanel panel = new InsertImageLocalPanel(presenter, $(I18nTranslationService.class), $(FileDownloadUtils.class)); presenter.init(panel); @@ -970,11 +971,12 @@ } }); - register(InsertMediaGroup.class, new Factory<InsertLocalMedia>(InsertLocalMedia.class) { + register(InsertMediaGroup.class, new Factory<InsertMediaLocal>(InsertMediaLocal.class) { @Override - public InsertLocalMedia create() { - final InsertLocalMediaPresenter presenter = new InsertLocalMediaPresenter($(InsertMediaDialog.class)); - final InsertLocalMediaPanel panel = new InsertLocalMediaPanel(presenter, + public InsertMediaLocal create() { + final InsertMediaLocalPresenter presenter = new InsertMediaLocalPresenter($(InsertMediaDialog.class), + $(Session.class)); + final InsertMediaLocalPanel panel = new InsertMediaLocalPanel(presenter, $(I18nTranslationService.class), $(FileDownloadUtils.class)); presenter.init(panel); return presenter; 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-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -12,6 +12,8 @@ import com.calclab.suco.client.events.Listener; import com.gwtext.client.core.UrlParam; +import com.gwtext.client.widgets.form.Field; +import com.gwtext.client.widgets.form.event.FieldListenerAdapter; public class InsertImageLocalPanel extends InsertImageAbstractPanel implements InsertImageLocalView { @@ -21,7 +23,7 @@ final FileDownloadUtils downloadUtils) { super(i18n.t("Local"), presenter); - AbstractLiveSearcherField cb = new AbstractLiveSearcherField(i18n, + final AbstractLiveSearcherField cb = new AbstractLiveSearcherField(i18n, SearcherContants.CONTENT_TEMPLATE_TEXT_PREFIX + downloadUtils.getLogoImageUrl(new StateToken("{shortName}")) + SearcherContants.CONTENT_TEMPLATE_TEXT_SUFFIX, SearcherContants.CONTENT_DATA_PROXY_URL, @@ -34,7 +36,14 @@ cb.setHideLabel(false); cb.setAllowBlank(false); cb.setWidth(220); - cb.setStoreBaseParams(new UrlParam[] { new UrlParam(SearcherContants.MIMETYPE_PARAM, BasicMimeTypeDTO.IMAGE) }); + cb.addListener(new FieldListenerAdapter() { + @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) }); + } + }); super.insert(0, cb); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPresenter.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -1,12 +1,20 @@ package org.ourproject.kune.workspace.client.editor.insertlocalimg; +import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialog; import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertImageAbstractPresenter; public class InsertImageLocalPresenter extends InsertImageAbstractPresenter implements InsertImageLocal { - public InsertImageLocalPresenter(InsertImageDialog insertImageDialog) { + private final Session session; + + public InsertImageLocalPresenter(final InsertImageDialog insertImageDialog, final Session session) { super(insertImageDialog); + this.session = session; } + public String getCurrentGroupName() { + return session.getCurrentGroupShortName(); + } + } Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMedia.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMedia.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMedia.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -1,7 +0,0 @@ -package org.ourproject.kune.workspace.client.editor.insertlocalmedia; - -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstract; - -public interface InsertLocalMedia extends InsertMediaAbstract { - -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaPanel.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaPanel.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -1,50 +0,0 @@ -package org.ourproject.kune.workspace.client.editor.insertlocalmedia; - -import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO; -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.ui.WindowUtils; -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 com.calclab.suco.client.events.Listener; -import com.gwtext.client.core.UrlParam; - -public class InsertLocalMediaPanel extends InsertMediaAbstractPanel implements InsertLocalMediaView { - - protected String src; - - public InsertLocalMediaPanel(final InsertLocalMediaPresenter presenter, final I18nTranslationService i18n, - final FileDownloadUtils downloadUtils) { - super(i18n.t("Local"), presenter); - - AbstractLiveSearcherField cb = new AbstractLiveSearcherField(i18n, - SearcherContants.CONTENT_TEMPLATE_TEXT_PREFIX - + downloadUtils.getLogoImageUrl(new StateToken("{shortName}")) - + SearcherContants.CONTENT_TEMPLATE_TEXT_SUFFIX, SearcherContants.CONTENT_DATA_PROXY_URL, - new Listener<LinkDTO>() { - public void onEvent(final LinkDTO link) { - src = WindowUtils.getPublicHost() + downloadUtils.getImageUrl(new StateToken(link.getLink())); - } - }); - cb.setLabel(i18n.t("Local media")); - cb.setHideLabel(false); - cb.setAllowBlank(false); - cb.setWidth(220); - cb.setStoreBaseParams(new UrlParam[] { new UrlParam(SearcherContants.MIMETYPE_PARAM, BasicMimeTypeDTO.AUDIO), - new UrlParam(SearcherContants.MIMETYPE2_PARAM, BasicMimeTypeDTO.VIDEO) }); - - hrefField.setVisible(false); - hrefField.disable(); - - super.insert(0, cb); - } - - @Override - public String getSrc() { - return src; - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaPresenter.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -1,18 +0,0 @@ -package org.ourproject.kune.workspace.client.editor.insertlocalmedia; - -import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPresenter; - -public class InsertLocalMediaPresenter extends InsertMediaAbstractPresenter implements InsertLocalMedia { - - private InsertLocalMediaView view; - - public InsertLocalMediaPresenter(InsertMediaDialog insertMediaDialog) { - super(insertMediaDialog); - } - - public void init(InsertLocalMediaView view) { - super.init(view); - this.view = view; - } -} Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaView.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaView.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -1,6 +0,0 @@ -package org.ourproject.kune.workspace.client.editor.insertlocalmedia; - -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractView; - -public interface InsertLocalMediaView extends InsertMediaAbstractView { -} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocal.java (from rev 1089, trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMedia.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMedia.java 2009-03-30 13:48:35 UTC (rev 1089) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocal.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -0,0 +1,7 @@ +package org.ourproject.kune.workspace.client.editor.insertlocalmedia; + +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstract; + +public interface InsertMediaLocal extends InsertMediaAbstract { + +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java (from rev 1094, trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaPanel.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaPanel.java 2009-04-18 16:33:27 UTC (rev 1094) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -0,0 +1,59 @@ +package org.ourproject.kune.workspace.client.editor.insertlocalmedia; + +import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO; +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.ui.WindowUtils; +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 com.calclab.suco.client.events.Listener; +import com.gwtext.client.core.UrlParam; +import com.gwtext.client.widgets.form.Field; +import com.gwtext.client.widgets.form.event.FieldListenerAdapter; + +public class InsertMediaLocalPanel extends InsertMediaAbstractPanel implements InsertMediaLocalView { + + protected String src; + + public InsertMediaLocalPanel(final InsertMediaLocalPresenter presenter, final I18nTranslationService i18n, + final FileDownloadUtils downloadUtils) { + super(i18n.t("Local"), presenter); + + final AbstractLiveSearcherField cb = new AbstractLiveSearcherField(i18n, + SearcherContants.CONTENT_TEMPLATE_TEXT_PREFIX + + downloadUtils.getLogoImageUrl(new StateToken("{shortName}")) + + SearcherContants.CONTENT_TEMPLATE_TEXT_SUFFIX, SearcherContants.CONTENT_DATA_PROXY_URL, + new Listener<LinkDTO>() { + public void onEvent(final LinkDTO link) { + src = WindowUtils.getPublicHost() + downloadUtils.getImageUrl(new StateToken(link.getLink())); + } + }); + cb.setLabel(i18n.t("Local media")); + cb.setHideLabel(false); + cb.setAllowBlank(false); + cb.setWidth(220); + cb.addListener(new FieldListenerAdapter() { + @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) }); + } + }); + + hrefField.setVisible(false); + hrefField.disable(); + + super.insert(0, cb); + } + + @Override + public String getSrc() { + return src; + } +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java (from rev 1089, trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaPresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaPresenter.java 2009-03-30 13:48:35 UTC (rev 1089) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -0,0 +1,23 @@ +package org.ourproject.kune.workspace.client.editor.insertlocalmedia; + +import org.ourproject.kune.platf.client.state.Session; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog; +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPresenter; + +public class InsertMediaLocalPresenter extends InsertMediaAbstractPresenter implements InsertMediaLocal { + + private final Session session; + + public InsertMediaLocalPresenter(final InsertMediaDialog insertMediaDialog, final Session session) { + super(insertMediaDialog); + this.session = session; + } + + public String getCurrentGroupName() { + return session.getCurrentGroupShortName(); + } + + public void init(final InsertMediaLocalView view) { + super.init(view); + } +} Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalView.java (from rev 1089, trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaView.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertLocalMediaView.java 2009-03-30 13:48:35 UTC (rev 1089) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalView.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -0,0 +1,6 @@ +package org.ourproject.kune.workspace.client.editor.insertlocalmedia; + +import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractView; + +public interface InsertMediaLocalView extends InsertMediaAbstractView { +} 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-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -37,7 +37,7 @@ new StringFieldDef(LINK_FIELD), new StringFieldDef(ICON_URL_FIELD) })); reader.setRoot("list"); reader.setTotalProperty("size"); - reader.setId(SHORT_NAME_FIELD); + reader.setId(LINK_FIELD); store = new Store(dataProxy, reader); Modified: 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-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SearcherContants.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -7,6 +7,7 @@ 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=\""; 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-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -61,12 +61,12 @@ private final Radio noPersonalHomePage; private final I18nTranslationService i18n; - public RegisterForm(final I18nTranslationService i18n, Session session) { + public RegisterForm(final I18nTranslationService i18n, final Session session) { this.i18n = i18n; super.addStyleName("kune-Margin-Large-l"); shortNameRegField = new TextField(); - shortNameRegField.setTabIndex(0); + shortNameRegField.setTabIndex(1); shortNameRegField.setFieldLabel(i18n.t("Nickname")); shortNameRegField.setName(NICK_FIELD); shortNameRegField.setWidth(DEF_SMALL_FIELD_WIDTH); @@ -81,7 +81,7 @@ add(shortNameRegField); longNameRegField = new TextField(); - longNameRegField.setTabIndex(1); + longNameRegField.setTabIndex(2); longNameRegField.setFieldLabel(i18n.t("Full Name")); longNameRegField.setName(LONGNAME_FIELD); longNameRegField.setWidth(DEF_FIELD_WIDTH); @@ -93,7 +93,7 @@ add(longNameRegField); passwdRegField = new TextField(); - passwdRegField.setTabIndex(2); + passwdRegField.setTabIndex(3); passwdRegField.setFieldLabel(i18n.t("Password")); passwdRegField.setName(PASSWORD_FIELD); passwdRegField.setPassword(true); @@ -105,7 +105,7 @@ add(passwdRegField); passwdRegFieldDup = new TextField(); - passwdRegFieldDup.setTabIndex(3); + passwdRegFieldDup.setTabIndex(4); passwdRegFieldDup.setFieldLabel(i18n.t("Retype password")); passwdRegFieldDup.setName(PASSWORD_FIELD_DUP); passwdRegFieldDup.setPassword(true); @@ -124,7 +124,7 @@ add(passwdRegFieldDup); emailRegField = new TextField(); - emailRegField.setTabIndex(4); + emailRegField.setTabIndex(5); emailRegField.setFieldLabel(i18n.t("Email")); emailRegField.setName(EMAIL_FIELD); emailRegField.setVtype(VType.EMAIL); @@ -138,7 +138,7 @@ langStore.load(); languageCombo = new ComboBox(); - languageCombo.setTabIndex(5); + languageCombo.setTabIndex(6); languageCombo.setLazyRender(true); languageCombo.setName(LANG_FIELD); languageCombo.setMinChars(1); Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java 2009-04-19 18:47:36 UTC (rev 1095) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java 2009-04-21 12:54:21 UTC (rev 1096) @@ -62,10 +62,10 @@ } @Test - public void testMimeSearch() { + public void testtMimeSearch() { createContentWithMimeAndCheck(MIMETYPE + "/png"); contentManager.reIndex(); - SearchResult<Content> search = contentManager.searchMime(BODY, 0, 10, MIMETYPE); + SearchResult<Content> search = contentManager.searchMime(BODY, 0, 10, "asb", MIMETYPE); assertEquals(1, search.getSize()); }

1 0