Author: vjrj_ Date: 2011-11-16 11:13:38 +0100 (Wed, 16 Nov 2011) New Revision: 1608 Added: trunk/img/kunecc-logo-16px.png trunk/img/logo-big-home-kunecc.png Removed: trunk/src/main/webapp/WEB-INF/gems/ trunk/src/main/webapp/WEB-INF/publicspace/ trunk/src/main/webapp/WEB-INF/web.xml.wiab-int-sample trunk/src/main/webapp/images trunk/src/main/webapp/javascripts trunk/src/main/webapp/stylesheets trunk/src/main/webapp/templates Modified: trunk/INSTALL trunk/TODO trunk/TROUBLESHOOT trunk/img/kune-logos.svg trunk/src/main/java/cc/kune/core/server/KuneContainerListener.java trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java Log: NEW - # 147: Add again the multimedia gallery tool http://kune.ourproject.org/issues/ticket/147 NEW - # 159: When Drag&Drop or Renaming, clear Content Cache http://kune.ourproject.org/issues/ticket/159 Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/INSTALL 2011-11-16 10:13:38 UTC (rev 1608) @@ -71,6 +71,8 @@ # (in the trunk directory) mvn compile -Dliquibase.should.run=false && mvn gwt:compile +NOTE: If you change these db passwords after compiling, you have to repeat the "mvn compile" because if not, probably you are using a old persistence.xml. See TROUBLESHOOT for more details. + ===Configure upload directory=== sudo mkdir -p /var/lib/kune/uploads/ @@ -184,6 +186,9 @@ Works in most of the openfire server versions after 3.5.1. See emite (our xmpp software) Server Compatibility: https://code.google.com/p/emite/wiki/ServerAndClientsCompatibility +If your openfire don't start, chech the JAVA_HOME in /etc/init.d/openfire whe usually add this line there: + t=/usr/lib/jvm/java-6-openjdk && test -d $t && JAVA_HOME=$t + Connect to openfire administration: http://localhost:9090/ If you dont want to change the settings and use kune only for developing, use "localhost" as domain name. (Change kune.chat.domain in <trunk>/src/main/resources/kune.properties if you want to use other values). Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/TODO 2011-11-16 10:13:38 UTC (rev 1608) @@ -12,6 +12,8 @@ nick == assigned to * SHORT-TERM (URGENT) +** Reu FLOSS Ocuppy 10pm EST + DEADLINE: <2011-11-16 mié 9pm EST> ** group.inexistentTool nasty error ** calendar support *** gwt-cal + http://ical4j.sourceforge.net/introduction.html Modified: trunk/TROUBLESHOOT =================================================================== --- trunk/TROUBLESHOOT 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/TROUBLESHOOT 2011-11-16 10:13:38 UTC (rev 1608) @@ -67,8 +67,10 @@ == Mysql: Caused by: java.sql.SQLException: Access denied for user 'kune'@'localhost' (using password: YES) == -Check that the password you have use in the database creation it's the same like the src/main/resources/META-INF/persistence.xml. If it's wrong maybe you have to remove the mysql user (DROP USER) and repeat the GRANT senteces of the INSTALL. +Check that the password you have use in the database creation it's the same like the src/main/resources/META-INF/persistence.xml. If it's wrong maybe you have to remove the mysql user (DROP USER) and repeat the GRANT sentences of the INSTALL. +Also, be sure you do a "mvn compile" if you change the persistence.xml file to not use the old one. + If you have this problem with openfire it's not enough to change the password in openfire.xml because probably it's already stored in the ofProperty openfire table and you need to change the password there. == Eclipse & GWT == Modified: trunk/img/kune-logos.svg =================================================================== --- trunk/img/kune-logos.svg 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/img/kune-logos.svg 2011-11-16 10:13:38 UTC (rev 1608) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> + <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" @@ -13,10 +14,10 @@ height="297mm" id="svg2531" sodipodi:version="0.32" - inkscape:version="0.46" - sodipodi:docbase="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img" + inkscape:version="0.48.2 r9819" sodipodi:docname="kune-logos.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.1"> <defs id="defs2533"> <inkscape:perspective @@ -87,18 +88,28 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="521.44602" - inkscape:cy="133.64281" + inkscape:cx="875.92904" + inkscape:cy="-80.17421" inkscape:document-units="px" inkscape:current-layer="layer1" - inkscape:window-width="1280" + inkscape:window-width="1078" inkscape:window-height="729" inkscape:window-x="0" inkscape:window-y="25" showguides="true" inkscape:guide-bbox="true" inkscape:guide-points="true" - showgrid="false" /> + showgrid="false" + inkscape:window-maximized="0"> + <sodipodi:guide + orientation="0,1" + position="830.76137,26.355188" + id="guide3703" /> + <sodipodi:guide + orientation="0,1" + position="856.74146,-93.746373" + id="guide3723" /> + </sodipodi:namedview> <metadata id="metadata2536"> <rdf:RDF> @@ -107,6 +118,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -747,47 +759,50 @@ d="M 372.87905,411.27704 L 437.81346,411.27704" style="color:#000000;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> + <path + inkscape:connector-curvature="0" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 245.82057,974.99995 c -0.74303,0 -1.45723,0.003 -2.17391,0.0494 -0.0669,0.0136 -0.13033,0.0368 -0.19763,0.0494 -0.66715,0.12461 -1.32536,0.23087 -2.02569,0.24704 -0.097,0.0136 -0.19995,-0.0145 -0.29644,0 -5.71605,0.86055 -10.54554,3.34248 -14.42688,7.46047 -4.53271,4.78706 -6.81817,10.52182 -6.81818,17.19368 0,6.74676 2.28548,12.52046 6.81818,17.29246 4.90667,5.1461 11.2818,7.7075 19.12055,7.7076 4.15869,-10e-5 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6068 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7944 l 39.08102,0 0,-1.9763 c -4e-5,-8.45207 -2.86291,-15.2201 -8.54743,-20.30635 -4.78705,-4.23347 -10.0899,-6.32405 -15.90909,-6.32411 z m -181.719366,0.34585 0,18.92292 -6.62055,0 0,9.68378 6.62055,0 0,19.7629 10.07905,0 0,-19.7629 6.07708,0 12.40119,19.7629 11.956516,0 -16.650196,-25.09885 15.909086,-22.33202 -12.203556,0 -12.30237,17.98419 -5.18775,0 0,-18.92292 -10.07905,0 z m 123.666006,0 c -1.73503,0.30966 -3.35171,0.81366 -4.8419,1.58103 -2.5132,1.34638 -4.49729,3.12201 -5.97826,5.33597 l 0,-5.97827 -10.12846,0 0,47.43087 10.12846,0 0,-26.58106 c -1e-5,-3.79965 1.07224,-6.71507 3.21147,-8.79447 2.15413,-2.07932 4.88507,-3.11262 8.25098,-3.11265 3.56032,3e-5 6.34065,0.95537 8.3004,2.91502 1.95964,1.95972 2.91496,5.03102 2.91502,9.18973 l 0,26.38343 10.12846,0 0,-28.60675 c -5e-5,-5.8192 -1.77567,-10.62715 -5.33597,-14.42688 -2.67029,-2.84973 -5.76,-4.62351 -9.28854,-5.33597 l -7.36166,0 z m -76.77865,0.93873 0,27.47037 c -2e-5,6.4326 2.16853,11.6334 6.52173,15.6127 4.03904,3.7398 9.04189,5.6323 14.92095,5.6324 5.93886,-10e-5 10.91633,-1.8926 14.97036,-5.6324 4.35315,-3.9793 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.47037 -10.12846,0 0,26.58107 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2738 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.58107 -10.12845,0 z m 133.54743,7.80633 c 3.306,5e-5 6.19285,0.92683 8.64624,2.7668 2.37851,1.88491 4.13014,4.63084 5.23716,8.25099 l -27.22332,0 c 0.79283,-3.48552 2.43792,-6.19246 4.8913,-8.15218 2.37853,-1.89981 5.18745,-2.86556 8.44862,-2.86561 z" + id="path2689" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854" /> <g - id="g2737"> + id="g2691" + transform="matrix(0.347343,0,0,0.346901,262.945,672.94005)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854"> <path - inkscape:export-ydpi="399.59854" - inkscape:export-xdpi="399.59854" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" - id="path2689" - d="M 298.07933,890.09763 C 297.3363,890.09763 296.6221,890.10025 295.90542,890.14704 C 295.83851,890.16067 295.77509,890.18388 295.70779,890.19644 C 295.04064,890.32105 294.38243,890.42731 293.6821,890.44348 C 293.58509,890.45708 293.48215,890.42895 293.38566,890.44348 C 287.66961,891.30403 282.84012,893.78596 278.95878,897.90395 C 274.42607,902.69101 272.14061,908.42577 272.1406,915.09763 C 272.1406,921.84435 274.42608,927.61807 278.95878,932.39012 C 283.86545,937.53616 290.24058,940.09761 298.07933,940.09763 C 302.23802,940.09761 306.23614,939.06435 310.03585,936.98498 C 313.8355,934.96547 317.1393,932.10715 319.96668,928.48696 L 311.41925,923.74388 C 307.7392,928.65056 303.21767,931.10554 297.8323,931.10554 C 294.09242,931.10554 290.7392,929.89235 287.85206,927.49882 C 284.91999,925.10531 283.45479,922.18991 283.45483,918.70435 L 322.53585,918.70435 L 322.53585,916.72806 C 322.53581,908.27602 319.67294,901.50799 313.98842,896.42174 C 309.20137,892.18827 303.89852,890.09769 298.07933,890.09763 z M 116.35996,890.44348 L 116.35996,909.3664 L 109.73941,909.3664 L 109.73941,919.0502 L 116.35996,919.0502 L 116.35996,938.81305 L 126.43901,938.81305 L 126.43901,919.0502 L 132.51609,919.0502 L 144.91728,938.81305 L 156.8738,938.81305 L 140.2236,913.71423 L 156.13269,891.38221 L 143.92913,891.38221 L 131.62676,909.3664 L 126.43901,909.3664 L 126.43901,890.44348 L 116.35996,890.44348 z M 240.02597,890.44348 C 238.29094,890.75314 236.67426,891.25714 235.18407,892.02451 C 232.67087,893.37089 230.68678,895.14652 229.20581,897.36048 L 229.20581,891.38221 L 219.07735,891.38221 L 219.07735,938.81305 L 229.20581,938.81305 L 229.20581,912.23202 C 229.2058,908.43237 230.27805,905.51695 232.41728,903.43755 C 234.57141,901.35823 237.30235,900.32493 240.66826,900.3249 C 244.22858,900.32493 247.00891,901.28027 248.96866,903.23992 C 250.9283,905.19964 251.88362,908.27094 251.88368,912.42965 L 251.88368,938.81305 L 262.01214,938.81305 L 262.01214,910.20633 C 262.01209,904.38713 260.23647,899.57918 256.67617,895.77945 C 254.00588,892.92972 250.91617,891.15594 247.38763,890.44348 L 240.02597,890.44348 z M 163.24732,891.38221 L 163.24732,918.85257 C 163.2473,925.28514 165.41585,930.48601 169.76905,934.46522 C 173.80809,938.20508 178.81094,940.09761 184.69,940.09763 C 190.62886,940.09761 195.60633,938.20508 199.66036,934.46522 C 204.01351,930.48601 206.18205,925.28514 206.1821,918.85257 L 206.1821,891.38221 L 196.05364,891.38221 L 196.05364,917.96324 C 196.05359,921.46376 194.98134,924.31165 192.84218,926.51067 C 190.62814,928.78452 187.93618,929.91976 184.69,929.91976 C 181.56346,929.91978 178.85062,928.76957 176.63664,926.51067 C 174.43759,924.23686 173.37574,921.40394 173.37577,917.96324 L 173.37577,891.38221 L 163.24732,891.38221 z M 296.79475,899.18854 C 300.10075,899.18859 302.9876,900.11537 305.44099,901.95534 C 307.8195,903.84025 309.57113,906.58618 310.67815,910.20633 L 283.45483,910.20633 C 284.24766,906.72081 285.89275,904.01387 288.34613,902.05415 C 290.72466,900.15434 293.53358,899.18859 296.79475,899.18854 z" - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" /> - <g - inkscape:export-ydpi="399.59854" - inkscape:export-xdpi="399.59854" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" - transform="matrix(0.347343,0,0,0.346901,34.203754,588.03773)" - id="g2691"> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2693" - 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="path2695" - 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="path2697" - 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="path2699" - 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="path2701" - 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> + inkscape:connector-curvature="0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path2693" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path2695" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path2697" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path2699" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path2701" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> </g> <text xml:space="preserve" @@ -1004,5 +1019,417 @@ 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> + <text + sodipodi:linespacing="100%" + id="text3654" + y="1023.4772" + x="-438.89853" + style="font-size:91.92100525px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve" + transform="scale(-1,1)"><tspan + y="1023.4772" + x="-438.89853" + id="tspan3656" + sodipodi:role="line">cc</tspan></text> + <path + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + id="path3705" + d="m 245.82057,1095 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1247 -1.32536,0.2309 -2.02569,0.2471 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8605 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.787 -6.81817,10.5218 -6.81818,17.1936 0,6.7468 2.28548,12.5205 6.81818,17.2925 4.90667,5.1461 11.2818,7.7075 19.12055,7.7076 4.15869,-10e-5 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6068 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7944 l 39.08102,0 0,-1.9763 c -4e-5,-8.4521 -2.86291,-15.2201 -8.54743,-20.3064 -4.78705,-4.2334 -10.0899,-6.324 -15.90909,-6.3241 z m -181.719366,0.3458 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7629 10.07905,0 0,-19.7629 6.07708,0 12.40119,19.7629 11.956516,0 -16.650196,-25.0989 15.909086,-22.332 -12.203556,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.666006,0 c -1.73503,0.3097 -3.35171,0.8137 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4309 10.12846,0 0,-26.5811 c -1e-5,-3.7996 1.07224,-6.715 3.21147,-8.7944 2.15413,-2.0794 4.88507,-3.1126 8.25098,-3.1127 3.56032,10e-5 6.34065,0.9554 8.3004,2.915 1.95964,1.9598 2.91496,5.0311 2.91502,9.1898 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8193 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8498 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4704 c -2e-5,6.4326 2.16853,11.6334 6.52173,15.6127 4.03904,3.7398 9.04189,5.6323 14.92095,5.6324 5.93886,-10e-5 10.91633,-1.8926 14.97036,-5.6324 4.35315,-3.9793 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4704 -10.12846,0 0,26.5811 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2738 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.5811 -10.12845,0 z m 133.54743,7.8064 c 3.306,0 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6308 5.23716,8.2509 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1924 4.8913,-8.1521 2.37853,-1.8998 5.18745,-2.8656 8.44862,-2.8656 z" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + inkscape:connector-curvature="0" /> + <g + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + transform="matrix(0.347343,0,0,0.346901,262.945,792.94005)" + id="g3707"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3709" + d="m 60.321717,411.99998 377.014613,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3711" + d="m 252.61203,788.60332 0,-377.01178" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3713" + d="m 252.86937,597.15755 377.0124,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3715" + d="m 437.45588,596.97447 0,-377.01491" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3717" + d="m 372.87905,411.27704 64.93441,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + </g> + <text + transform="scale(-1,1)" + xml:space="preserve" + style="font-size:66.18188477px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + x="-412.51364" + y="1143.8353" + id="text3719" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan3721" + x="-412.51364" + y="1143.8353">cc</tspan></text> + <path + inkscape:connector-curvature="0" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 117.74846,1199.0003 c -0.23776,0 -0.4663,0 -0.69564,0.016 -0.0214,0 -0.0417,0.012 -0.0632,0.016 -0.21348,0.04 -0.42411,0.074 -0.64821,0.079 -0.031,0 -0.064,-0 -0.0949,0 -1.8291,0.2753 -3.37452,1.0696 -4.61653,2.3873 -1.45044,1.5318 -2.18177,3.3669 -2.18178,5.5019 0,2.1589 0.73134,4.0065 2.18178,5.5335 1.57011,1.6467 3.61012,2.4663 6.11848,2.4664 1.33076,-10e-5 2.61014,-0.3307 3.82603,-0.9961 1.21587,-0.6462 2.27307,-1.5608 3.17781,-2.7193 l -2.73513,-1.5178 c -1.1776,1.5702 -2.62446,2.3558 -4.34776,2.3558 -1.19674,0 -2.26975,-0.3883 -3.19362,-1.1542 -0.93825,-0.7659 -1.40711,-1.6988 -1.40709,-2.8142 l 12.50572,0 0,-0.6324 c -1e-5,-2.7046 -0.91611,-4.8703 -2.73513,-6.4979 -1.53183,-1.3547 -3.22872,-2.0237 -5.09083,-2.0237 z m -58.149264,0.1106 0,6.0552 -2.118542,0 0,3.0988 2.118542,0 0,6.324 3.225244,0 0,-6.324 1.944635,0 3.968317,6.324 3.826024,0 -5.327977,-8.0315 5.090826,-7.1461 -3.905076,0 -3.936695,5.7548 -1.660054,0 0,-6.0552 -3.225244,0 z m 39.572489,0 c -0.555201,0.099 -1.07253,0.2604 -1.549383,0.5059 -0.804211,0.4309 -1.43911,0.999 -1.913013,1.7075 l 0,-1.913 -3.241055,0 0,15.1776 3.241055,0 0,-8.5058 c -3e-6,-1.2158 0.343111,-2.1487 1.027654,-2.8141 0.689311,-0.6654 1.563197,-0.9961 2.640271,-0.9961 1.139286,0 2.028976,0.3057 2.656086,0.9328 0.62707,0.6271 0.93277,1.6099 0.93279,2.9407 l 0,8.4425 3.24106,0 0,-9.154 c -2e-5,-1.8621 -0.56821,-3.4006 -1.70749,-4.6165 -0.85448,-0.9119 -1.84317,-1.4795 -2.97228,-1.7075 l -2.355695,0 z m -24.568775,0.3004 0,8.7904 c -6e-6,2.0584 0.693918,3.7226 2.08692,4.996 1.292472,1.1967 2.893359,1.8023 4.774628,1.8023 1.900405,0 3.493169,-0.6056 4.790438,-1.8023 1.392986,-1.2734 2.086908,-2.9376 2.086924,-4.996 l 0,-8.7904 -3.241056,0 0,8.5058 c -1.6e-5,1.1201 -0.34313,2.0315 -1.02765,2.7351 -0.708482,0.7276 -1.569895,1.0909 -2.608656,1.0909 -1.000477,0 -1.868572,-0.368 -2.577034,-1.0909 -0.703685,-0.7276 -1.043471,-1.6341 -1.043462,-2.7351 l 0,-8.5058 -3.241052,0 z m 42.73449,2.498 c 1.05791,0 1.98168,0.2966 2.76676,0.8854 0.76111,0.6031 1.32162,1.4818 1.67586,2.6402 l -8.71132,0 c 0.2537,-1.1153 0.78012,-1.9815 1.56519,-2.6086 0.76112,-0.608 1.65996,-0.917 2.70351,-0.917 z" + id="path3725" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854" /> + <g + id="g3727" + transform="matrix(0.11114798,0,0,0.11100654,123.22819,1102.3426)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854"> + <path + inkscape:connector-curvature="0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path3729" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path3731" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path3733" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path3735" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path3737" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + </g> + <text + sodipodi:linespacing="100%" + id="text3739" + y="1214.6273" + x="-171.08939" + style="font-size:21.17786407px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve" + transform="scale(-1,1)"><tspan + y="1214.6273" + x="-171.08939" + id="tspan3741" + sodipodi:role="line">cc</tspan></text> + <g + id="g3808" + transform="translate(-124,22)"> + <g + transform="matrix(0.31999488,0,0,0.31999488,389.01174,869.40895)" + id="g3788"> + <path + inkscape:connector-curvature="0" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" + id="path3790" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854" /> + <g + id="g3792" + transform="matrix(0.347343,0,0,0.346901,554.4533,794.1211)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854"> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path3794" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path3796" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path3798" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path3800" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path3802" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + </g> + </g> + <text + sodipodi:linespacing="100%" + id="text3804" + y="1231.8833" + x="-677.91302" + style="font-size:14.34666634px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve" + transform="scale(-1,1)"><tspan + y="1231.8833" + x="-677.91302" + id="tspan3806" + sodipodi:role="line">cc</tspan></text> + </g> + <g + id="g3844" + transform="translate(0,140)"> + <g + id="g3846"> + <path + inkscape:connector-curvature="0" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" + id="path3848" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854" /> + <g + id="g3850" + transform="matrix(0.347343,0,0,0.346901,554.4533,794.1211)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854"> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path3852" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path3854" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path3856" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path3858" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path3860" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + </g> + </g> + <text + sodipodi:linespacing="100%" + id="text3862" + y="1132.7504" + x="-902.83093" + style="font-size:44.83404922px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve" + transform="scale(-1,1)"><tspan + y="1132.7504" + x="-902.83093" + id="tspan3864" + sodipodi:role="line">cc</tspan></text> + </g> + <g + id="g3983" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/logo-big-home-kunecc.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <g + transform="translate(-0.07178157,0.14078373)" + id="g3779"> + <path + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + id="path3743" + d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + inkscape:connector-curvature="0" /> + <g + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + transform="matrix(0.347343,0,0,0.346901,554.4533,794.1211)" + id="g3745"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3747" + d="m 60.321717,411.99998 377.014613,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3749" + d="m 252.61203,788.60332 0,-377.01178" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3751" + d="m 252.86937,597.15755 377.0124,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3753" + d="m 437.45588,596.97447 0,-377.01491" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3755" + d="m 372.87905,411.27704 64.93441,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + </g> + </g> + <text + transform="scale(-1,1)" + xml:space="preserve" + style="font-size:58.94304657px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + x="-925.99481" + y="1145.4236" + id="text3757" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan3759" + x="-925.99481" + y="1145.4236">cc</tspan></text> + <text + xml:space="preserve" + style="font-size:87.16403198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#cc6633;fill-opacity:1;stroke:none;font-family:Emblem" + x="838.10248" + y="1145.1492" + id="text3941" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan3943" + x="838.10248" + y="1145.1492">.</tspan></text> + </g> + <g + id="g3969" + transform="matrix(0.31973654,0,0,0.31973654,675.58786,768.46541)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kunecc-logo-16px.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <g + transform="translate(380,-30)" + id="g3945"> + <path + inkscape:connector-curvature="0" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" + id="path3947" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854" /> + <g + id="g3949" + transform="matrix(0.347343,0,0,0.346901,554.4533,794.1211)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854"> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path3951" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path3953" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path3955" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path3957" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path3959" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + </g> + </g> + <text + sodipodi:linespacing="100%" + id="text3961" + y="1115.2828" + x="-1306.0667" + style="font-size:58.94304657px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve" + transform="scale(-1,1)"><tspan + y="1115.2828" + x="-1306.0667" + id="tspan3963" + sodipodi:role="line">cc</tspan></text> + <text + sodipodi:linespacing="100%" + id="text3965" + y="1115.0084" + x="1218.1743" + style="font-size:87.16403198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#cc6633;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve"><tspan + y="1115.0084" + x="1218.1743" + id="tspan3967" + sodipodi:role="line">.</tspan></text> + </g> </g> </svg> Added: trunk/img/kunecc-logo-16px.png =================================================================== (Binary files differ) Property changes on: trunk/img/kunecc-logo-16px.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/logo-big-home-kunecc.png =================================================================== (Binary files differ) Property changes on: trunk/img/logo-big-home-kunecc.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/server/KuneContainerListener.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/KuneContainerListener.java 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/java/cc/kune/core/server/KuneContainerListener.java 2011-11-16 10:13:38 UTC (rev 1608) @@ -34,7 +34,9 @@ import cc.kune.core.server.rack.ContainerListener; import com.google.inject.Inject; +import com.google.inject.Singleton; +@Singleton public class KuneContainerListener implements ContainerListener { private final Logger logger; // NOPMD by vjrj on 16/07/09 22:38 private final KunePersistenceService persistenceService; Modified: trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/java/cc/kune/core/server/i18n/I18nTranslationServiceDefault.java 2011-11-16 10:13:38 UTC (rev 1608) @@ -32,6 +32,7 @@ @Singleton public class I18nTranslationServiceDefault extends I18nTranslationService { + private boolean initiliazied = false; private final I18nTranslationManager translationManager; private final Provider<UserSessionManager> userSessionManager; @@ -42,6 +43,10 @@ this.userSessionManager = userSessionManager; } + public void init() { + initiliazied = true; + } + @Override public boolean isRTL() { return userSessionManager.get().isUserLoggedIn() ? userSessionManager.get().getUser().getLanguage().getDirection().equals( @@ -78,7 +83,7 @@ @Override public String tWithNT(final String text, final String noteForTranslators) { String language; - if (userSessionManager.get().isUserLoggedIn()) { + if (initiliazied && userSessionManager.get().isUserLoggedIn()) { language = userSessionManager.get().getUser().getLanguage().getCode(); } else { language = I18nTranslation.DEFAULT_LANG; Modified: trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java 2011-11-16 10:13:38 UTC (rev 1608) @@ -29,6 +29,7 @@ import cc.kune.core.client.errors.UserMustBeLoggedException; import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.i18n.I18nTranslationServiceDefault; import cc.kune.core.server.manager.GroupManager; import cc.kune.core.server.manager.I18nCountryManager; import cc.kune.core.server.manager.I18nLanguageManager; @@ -46,22 +47,22 @@ import cc.kune.domain.I18nTranslation; import cc.kune.domain.License; import cc.kune.domain.User; -import cc.kune.wave.server.KuneWaveService; import com.google.inject.Inject; +import com.google.inject.Singleton; import com.google.inject.persist.Transactional; +@Singleton public class DatabaseInitializer { private static final Log LOG = LogFactory.getLog(DatabaseInitializer.class); private final ContentManager contentManager; private final I18nCountryManager countryManager; private final GroupManager groupManager; - private final KuneWaveService kuneWaveManager; private final I18nLanguageManager languageManager; private final LicenseManager licenseManager; private final KuneBasicProperties properties; private final I18nTranslationManager translationManager; - + private final I18nTranslationServiceDefault translationService; private final UserManager userManager; @Inject @@ -69,7 +70,7 @@ final GroupManager groupManager, final LicenseManager licenseManager, final I18nLanguageManager languageManager, final I18nCountryManager countryManager, final I18nTranslationManager translationManager, final ContentManager contentManager, - final KuneWaveService kuneWaveManager) { + final I18nTranslationServiceDefault translationService) { this.properties = properties; this.userManager = userManager; this.groupManager = groupManager; @@ -77,8 +78,8 @@ this.languageManager = languageManager; this.countryManager = countryManager; this.translationManager = translationManager; + this.translationService = translationService; this.contentManager = contentManager; - this.kuneWaveManager = kuneWaveManager; } private void createDefUsersGroup() throws Exception, UserMustBeLoggedException { @@ -210,11 +211,12 @@ try { groupManager.getSiteDefaultGroup(); } catch (final NoResultException e) { - LOG.info("The default group '" + properties.getDefaultSiteName() + LOG.warn("The default group '" + properties.getDefaultSiteName() + "' does not exist in Database, " + "creating it (see kune.default.site.shortName in kune.properties for more details)"); initDatabase(); } + translationService.init(); } @Transactional Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java 2011-11-16 10:13:38 UTC (rev 1608) @@ -37,117 +37,122 @@ import com.google.inject.Provider; public abstract class DefaultManager<T, K> { - private final Provider<EntityManager> provider; - private final Class<T> entityClass; - protected final Log log; + private final Class<T> entityClass; + protected final Log log; + private final Provider<EntityManager> provider; - public DefaultManager(final Provider<EntityManager> provider, final Class<T> entityClass) { - this.provider = provider; - this.entityClass = entityClass; - log = LogFactory.getLog(entityClass); - } + public DefaultManager(final Provider<EntityManager> provider, final Class<T> entityClass) { + this.provider = provider; + this.entityClass = entityClass; + log = LogFactory.getLog(entityClass); + } - public void clear() { - getEntityManager().clear(); - } + public void clear() { + getEntityManager().clear(); + } - public T find(final Long primaryKey) { - return getEntityManager().find(entityClass, primaryKey); - } + /** + * use carefully!!! + */ + protected <X> X find(final Class<X> entityClass, final Long primaryKey) { + return getEntityManager().find(entityClass, primaryKey); + } - public <E> E merge(final E entity, final Class<E> entityClass) { - getEntityManager().merge(entity); - return entity; - } + public T find(final Long primaryKey) { + return getEntityManager().find(entityClass, primaryKey); + } - public T merge(final T entity) { - return getEntityManager().merge(entity); - } + private EntityManager getEntityManager() { + return provider.get(); + } - public <E> E persist(final E entity, final Class<E> entityClass) { - getEntityManager().persist(entity); - return entity; - } + protected javax.persistence.Query getQuery(final String qlString) { + return getEntityManager().createQuery(qlString); + } - public T persist(final T entity) { - return persist(entity, entityClass); - } + public <E> E merge(final E entity, final Class<E> entityClass) { + getEntityManager().merge(entity); + return entity; + } - @SuppressWarnings("unchecked") - public void reIndex() { - // Inject this? - final FullTextEntityManager fullTextEm = Search.getFullTextEntityManager(getEntityManager()); - fullTextEm.purgeAll(entityClass); - fullTextEm.getTransaction().commit(); - fullTextEm.getTransaction().begin(); - final List<T> entities = fullTextEm.createQuery("SELECT e FROM " + entityClass.getSimpleName() + " AS e").getResultList(); - for (final T e : entities) { - fullTextEm.index(e); - } - fullTextEm.getSearchFactory().optimize(entityClass); - } + public T merge(final T entity) { + return getEntityManager().merge(entity); + } - public void remove(final T entity) { - getEntityManager().remove(entity); - } + public <E> E persist(final E entity, final Class<E> entityClass) { + getEntityManager().persist(entity); + return entity; + } - public SearchResult<T> search(final Query query) { - return search(query, null, null); - } + public T persist(final T entity) { + return persist(entity, entityClass); + } - @SuppressWarnings("unchecked") - public SearchResult<T> search(final Query query, final Integer firstResult, final Integer maxResults) { - final FullTextQuery emQuery = Search.getFullTextEntityManager(getEntityManager()).createFullTextQuery(query, - entityClass); - if (firstResult != null && maxResults != null) { - emQuery.setFirstResult(firstResult); - emQuery.setMaxResults(maxResults); - } - return new SearchResult<T>(emQuery.getResultSize(), emQuery.getResultList()); + @SuppressWarnings("unchecked") + public void reIndex() { + // Inject this? + final FullTextEntityManager fullTextEm = Search.getFullTextEntityManager(getEntityManager()); + fullTextEm.purgeAll(entityClass); + fullTextEm.getTransaction().commit(); + fullTextEm.getTransaction().begin(); + final List<T> entities = fullTextEm.createQuery( + "SELECT e FROM " + entityClass.getSimpleName() + " AS e").getResultList(); + for (final T e : entities) { + fullTextEm.index(e); } + fullTextEm.getSearchFactory().optimize(entityClass); + } - public SearchResult<T> search(final String query, final String[] fields, final BooleanClause.Occur[] flags, - final Integer firstResult, final Integer maxResults) { - Query queryQ; - try { - queryQ = MultiFieldQueryParser.parse(query, fields, flags, new StandardAnalyzer()); - } catch (final ParseException e) { - throw new ServerManagerException("Error parsing search", e); - } - return search(queryQ, firstResult, maxResults); - } + public void remove(final T entity) { + getEntityManager().remove(entity); + } - public SearchResult<T> search(final String[] queries, final String[] fields, final BooleanClause.Occur[] flags, - final Integer firstResult, final Integer maxResults) { - Query query; - try { - query = MultiFieldQueryParser.parse(queries, fields, flags, new StandardAnalyzer()); - } catch (final ParseException e) { - throw new ServerManagerException("Error parsing search", e); - } - return search(query, firstResult, maxResults); + public SearchResult<T> search(final Query query) { + return search(query, null, null); + } + + @SuppressWarnings("unchecked") + public SearchResult<T> search(final Query query, final Integer firstResult, final Integer maxResults) { + final FullTextQuery emQuery = Search.getFullTextEntityManager(getEntityManager()).createFullTextQuery( + query, entityClass); + if (firstResult != null && maxResults != null) { + emQuery.setFirstResult(firstResult); + emQuery.setMaxResults(maxResults); } + return new SearchResult<T>(emQuery.getResultSize(), emQuery.getResultList()); + } - public SearchResult<T> search(final String[] queries, final String[] fields, final Integer firstResult, - final Integer maxResults) { - Query query; - try { - query = MultiFieldQueryParser.parse(queries, fields, new StandardAnalyzer()); - } catch (final ParseException e) { - throw new ServerManagerException("Error parsing search", e); - } - return search(query, firstResult, maxResults); + public SearchResult<T> search(final String query, final String[] fields, + final BooleanClause.Occur[] flags, final Integer firstResult, final Integer maxResults) { + Query queryQ; + try { + queryQ = MultiFieldQueryParser.parse(query, fields, flags, new StandardAnalyzer()); + } catch (final ParseException e) { + throw new ServerManagerException("Error parsing search", e); } + return search(queryQ, firstResult, maxResults); + } - /** - * use carefully!!! - */ - protected <X> X find(final Class<X> entityClass, final Long primaryKey) { - return getEntityManager().find(entityClass, primaryKey); + public SearchResult<T> search(final String[] queries, final String[] fields, + final BooleanClause.Occur[] flags, final Integer firstResult, final Integer maxResults) { + Query query; + try { + query = MultiFieldQueryParser.parse(queries, fields, flags, new StandardAnalyzer()); + } catch (final ParseException e) { + throw new ServerManagerException("Error parsing search", e); } + return search(query, firstResult, maxResults); + } - private EntityManager getEntityManager() { - return provider.get(); + public SearchResult<T> search(final String[] queries, final String[] fields, + final Integer firstResult, final Integer maxResults) { + Query query; + try { + query = MultiFieldQueryParser.parse(queries, fields, new StandardAnalyzer()); + } catch (final ParseException e) { + throw new ServerManagerException("Error parsing search", e); } + return search(query, firstResult, maxResults); + } } Deleted: trunk/src/main/webapp/WEB-INF/web.xml.wiab-int-sample =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml.wiab-int-sample 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/webapp/WEB-INF/web.xml.wiab-int-sample 2011-11-16 10:13:38 UTC (rev 1608) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE web-app - PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd"> - -<web-app> - - <filter> - <filter-name>guiceFilter</filter-name> - <filter-class>com.example.CustomGuiceFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>guiceFilter</filter-name> - <url-pattern>/hw/*</url-pattern> - </filter-mapping> -</web-app> Deleted: trunk/src/main/webapp/images =================================================================== --- trunk/src/main/webapp/images 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/webapp/images 2011-11-16 10:13:38 UTC (rev 1608) @@ -1 +0,0 @@ -link WEB-INF/publicspace/public/images/ \ No newline at end of file Deleted: trunk/src/main/webapp/javascripts =================================================================== --- trunk/src/main/webapp/javascripts 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/webapp/javascripts 2011-11-16 10:13:38 UTC (rev 1608) @@ -1 +0,0 @@ -link WEB-INF/publicspace/public/javascripts/ \ No newline at end of file Deleted: trunk/src/main/webapp/stylesheets =================================================================== --- trunk/src/main/webapp/stylesheets 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/webapp/stylesheets 2011-11-16 10:13:38 UTC (rev 1608) @@ -1 +0,0 @@ -link WEB-INF/publicspace/public/stylesheets/ \ No newline at end of file Deleted: trunk/src/main/webapp/templates =================================================================== --- trunk/src/main/webapp/templates 2011-11-14 14:09:30 UTC (rev 1607) +++ trunk/src/main/webapp/templates 2011-11-16 10:13:38 UTC (rev 1608) @@ -1 +0,0 @@ -link WEB-INF/publicspace/public/templates/ \ No newline at end of file