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