- kune-commits - lists.ourproject.org

r1866 - in trunk: . src/main/java/cc/kune/core/server/content src/main/java/cc/kune/core/server/manager/impl src/main/java/cc/kune/domain src/main/resources/META-INF src/test/java/cc/kune/core/server/integration src/test/java/cc/kune/core/server/manager
by Vicente J. Ruiz Jurado 06 May '12

06 May '12

Author: vjrj_ Date: 2012-05-06 04:14:43 +0200 (Sun, 06 May 2012) New Revision: 1866 Modified: trunk/.classpath trunk/pom.xml trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java trunk/src/main/java/cc/kune/domain/BasicMimeType.java trunk/src/main/java/cc/kune/domain/Container.java trunk/src/main/java/cc/kune/domain/Content.java trunk/src/main/java/cc/kune/domain/ExtMediaDescrip.java trunk/src/main/java/cc/kune/domain/Group.java trunk/src/main/java/cc/kune/domain/I18nLanguage.java trunk/src/main/java/cc/kune/domain/Rate.java trunk/src/main/java/cc/kune/domain/Revision.java trunk/src/main/java/cc/kune/domain/Tag.java trunk/src/main/java/cc/kune/domain/TagUserContent.java trunk/src/main/java/cc/kune/domain/User.java trunk/src/main/resources/META-INF/persistence.xml trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java trunk/src/test/java/cc/kune/core/server/manager/GroupManagerDefaultTest.java trunk/src/test/java/cc/kune/core/server/manager/UserManagerDefaultTest.java Log: NEW - # 268: Hibernate 4 migration http://kune.ourproject.org/issues/ticket/268 Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/.classpath 2012-05-06 02:14:43 UTC (rev 1866) @@ -7,12 +7,13 @@ <classpathentry kind="var" path="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" sourcepath="M2_REPO/javax/inject/javax.inject/1/javax.inject-1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4.4/mail-1.4.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4.4/mail-1.4.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.jar" sourcepath="M2_REPO/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/> <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/api/0.3.15/api-0.3.15.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/api-src/0.3.15/api-src-0.3.15.jar"/> <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/avro/avro/1.5.1/avro-1.5.1.jar" sourcepath="M2_REPO/org/apache/avro/avro/1.5.1/avro-1.5.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar" sourcepath="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.15/box-0.3.15.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.15/box-src-0.3.15.jar"/> @@ -46,7 +47,6 @@ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.jar" sourcepath="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0.jar" sourcepath="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite/r1694/emite-r1694.jar"/> <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite-proxy/0.1/emite-proxy-0.1.jar"/> <classpathentry kind="var" path="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3.jar" sourcepath="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3-sources.jar"/> @@ -87,22 +87,29 @@ <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.20070617/h2-1.0.20070617.jar"/> <classpathentry kind="var" path="M2_REPO/com/calclab/emite/hablar/r1697/hablar-r1697.jar"/> <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-c3p0/3.3.1.GA/hibernate-c3p0-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-c3p0/3.3.1.GA/hibernate-c3p0-3.3.1.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga.jar" sourcepath="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-tools/3.2.3.GA/hibernate-tools-3.2.3.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.1.0.GA/hibernate-validator-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-validator/3.1.0.GA/hibernate-validator-3.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-c3p0/4.1.1.Final/hibernate-c3p0-4.1.1.Final.jar" sourcepath="M2_REPO/org/hibernate/hibernate-c3p0/4.1.1.Final/hibernate-c3p0-4.1.1.Final-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/common/hibernate-commons-annotations/4.0.1.Final/hibernate-commons-annotations-4.0.1.Final.jar" sourcepath="M2_REPO/org/hibernate/common/hibernate-commons-annotations/4.0.1.Final/hibernate-commons-annotations-4.0.1.Final-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/4.1.1.Final/hibernate-core-4.1.1.Final.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/4.1.1.Final/hibernate-core-4.1.1.Final-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/4.1.1.Final/hibernate-entitymanager-4.1.1.Final.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/4.1.1.Final/hibernate-entitymanager-4.1.1.Final-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.1.Final/hibernate-jpa-2.0-api-1.0.1.Final.jar" sourcepath="M2_REPO/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.1.Final/hibernate-jpa-2.0-api-1.0.1.Final-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-search/4.1.0.Final/hibernate-search-4.1.0.Final.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-search-analyzers/4.1.0.Final/hibernate-search-analyzers-4.1.0.Final.jar" sourcepath="M2_REPO/org/hibernate/hibernate-search-analyzers/4.1.0.Final/hibernate-search-analyzers-4.1.0.Final-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-search-engine/4.1.0.Final/hibernate-search-engine-4.1.0.Final.jar" sourcepath="M2_REPO/org/hibernate/hibernate-search-engine/4.1.0.Final/hibernate-search-engine-4.1.0.Final-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-search-orm/4.1.0.Final/hibernate-search-orm-4.1.0.Final.jar" sourcepath="M2_REPO/org/hibernate/hibernate-search-orm/4.1.0.Final/hibernate-search-orm-4.1.0.Final-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-tools/3.2.4.GA/hibernate-tools-3.2.4.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/4.1.0.Final/hibernate-validator-4.1.0.Final.jar" sourcepath="M2_REPO/org/hibernate/hibernate-validator/4.1.0.Final/hibernate-validator-4.1.0.Final-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.9/htmlunit-2.9.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.9/htmlunit-2.9-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.9/htmlunit-core-js-2.9.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.9/htmlunit-core-js-2.9-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.1.2/httpmime-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpmime/4.1.2/httpmime-4.1.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/mnode/ical4j/ical4j/1.0.2/ical4j-1.0.2.jar" sourcepath="M2_REPO/org/mnode/ical4j/ical4j/1.0.2/ical4j-1.0.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.7.3/jackson-core-asl-1.7.3.jar" sourcepath="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.7.3/jackson-core-asl-1.7.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.7.3/jackson-mapper-asl-1.7.3.jar" sourcepath="M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.7.3/jackson-mapper-asl-1.7.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/javassist/javassist/3.15.0-GA/javassist-3.15.0-GA.jar" sourcepath="M2_REPO/org/javassist/javassist/3.15.0-GA/javassist-3.15.0-GA-sources.jar"/> <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-8/jaxen-1.1-beta-8.jar" sourcepath="M2_REPO/jaxen/jaxen/1.1-beta-8/jaxen-1.1-beta-8-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging/3.1.0.GA/jboss-logging-3.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging/3.1.0.GA/jboss-logging-3.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.0.Final/jboss-transaction-api_1.1_spec-1.0.0.Final.jar" sourcepath="M2_REPO/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.0.Final/jboss-transaction-api_1.1_spec-1.0.0.Final-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/beust/jcommander/1.12/jcommander-1.12.jar" sourcepath="M2_REPO/com/beust/jcommander/1.12/jcommander-1.12-sources.jar"/> <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar" sourcepath="M2_REPO/jdom/jdom/1.0/jdom-1.0-sources.jar"/> @@ -126,7 +133,16 @@ <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-plugin/1.8.1.0/liquibase-plugin-1.8.1.0.jar"/> <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/> <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-analyzers/3.5.0/lucene-analyzers-3.5.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-analyzers/3.5.0/lucene-analyzers-3.5.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/3.5.0/lucene-core-3.5.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/3.5.0/lucene-core-3.5.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-grouping/3.5.0/lucene-grouping-3.5.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-grouping/3.5.0/lucene-grouping-3.5.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-highlighter/3.5.0/lucene-highlighter-3.5.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-highlighter/3.5.0/lucene-highlighter-3.5.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-memory/3.5.0/lucene-memory-3.5.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-memory/3.5.0/lucene-memory-3.5.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-misc/3.5.0/lucene-misc-3.5.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-misc/3.5.0/lucene-misc-3.5.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-smartcn/3.5.0/lucene-smartcn-3.5.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-smartcn/3.5.0/lucene-smartcn-3.5.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-spatial/3.5.0/lucene-spatial-3.5.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-spatial/3.5.0/lucene-spatial-3.5.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-spellchecker/3.5.0/lucene-spellchecker-3.5.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-spellchecker/3.5.0/lucene-spellchecker-3.5.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-stempel/3.5.0/lucene-stempel-3.5.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-stempel/3.5.0/lucene-stempel-3.5.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-core/2.0.9/maven-core-2.0.9-sources.jar"/> @@ -173,6 +189,7 @@ <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.13/mysql-connector-java-5.1.13.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar" sourcepath="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/thoughtworks/paranamer/paranamer/2.3/paranamer-2.3.jar" sourcepath="M2_REPO/com/thoughtworks/paranamer/paranamer/2.3/paranamer-2.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar" sourcepath="M2_REPO/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6-sources.jar"/> @@ -201,8 +218,13 @@ <classpathentry kind="var" path="M2_REPO/jivesoftware/smackx/3.1.0/smackx-3.1.0.jar"/> <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smackx/debugger/smackx-debugger/3.0.4/smackx-debugger-3.0.4.jar"/> <classpathentry kind="var" path="M2_REPO/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar" sourcepath="M2_REPO/org/yaml/snakeyaml/1.6/snakeyaml-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/xerial/snappy/snappy-java/1.0.1-rc3/snappy-java-1.0.1-rc3.jar" sourcepath="M2_REPO/org/xerial/snappy/snappy-java/1.0.1-rc3/snappy-java-1.0.1-rc3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/glines/socketio/java/socketio-gwt/23-10-2011/socketio-gwt-23-10-2011.jar"/> <classpathentry kind="var" path="M2_REPO/com/glines/socketio/java/socketio-gwt-sources/23-10-2011/socketio-gwt-sources-23-10-2011.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/solr/solr-analysis-extras/3.5.0/solr-analysis-extras-3.5.0.jar" sourcepath="M2_REPO/org/apache/solr/solr-analysis-extras/3.5.0/solr-analysis-extras-3.5.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/solr/solr-commons-csv/3.5.0/solr-commons-csv-3.5.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/solr/solr-core/3.5.0/solr-core-3.5.0.jar" sourcepath="M2_REPO/org/apache/solr/solr-core/3.5.0/solr-core-3.5.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/solr/solr-solrj/3.5.0/solr-solrj-3.5.0.jar" sourcepath="M2_REPO/org/apache/solr/solr-solrj/3.5.0/solr-solrj-3.5.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1.jar" sourcepath="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5.jar" sourcepath="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5-sources.jar"/> @@ -224,4 +246,5 @@ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/> <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2-sources.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="src" path=".apt_generated" including="**/*.java"/> <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> </classpath> \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/pom.xml 2012-05-06 02:14:43 UTC (rev 1866) @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>cc.kune</groupId> <artifactId>kune</artifactId> @@ -314,51 +315,44 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>3.3.1.GA</version> + <version>4.1.1.Final</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> - <version>3.1.0.GA</version> + <version>4.1.0.Final</version> </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - <version>3.3.0.ga</version> -  - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - </exclusion> - </exclusions> - </dependency> +  +  +  +  +  +  +  +   -  +  <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-search</artifactId> - <version>3.1.0.GA</version> + <version>4.1.0.Final</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> - <version>3.4.0.GA</version> + <version>4.1.1.Final</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-tools</artifactId> - <version>3.2.3.GA</version> + <version>3.2.4.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-c3p0</artifactId> - <version>3.3.1.GA</version> + <version>4.1.1.Final</version> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -1103,15 +1097,15 @@ <pluginExecutions> <pluginExecution> <pluginExecutionFilter> - <groupId /> - <artifactId /> - <versionRange /> + <groupId/> + <artifactId/> + <versionRange/> <goals> - <goal /> + <goal/> </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore/> </action> </pluginExecution> <pluginExecution> @@ -1124,7 +1118,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore/> </action> </pluginExecution> </pluginExecutions> Modified: trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -186,8 +186,8 @@ @Override public SearchResult<Container> search(final String search, final Integer firstResult, final Integer maxResults) { - final MultiFieldQueryParser parser = new MultiFieldQueryParser(new String[] { "name" }, - new StandardAnalyzer()); + final MultiFieldQueryParser parser = new MultiFieldQueryParser(LUCENE_VERSION, + new String[] { "name" }, new StandardAnalyzer(LUCENE_VERSION)); Query query; try { query = parser.parse(search); Modified: trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -253,8 +253,8 @@ } private MultiFieldQueryParser createMultiFieldParser() { - final MultiFieldQueryParser parser = new MultiFieldQueryParser(DEF_GLOBAL_SEARCH_FIELDS, - new StandardAnalyzer()); + final MultiFieldQueryParser parser = new MultiFieldQueryParser(LUCENE_VERSION, + DEF_GLOBAL_SEARCH_FIELDS, new StandardAnalyzer(LUCENE_VERSION)); return parser; } 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 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/DefaultManager.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -30,6 +30,7 @@ import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.Query; +import org.apache.lucene.util.Version; import org.hibernate.search.jpa.FullTextEntityManager; import org.hibernate.search.jpa.FullTextQuery; import org.hibernate.search.jpa.Search; @@ -39,6 +40,7 @@ import com.google.inject.Provider; public abstract class DefaultManager<T, K> { + protected final static Version LUCENE_VERSION = Version.LUCENE_35; private final Class<T> entityClass; protected final Log log; private final Provider<EntityManager> provider; @@ -128,7 +130,8 @@ final BooleanClause.Occur[] flags, final Integer firstResult, final Integer maxResults) { Query queryQ; try { - queryQ = MultiFieldQueryParser.parse(query, fields, flags, new StandardAnalyzer()); + queryQ = MultiFieldQueryParser.parse(LUCENE_VERSION, query, fields, flags, new StandardAnalyzer( + LUCENE_VERSION)); } catch (final ParseException e) { throw new ServerManagerException("Error parsing search", e); } @@ -139,7 +142,8 @@ final BooleanClause.Occur[] flags, final Integer firstResult, final Integer maxResults) { Query query; try { - query = MultiFieldQueryParser.parse(queries, fields, flags, new StandardAnalyzer()); + query = MultiFieldQueryParser.parse(LUCENE_VERSION, queries, fields, flags, new StandardAnalyzer( + LUCENE_VERSION)); } catch (final ParseException e) { throw new ServerManagerException("Error parsing search", e); } @@ -150,7 +154,8 @@ final Integer firstResult, final Integer maxResults) { Query query; try { - query = MultiFieldQueryParser.parse(queries, fields, new StandardAnalyzer()); + query = MultiFieldQueryParser.parse(LUCENE_VERSION, queries, fields, new StandardAnalyzer( + LUCENE_VERSION)); } catch (final ParseException e) { throw new ServerManagerException("Error parsing search", e); } Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -302,8 +302,8 @@ @Override public SearchResult<Group> search(final String search, final Integer firstResult, final Integer maxResults) { - final MultiFieldQueryParser parser = new MultiFieldQueryParser(new String[] { "longName", - "shortName", "publicDesc" }, new StandardAnalyzer()); + final MultiFieldQueryParser parser = new MultiFieldQueryParser(LUCENE_VERSION, new String[] { + "longName", "shortName", "publicDesc" }, new StandardAnalyzer(LUCENE_VERSION)); Query query; try { query = parser.parse(search + SearcherConstants.WILDCARD); Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -423,8 +423,8 @@ @Override public SearchResult<User> search(final String search, final Integer firstResult, final Integer maxResults) { - final MultiFieldQueryParser parser = new MultiFieldQueryParser(new String[] { "name", "shortName" }, - new StandardAnalyzer()); + final MultiFieldQueryParser parser = new MultiFieldQueryParser(LUCENE_VERSION, new String[] { + "name", "shortName" }, new StandardAnalyzer(LUCENE_VERSION)); Query query; try { query = parser.parse(search); Modified: trunk/src/main/java/cc/kune/domain/BasicMimeType.java =================================================================== --- trunk/src/main/java/cc/kune/domain/BasicMimeType.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/java/cc/kune/domain/BasicMimeType.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -28,76 +28,78 @@ @Embeddable public class BasicMimeType { - @Field(index = Index.UN_TOKENIZED, store = Store.NO) - private String mimetype; - @Field(index = Index.UN_TOKENIZED, store = Store.NO) - private String mimesubtype; + @Field(index = Index.YES, store = Store.NO) + private String mimesubtype; + @Field(index = Index.YES, store = Store.NO) + private String mimetype; - public BasicMimeType() { - this(null, null); - } + public BasicMimeType() { + this(null, null); + } - public BasicMimeType(final String mimetype) { - if (mimetype != null) { - final String[] split = mimetype.split("/", 2); - this.mimetype = split[0]; - if (split.length > 1 && split[1].length() > 0) { - this.mimesubtype = split[1]; - } - } + public BasicMimeType(final String mimetype) { + if (mimetype != null) { + final String[] split = mimetype.split("/", 2); + this.mimetype = split[0]; + if (split.length > 1 && split[1].length() > 0) { + this.mimesubtype = split[1]; + } } + } - public BasicMimeType(final String type, final String subtype) { - this.mimetype = type; - this.mimesubtype = subtype; - } + public BasicMimeType(final String type, final String subtype) { + this.mimetype = type; + this.mimesubtype = subtype; + } - public String getSubtype() { - return mimesubtype; - } + public String getSubtype() { + return mimesubtype; + } - public String getType() { - return mimetype; - } + public String getType() { + return mimetype; + } - /** - * Duplicate code in BMTDTO - * - * @return - */ - public boolean isImage() { - return mimetype != null && mimetype.equals("image"); - } + /** + * Duplicate code in BMTDTO + * + * @return + */ + public boolean isImage() { + return mimetype != null && mimetype.equals("image"); + } - /** - * Duplicate code in BMTDTO - * - * @return - */ - public boolean isPdf() { - return mimetype != null && mimesubtype != null && mimetype.equals("application") && mimesubtype.equals("pdf"); - } + /** + * Duplicate code in BMTDTO + * + * @return + */ + public boolean isPdf() { + return mimetype != null && mimesubtype != null && mimetype.equals("application") + && mimesubtype.equals("pdf"); + } - /** - * Duplicate code in BMTDTO - * - * @return - */ - public boolean isText() { - return mimetype != null && mimesubtype != null && mimetype.equals("text") && mimesubtype.equals("plain"); - } + /** + * Duplicate code in BMTDTO + * + * @return + */ + public boolean isText() { + return mimetype != null && mimesubtype != null && mimetype.equals("text") + && mimesubtype.equals("plain"); + } - public void setSubtype(final String subtype) { - this.mimesubtype = subtype; - } + public void setSubtype(final String subtype) { + this.mimesubtype = subtype; + } - public void setType(final String type) { - this.mimetype = type; - } + public void setType(final String type) { + this.mimetype = type; + } - @Override - public String toString() { - return mimesubtype == null ? mimetype : mimetype + "/" + mimesubtype; - } + @Override + public String toString() { + return mimesubtype == null ? mimetype : mimetype + "/" + mimesubtype; + } } Modified: trunk/src/main/java/cc/kune/domain/Container.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Container.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/java/cc/kune/domain/Container.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -95,7 +95,7 @@ private I18nLanguage language; @Column - @Field(index = Index.TOKENIZED, store = Store.NO) + @Field(index = Index.YES, store = Store.NO) private String name; @IndexedEmbedded(depth = 1, prefix = "owner_") Modified: trunk/src/main/java/cc/kune/domain/Content.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Content.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/java/cc/kune/domain/Content.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -44,13 +44,13 @@ import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.Version; +import javax.validation.constraints.NotNull; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; -import org.hibernate.validator.NotNull; import cc.kune.barters.shared.BartersToolConstants; import cc.kune.blogs.shared.BlogsToolConstants; Modified: trunk/src/main/java/cc/kune/domain/ExtMediaDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/domain/ExtMediaDescrip.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/java/cc/kune/domain/ExtMediaDescrip.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -25,7 +25,7 @@ import javax.persistence.Id; import javax.persistence.Table; -import org.hibernate.validator.Length; +import org.hibernate.validator.constraints.Length; import cc.kune.domain.utils.HasId; @@ -33,101 +33,101 @@ @Table(name = "ext_media_descriptors") public class ExtMediaDescrip implements HasId { - @Column(nullable = false) - private String detectRegex; - @Column(nullable = false) - @Length(max = 1000) - private String embedTemplate; - private int height; - @Id - @GeneratedValue - private Long id; - @Column(nullable = false) - private String idRegex; - @Column(nullable = false) - private String name; - @Column(nullable = false) - private String siteurl; - private int width; + @Column(nullable = false) + private String detectRegex; + @Column(nullable = false) + @Length(max = 1000) + private String embedTemplate; + private int height; + @Id + @GeneratedValue + private Long id; + @Column(nullable = false) + private String idRegex; + @Column(nullable = false) + private String name; + @Column(nullable = false) + private String siteurl; + private int width; - public ExtMediaDescrip() { - this(null, null, null, null, null, 0, 0); - } + public ExtMediaDescrip() { + this(null, null, null, null, null, 0, 0); + } - public ExtMediaDescrip(final String name, final String siteurl, final String detectRegex, final String idRegex, - final String embedTemplate, final int defWidth, final int defHeight) { - this.name = name; - this.siteurl = siteurl; - this.detectRegex = detectRegex; - this.idRegex = idRegex; - this.embedTemplate = embedTemplate; - width = defWidth; - height = defHeight; - } + public ExtMediaDescrip(final String name, final String siteurl, final String detectRegex, + final String idRegex, final String embedTemplate, final int defWidth, final int defHeight) { + this.name = name; + this.siteurl = siteurl; + this.detectRegex = detectRegex; + this.idRegex = idRegex; + this.embedTemplate = embedTemplate; + width = defWidth; + height = defHeight; + } - public String getDetectRegex() { - return detectRegex; - } + public String getDetectRegex() { + return detectRegex; + } - public String getEmbedTemplate() { - return embedTemplate; - } + public String getEmbedTemplate() { + return embedTemplate; + } - public int getHeight() { - return height; - } + public int getHeight() { + return height; + } - @Override - public Long getId() { - return id; - } + @Override + public Long getId() { + return id; + } - public String getIdRegex() { - return idRegex; - } + public String getIdRegex() { + return idRegex; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public String getSiteurl() { - return siteurl; - } + public String getSiteurl() { + return siteurl; + } - public int getWidth() { - return width; - } + public int getWidth() { + return width; + } - public void setDetectRegex(final String detectRegex) { - this.detectRegex = detectRegex; - } + public void setDetectRegex(final String detectRegex) { + this.detectRegex = detectRegex; + } - public void setEmbedTemplate(final String embedTemplate) { - this.embedTemplate = embedTemplate; - } + public void setEmbedTemplate(final String embedTemplate) { + this.embedTemplate = embedTemplate; + } - public void setHeight(final int height) { - this.height = height; - } + public void setHeight(final int height) { + this.height = height; + } - @Override - public void setId(final Long id) { - this.id = id; - } + @Override + public void setId(final Long id) { + this.id = id; + } - public void setIdRegex(final String idRegex) { - this.idRegex = idRegex; - } + public void setIdRegex(final String idRegex) { + this.idRegex = idRegex; + } - public void setName(final String name) { - this.name = name; - } + public void setName(final String name) { + this.name = name; + } - public void setSiteurl(final String siteurl) { - this.siteurl = siteurl; - } + public void setSiteurl(final String siteurl) { + this.siteurl = siteurl; + } - public void setWidth(final int width) { - this.width = width; - } + public void setWidth(final int width) { + this.width = width; + } } Modified: trunk/src/main/java/cc/kune/domain/Group.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Group.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/java/cc/kune/domain/Group.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -36,14 +36,14 @@ import javax.persistence.OneToOne; import javax.persistence.Table; import javax.persistence.Transient; +import javax.validation.constraints.Pattern; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Index; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.Store; -import org.hibernate.validator.Length; -import org.hibernate.validator.Pattern; +import org.hibernate.validator.constraints.Length; import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.domain.utils.StateToken; @@ -92,15 +92,15 @@ @Embedded private BasicMimeType logoMime; - @Field(index = Index.TOKENIZED, store = Store.NO) + @Field(index = Index.YES, store = Store.NO) @Column(nullable = false, unique = true) @Length(min = 3, max = 50, message = "The longName must be between 3 and 50 characters of length") private String longName; - @Field(index = Index.UN_TOKENIZED, store = Store.NO) + @Field(index = Index.YES, store = Store.NO) @Column(unique = true) @Length(min = 3, max = 15, message = "The shortname must be between 3 and 15 characters of length") - @Pattern(regex = "^[a-z0-9]+$", message = "The name must be between 3 and 15 lowercase characters. It can only contain Western characters, numbers, and dashes") + @Pattern(regexp = "^[a-z0-9]+$", message = "The name must be between 3 and 15 lowercase characters. It can only contain Western characters, numbers, and dashes") private String shortName; @OneToOne(cascade = CascadeType.ALL) Modified: trunk/src/main/java/cc/kune/domain/I18nLanguage.java =================================================================== --- trunk/src/main/java/cc/kune/domain/I18nLanguage.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/java/cc/kune/domain/I18nLanguage.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -23,14 +23,14 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; +import javax.validation.constraints.Pattern; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Index; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.Store; -import org.hibernate.validator.Length; -import org.hibernate.validator.Pattern; +import org.hibernate.validator.constraints.Length; import cc.kune.domain.utils.HasId; @@ -45,7 +45,7 @@ @Table(name = "globalize_languages") public class I18nLanguage implements HasId { - @Field(index = Index.TOKENIZED, store = Store.NO) + @Field(index = Index.YES, store = Store.NO) @Column(name = "code", unique = true) private String code; @@ -58,7 +58,7 @@ @Column(name = "direction") private String direction; - @Field(index = Index.TOKENIZED, store = Store.NO) + @Field(index = Index.YES, store = Store.NO) @Column(name = "english_name") private String englishName; @@ -86,7 +86,7 @@ @Column(name = "macro_language") private Boolean macroLanguage; - @Field(index = Index.TOKENIZED, store = Store.NO) + @Field(index = Index.YES, store = Store.NO) @Column(name = "native_name") private String nativeName; @@ -96,7 +96,7 @@ @Column(name = "native_name_modifier") private String nativeNameModifier; - @Pattern(regex = "^[c=\\d?:%!<>&|() ]+$") + @Pattern(regexp = "^[c=\\d?:%!<>&|() ]+$") @Column(name = "pluralization") @Length(max = 200) private String pluralization; Modified: trunk/src/main/java/cc/kune/domain/Rate.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Rate.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/java/cc/kune/domain/Rate.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -27,76 +27,76 @@ import javax.persistence.Table; import javax.persistence.UniqueConstraint; -import org.hibernate.validator.Range; +import org.hibernate.validator.constraints.Range; @Entity @Table(name = "rates", uniqueConstraints = { @UniqueConstraint(columnNames = { "content_id", "rater_id" }) }) public class Rate { - @ManyToOne - Content content; + @ManyToOne + Content content; - @Basic(optional = false) - private final Long createdOn; + @Basic(optional = false) + private final Long createdOn; - @Id - @GeneratedValue - Long id; + @Id + @GeneratedValue + Long id; - @ManyToOne - User rater; + @ManyToOne + User rater; - @Range(min = 0, max = 5) - Double value; + @Range(min = 0, max = 5) + Double value; - public Rate() { - this(null, null, null); - } + public Rate() { + this(null, null, null); + } - public Rate(final User rater, final Content content, final Double value) { - this.rater = rater; - this.content = content; - this.value = value; - this.createdOn = System.currentTimeMillis(); - } + public Rate(final User rater, final Content content, final Double value) { + this.rater = rater; + this.content = content; + this.value = value; + this.createdOn = System.currentTimeMillis(); + } - public Content getContent() { - return content; - } + public Content getContent() { + return content; + } - public Long getCreatedOn() { - return createdOn; - } + public Long getCreatedOn() { + return createdOn; + } - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public User getRater() { - return rater; - } + public User getRater() { + return rater; + } - public Double getValue() { - return value; - } + public Double getValue() { + return value; + } - public void setContent(final Content content) { - this.content = content; - } + public void setContent(final Content content) { + this.content = content; + } - public void setId(final Long id) { - this.id = id; - } + public void setId(final Long id) { + this.id = id; + } - public void setRater(final User rater) { - this.rater = rater; - } + public void setRater(final User rater) { + this.rater = rater; + } - public void setValue(final Double value) { - this.value = value; - } + public void setValue(final Double value) { + this.value = value; + } - @Override - public String toString() { - return "Rate[" + getRater() + " to " + content.getStateTokenEncoded() + "rated: " + getValue() + "]"; - } + @Override + public String toString() { + return "Rate[" + getRater() + " to " + content.getStateTokenEncoded() + "rated: " + getValue() + "]"; + } } Modified: trunk/src/main/java/cc/kune/domain/Revision.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Revision.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/java/cc/kune/domain/Revision.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -51,7 +51,7 @@ // http://www.hibernate.org/112.html @Lob @Column(length = 2147483647) - @Field(index = Index.TOKENIZED, store = Store.NO) + @Field(index = Index.YES, store = Store.NO) @FieldBridge(impl = DataFieldBridge.class) char[] body; @@ -74,7 +74,7 @@ @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) private Revision previous; - @Field(index = Index.TOKENIZED, store = Store.NO) + @Field(index = Index.YES, store = Store.NO) String title; @Version Modified: trunk/src/main/java/cc/kune/domain/Tag.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Tag.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/java/cc/kune/domain/Tag.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -39,52 +39,52 @@ @Table(name = "tags") public class Tag implements HasId { - @Basic(optional = false) - private final Long createdOn; + @Basic(optional = false) + private final Long createdOn; - @Id - @GeneratedValue - @DocumentId - private Long id; + @Id + @GeneratedValue + @DocumentId + private Long id; - @Field(index = Index.TOKENIZED, store = Store.NO) - @Column(unique = true) - private String name; + @Field(index = Index.YES, store = Store.NO) + @Column(unique = true) + private String name; - public Tag() { - this(null); - } + public Tag() { + this(null); + } - public Tag(final String name) { - this.name = name; - this.createdOn = System.currentTimeMillis(); - } + public Tag(final String name) { + this.name = name; + this.createdOn = System.currentTimeMillis(); + } - public Long getCreatedOn() { - return createdOn; - } + public Long getCreatedOn() { + return createdOn; + } - @Override - public Long getId() { - return id; - } + @Override + public Long getId() { + return id; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - @Override - public void setId(final Long id) { - this.id = id; - } + @Override + public void setId(final Long id) { + this.id = id; + } - public void setName(final String name) { - this.name = name; - } + public void setName(final String name) { + this.name = name; + } - @Override - public String toString() { - return "Tag[" + getName() + "]"; - } + @Override + public String toString() { + return "Tag[" + getName() + "]"; + } } Modified: trunk/src/main/java/cc/kune/domain/TagUserContent.java =================================================================== --- trunk/src/main/java/cc/kune/domain/TagUserContent.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/java/cc/kune/domain/TagUserContent.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -26,11 +26,11 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Table; +import javax.validation.constraints.NotNull; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; -import org.hibernate.validator.NotNull; import cc.kune.domain.utils.HasId; @@ -39,75 +39,75 @@ @Table(name = "tag_user_content") public class TagUserContent implements HasId { - @IndexedEmbedded - @NotNull - @ManyToOne(fetch = FetchType.LAZY) - private Content content; + @IndexedEmbedded + @NotNull + @ManyToOne(fetch = FetchType.LAZY) + private Content content; - @Basic(optional = false) - private final Long createdOn; + @Basic(optional = false) + private final Long createdOn; - @Id - @GeneratedValue - @DocumentId - private Long id; + @Id + @GeneratedValue + @DocumentId + private Long id; - @IndexedEmbedded - @NotNull - @ManyToOne(fetch = FetchType.LAZY) - private Tag tag; + @IndexedEmbedded + @NotNull + @ManyToOne(fetch = FetchType.LAZY) + private Tag tag; - @IndexedEmbedded - @NotNull - @ManyToOne(fetch = FetchType.LAZY) - private User user; + @IndexedEmbedded + @NotNull + @ManyToOne(fetch = FetchType.LAZY) + private User user; - public TagUserContent() { - this(null, null, null); - } + public TagUserContent() { + this(null, null, null); + } - public TagUserContent(final Tag tag, final User user, final Content content) { - this.tag = tag; - this.user = user; - this.content = content; - this.createdOn = System.currentTimeMillis(); - } + public TagUserContent(final Tag tag, final User user, final Content content) { + this.tag = tag; + this.user = user; + this.content = content; + this.createdOn = System.currentTimeMillis(); + } - public Content getContent() { - return content; - } + public Content getContent() { + return content; + } - public Long getCreatedOn() { - return createdOn; - } + public Long getCreatedOn() { + return createdOn; + } - @Override - public Long getId() { - return id; - } + @Override + public Long getId() { + return id; + } - public Tag getTag() { - return tag; - } + public Tag getTag() { + return tag; + } - public User getUser() { - return user; - } + public User getUser() { + return user; + } - public void setContent(final Content content) { - this.content = content; - } + public void setContent(final Content content) { + this.content = content; + } - @Override - public void setId(final Long id) { - this.id = id; - } + @Override + public void setId(final Long id) { + this.id = id; + } - public void setTag(final Tag tag) { - this.tag = tag; - } + public void setTag(final Tag tag) { + this.tag = tag; + } - public void setUser(final User user) { - this.user = user; - } + public void setUser(final User user) { + this.user = user; + } } Modified: trunk/src/main/java/cc/kune/domain/User.java =================================================================== --- trunk/src/main/java/cc/kune/domain/User.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/java/cc/kune/domain/User.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -34,16 +34,16 @@ import javax.persistence.OneToOne; import javax.persistence.Table; import javax.persistence.Transient; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Index; import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.Store; -import org.hibernate.validator.Email; -import org.hibernate.validator.Length; -import org.hibernate.validator.NotNull; -import org.hibernate.validator.Pattern; +import org.hibernate.validator.constraints.Email; +import org.hibernate.validator.constraints.Length; import cc.kune.core.shared.domain.UserSNetVisibility; import cc.kune.core.shared.domain.utils.StateToken; @@ -109,7 +109,7 @@ @Basic private Long lastLogin; - @Field(index = Index.TOKENIZED, store = Store.NO) + @Field(index = Index.YES, store = Store.NO) @Column(nullable = false, unique = true) @Length(min = 3, max = 50) private String name; @@ -119,11 +119,11 @@ @Column(nullable = false) private byte[] salt; - @Field(index = Index.UN_TOKENIZED, store = Store.NO) + @Field(index = Index.YES, store = Store.NO) @Column(unique = true) // http://www.hibernate.org/hib_docs/validator/reference/en/html/validator-def… @Length(min = 3, max = 15) - @Pattern(regex = "^[a-z0-9]+$", message = "The name must be between 3 and 15 lowercase characters. It can only contain Western characters, numbers, and dashes") + @Pattern(regexp = "^[a-z0-9]+$", message = "The name must be between 3 and 15 lowercase characters. It can only contain Western characters, numbers, and dashes") private String shortName; @Enumerated(EnumType.STRING) Modified: trunk/src/main/resources/META-INF/persistence.xml =================================================================== --- trunk/src/main/resources/META-INF/persistence.xml 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/main/resources/META-INF/persistence.xml 2012-05-06 02:14:43 UTC (rev 1866) @@ -63,7 +63,7 @@ <property name="hibernate.c3p0.idle_test_period" value="3000"/> <property name="c3p0.preferredTestQuery" value="SELECT 1"/> <property name="hibernate.search.default.directory_provider" - value="org.hibernate.search.store.FSDirectoryProvider"/> + value="filesystem"/> <property name="hibernate.search.default.indexBase" value="/var/lib/kune/lucene/kune_dev/indexes"/> </properties> @@ -163,7 +163,7 @@ <property name="hibernate.c3p0.idle_test_period" value="3000"/> <property name="c3p0.preferredTestQuery" value="SELECT 1"/> <property name="hibernate.search.default.directory_provider" - value="org.hibernate.search.store.FSDirectoryProvider"/> + value="filesystem"/> <property name="hibernate.search.default.indexBase" value="kune-data/lucene/kune_dev/indexes"/> </properties> @@ -221,7 +221,7 @@ <property name="hibernate.c3p0.idle_test_period" value="3000"/> <property name="c3p0.preferredTestQuery" value="SELECT 1"/> <property name="hibernate.search.default.directory_provider" - value="org.hibernate.search.store.FSDirectoryProvider"/> + value="filesystem"/> <property name="hibernate.search.default.indexBase" value="kune-data/lucene/kune_test/indexes"/> </properties> @@ -259,13 +259,13 @@ <property name="hibernate.format_sql" value="false"/> <property name="use_sql_comments" value="false"/> <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/> - <property name="hibernate.hbm2ddl.auto" value="create-drop"/> + <property name="hibernate.hbm2ddl.auto" value="create-drop"/> <property name="hibernate.connection.driver_class" value="org.h2.Driver"/> <property name="hibernate.connection.username" value="sa"/> <property name="hibernate.connection.password" value=""/> <property name="hibernate.connection.url" value="jdbc:h2:mem:testdb"/> <property name="hibernate.search.default.directory_provider" - value="org.hibernate.search.store.FSDirectoryProvider"/> + value="filesystem"/>  <property name="hibernate.search.default.indexBase" value="kune-data/lucene/kune_test/indexes"/> </properties> Modified: trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -65,6 +65,7 @@ public static Injector createInjector() { Injector injector; try { + System.setProperty("java.security.auth.login.config", "src/main/resources/jaas.config"); injector = Guice.createInjector(CustomSettingsBinder.bindSettings( TestConstants.WAVE_TEST_PROPFILE, CoreSettings.class)); final PersistenceModule wavePersistModule = injector.getInstance(PersistenceModule.class); Modified: trunk/src/test/java/cc/kune/core/server/manager/GroupManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/GroupManagerDefaultTest.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/test/java/cc/kune/core/server/manager/GroupManagerDefaultTest.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -24,8 +24,9 @@ import java.util.TimeZone; +import javax.validation.ConstraintViolationException; + import org.apache.lucene.queryParser.ParseException; -import org.hibernate.validator.InvalidStateException; import org.junit.Test; import cc.kune.core.client.errors.EmailAddressInUseException; @@ -167,7 +168,7 @@ rollbackTransaction(); } - @Test(expected = InvalidStateException.class) + @Test(expected = ConstraintViolationException.class) public void createUserWithVeryShortName() throws Exception { userManager.createUser("us", "the user name 2", "email2(a)example.com", "userPassword", "en", "GB", TimeZone.getDefault().getID(), true); Modified: trunk/src/test/java/cc/kune/core/server/manager/UserManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/UserManagerDefaultTest.java 2012-05-05 22:49:50 UTC (rev 1865) +++ trunk/src/test/java/cc/kune/core/server/manager/UserManagerDefaultTest.java 2012-05-06 02:14:43 UTC (rev 1866) @@ -26,9 +26,9 @@ import java.util.TimeZone; import javax.persistence.PersistenceException; +import javax.validation.ConstraintViolationException; import org.apache.lucene.queryParser.ParseException; -import org.hibernate.validator.InvalidStateException; import org.junit.Test; import cc.kune.core.client.errors.GroupShortNameInUseException; @@ -58,7 +58,7 @@ persist(user); } - @Test(expected = InvalidStateException.class) + @Test(expected = ConstraintViolationException.class) public void emailIncorrect() { user = new User("test1", "test1 name", "falseEmail@", "somediggest".getBytes(), "some salt".getBytes(), english, gb, getTimeZone()); @@ -101,7 +101,7 @@ persist(user2); } - @Test(expected = InvalidStateException.class) + @Test(expected = ConstraintViolationException.class) public void userNameLengthIncorrect() { user = new User("test1", "te", "test(a)example.com", "diggest".getBytes(), "salt".getBytes(), english, gb, getTimeZone()); @@ -117,7 +117,7 @@ rollbackTransaction(); } - @Test(expected = InvalidStateException.class) + @Test(expected = ConstraintViolationException.class) public void userShortNameIncorrect() { user = new User("test1A", "test1 name", "test(a)example.com", "diggest".getBytes(), "salt".getBytes(), english, gb, getTimeZone());

1 0

r1865 - in trunk: debian src/main/java/cc/kune/core/server src/main/java/cc/kune/core/server/manager src/main/java/cc/kune/core/server/manager/impl src/main/java/cc/kune/core/server/rpc
by Vicente J. Ruiz Jurado 05 May '12

05 May '12

Author: vjrj_ Date: 2012-05-06 00:49:50 +0200 (Sun, 06 May 2012) New Revision: 1865 Modified: trunk/debian/changelog trunk/debian/files trunk/src/main/java/cc/kune/core/server/UserSessionManager.java trunk/src/main/java/cc/kune/core/server/manager/SocialNetworkManager.java trunk/src/main/java/cc/kune/core/server/manager/impl/SocialNetworkManagerDefault.java trunk/src/main/java/cc/kune/core/server/rpc/SocialNetworkRPC.java Log: Some minor fix in SN Caching Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2012-05-02 23:30:11 UTC (rev 1864) +++ trunk/debian/changelog 2012-05-05 22:49:50 UTC (rev 1865) @@ -1,3 +1,9 @@ +kune (0.2.0+b5) unstable; urgency=low + + * Some UI improvements (header and sitebar reorganization, etc) + + -- Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> Thu, 03 May 2012 01:30:52 +0200 + kune (0.2.0+b4) unstable; urgency=low * Added some kune.wave.import.usernamespairs param Modified: trunk/debian/files =================================================================== --- trunk/debian/files 2012-05-02 23:30:11 UTC (rev 1864) +++ trunk/debian/files 2012-05-05 22:49:50 UTC (rev 1865) @@ -1 +1 @@ -kune_0.2.0+b4_all.deb java optional +kune_0.2.0+b5_all.deb java optional Modified: trunk/src/main/java/cc/kune/core/server/UserSessionManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/UserSessionManager.java 2012-05-02 23:30:11 UTC (rev 1864) +++ trunk/src/main/java/cc/kune/core/server/UserSessionManager.java 2012-05-05 22:49:50 UTC (rev 1865) @@ -66,6 +66,8 @@ // // Best way maybe it's accessing openfire db: // http://www.mastertheboss.com/jboss-howto/45-jboss-persistence/110-jboss-per… + + // FIXME add sessions from restored ? logins = new HashSet<String>(); } Modified: trunk/src/main/java/cc/kune/core/server/manager/SocialNetworkManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/SocialNetworkManager.java 2012-05-02 23:30:11 UTC (rev 1864) +++ trunk/src/main/java/cc/kune/core/server/manager/SocialNetworkManager.java 2012-05-05 22:49:50 UTC (rev 1865) @@ -19,8 +19,6 @@ */ package cc.kune.core.server.manager; - - import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.shared.dto.SocialNetworkRequestResult; @@ -32,30 +30,33 @@ public interface SocialNetworkManager extends Manager<SocialNetwork, Long> { - void acceptJoinGroup(User userLogged, Group group, Group inGroup) throws DefaultException; + void acceptJoinGroup(User userLogged, Group group, Group inGroup) throws DefaultException; - void addGroupToAdmins(User userLogged, Group group, Group inGroup) throws DefaultException; + void addAsBuddie(User userLogged, User toUser); - void addGroupToCollabs(User userLogged, Group group, Group inGroup) throws DefaultException; + void addGroupToAdmins(User userLogged, Group group, Group inGroup) throws DefaultException; - void addGroupToViewers(User userLogged, Group group, Group inGroup) throws DefaultException; + void addGroupToCollabs(User userLogged, Group group, Group inGroup) throws DefaultException; - void deleteMember(User userLogged, Group group, Group inGroup) throws DefaultException, AccessViolationException; + void addGroupToViewers(User userLogged, Group group, Group inGroup) throws DefaultException; - void denyJoinGroup(User userLogged, Group group, Group inGroup) throws DefaultException; + void deleteMember(User userLogged, Group group, Group inGroup) throws DefaultException, + AccessViolationException; - ParticipationData findParticipation(User user, Group group) throws DefaultException; + void denyJoinGroup(User userLogged, Group group, Group inGroup) throws DefaultException; - SocialNetwork get(User userLogged, Group group) throws DefaultException; + ParticipationData findParticipation(User user, Group group) throws DefaultException; - SocialNetworkData getSocialNetworkData(User userLogged, Group group); + SocialNetwork get(User userLogged, Group group) throws DefaultException; - SocialNetworkRequestResult requestToJoin(User user, Group inGroup) throws DefaultException; + SocialNetworkData getSocialNetworkData(User userLogged, Group group); - void setAdminAsCollab(User userLogged, Group group, Group inGroup) throws DefaultException; + SocialNetworkRequestResult requestToJoin(User user, Group inGroup) throws DefaultException; - void setCollabAsAdmin(User userLogged, Group group, Group inGroup) throws DefaultException; + void setAdminAsCollab(User userLogged, Group group, Group inGroup) throws DefaultException; - void unJoinGroup(Group groupToUnJoin, Group inGroup) throws DefaultException; + void setCollabAsAdmin(User userLogged, Group group, Group inGroup) throws DefaultException; + void unJoinGroup(Group groupToUnJoin, Group inGroup) throws DefaultException; + } Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/SocialNetworkManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/SocialNetworkManagerDefault.java 2012-05-02 23:30:11 UTC (rev 1864) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/SocialNetworkManagerDefault.java 2012-05-05 22:49:50 UTC (rev 1865) @@ -37,6 +37,7 @@ import cc.kune.core.server.error.ServerException; import cc.kune.core.server.manager.SocialNetworkManager; import cc.kune.core.server.manager.UserManager; +import cc.kune.core.server.notifier.NotificationService; import cc.kune.core.server.persist.DataSourceKune; import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.domain.GroupListMode; @@ -64,18 +65,21 @@ private final AccessRightsService accessRightsService; private final GroupFinder finder; + private final NotificationService notifyService; private final SocialNetworkCache snCache; private final UserManager userManager; @Inject public SocialNetworkManagerDefault(@DataSourceKune final Provider<EntityManager> provider, final GroupFinder finder, final AccessRightsService accessRightsService, - final UserManager userManager, final SocialNetworkCache snCache) { + final UserManager userManager, final SocialNetworkCache snCache, + final NotificationService notifyService) { super(provider, SocialNetwork.class); this.finder = finder; this.accessRightsService = accessRightsService; this.userManager = userManager; this.snCache = snCache; + this.notifyService = notifyService; } @Override @@ -100,6 +104,13 @@ } @Override + public void addAsBuddie(final User userLogged, final User toUser) { + notifyService.notifyUserToUser(userLogged, toUser, "Added as buddie", "He/she added you as buddie"); + snCache.expire(userLogged.getUserGroup()); + snCache.expire(toUser.getUserGroup()); + } + + @Override public void addGroupToAdmins(final User userLogged, final Group group, final Group inGroup) throws DefaultException { checkGroupAddingToSelf(group, inGroup); Modified: trunk/src/main/java/cc/kune/core/server/rpc/SocialNetworkRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/SocialNetworkRPC.java 2012-05-02 23:30:11 UTC (rev 1864) +++ trunk/src/main/java/cc/kune/core/server/rpc/SocialNetworkRPC.java 2012-05-05 22:49:50 UTC (rev 1865) @@ -103,9 +103,7 @@ @Authenticated @KuneTransactional public void addAsBuddie(final String hash, final String userName) throws DefaultException { - final User userLogged = userSessionManager.getUser(); - final User toUser = userFinder.findByShortName(userName); - notifyService.notifyUserToUser(userLogged, toUser, "Added as buddie", "He/she added you as buddie"); + socialNetworkManager.addAsBuddie(userSessionManager.getUser(), userFinder.findByShortName(userName)); } @Override

1 0

[kune issues] #268: Hibernate 4 migration
by kune issues 05 May '12

05 May '12

#268: Hibernate 4 migration --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: major | Milestone: Component: Server side | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ -- Ticket URL: <http://kune.ourproject.org/issues/ticket/268> kune issues <http://kune.ourproject.org/issues/>

1 0

Re: [kune-commits] [kune issues] #192: Add to the kune translator a stats summary about completeness
by kune issues 04 May '12

04 May '12

#192: Add to the kune translator a stats summary about completeness -----------------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: minor | Milestone: Component: Internationalization | Version: Resolution: | Keywords: Blocked By: | Blocking: -----------------------------------+------------------ Comment (by vjrj): select count(*) from globalize_translations g where g.language_id=1819 into @i18nTotal; select l.english_name, count(*)*100/(@i18nTotal) AS percentage from globalize_translations g, globalize_languages l where g.language_id=l.id and text!="" group by language_id ORDER BY percentage DESC -- Ticket URL: <http://kune.ourproject.org/issues/ticket/192#comment:1> kune issues <http://kune.ourproject.org/issues/>

1 0

[kune issues] #267: Terceros no pueden editar waves en mi espacio personal
by kune issues 03 May '12

03 May '12

#267: Terceros no pueden editar waves en mi espacio personal -------------------------+------------------- Reporter: samer | Owner: vjrj Type: defect | Status: new Priority: major | Milestone: Component: Group space | Version: Keywords: | Blocked By: Blocking: | -------------------------+------------------- Secuencia: * Creo un nuevo doc en mi espacio personal * Redacto varias cosas * Añado a Rana, Sem y Xavi * Les envío el enlace de la wave, en mi espacio personal: http://kune.cc/?locale=es#samer.docs.3608.1684 * Cuando Xavi entra en ese enlace, no puede editar. Lo vé como "externo" (no se ven los botones de la wave y tal). Tampoco hay botón "Participa" (normal, él ya está invitado a ese doc... y tampoco es un grupo...). Resultado: no puede editar el doc desde el group-space y se hace un lío. Sí podría haberlo editado desde el user-space, pero es una movida que salga solo lectura en el group-space. -- Ticket URL: <http://kune.ourproject.org/issues/ticket/267> kune issues <http://kune.ourproject.org/issues/>

1 1

r1864 - in trunk/src/main/java/cc/kune: chat/client core/client/notify/spiner core/client/sitebar core/public core/server/manager/impl gspace/client/armor/resources
by Vicente J. Ruiz Jurado 02 May '12

02 May '12

Author: vjrj_ Date: 2012-05-03 01:30:11 +0200 (Thu, 03 May 2012) New Revision: 1864 Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerViewImpl.java trunk/src/main/java/cc/kune/core/client/sitebar/MyGroupsMenu.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmor.css trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmorTheme.css Log: NEW - # 224: Improve the sitebar (order, elements, etc) http://kune.ourproject.org/issues/ticket/224 CLOSED - # 264: Document header reorganization http://kune.ourproject.org/issues/ticket/264 SNCache when new group is created Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2012-05-02 12:50:59 UTC (rev 1863) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2012-05-02 23:30:11 UTC (rev 1864) @@ -30,6 +30,7 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.KeyStroke; import cc.kune.common.client.actions.Shortcut; +import cc.kune.common.client.actions.ui.ParentWidget; import cc.kune.common.client.actions.ui.descrip.IconLabelDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; @@ -282,9 +283,7 @@ dialog.setScrollMode(Scroll.NONE); dialog.setHideOnButtonClick(true); dialog.setCollapsible(true); - // final Widget btn = (Widget) - // chatIcon.getValue(ParentWidget.PARENT_UI); - dialog.setPosition(118, 1); + dialog.setPosition(0, 0); dialog.setIcon(AbstractImagePrototype.create(chatResources.chat())); // dialog.getItem(0).getFocusSupport().setIgnore(true); initEmite(); @@ -463,7 +462,6 @@ } private void setSize(final Widget widget, final HtmlConfig htmlConfig) { - if (htmlConfig.width != null) { widget.setWidth("98%"); dialog.setWidth(htmlConfig.width); @@ -483,6 +481,10 @@ Log.info("Show dialog: " + show); if (session.isLogged()) { createDialogIfNeeded(); + if (dialog.getAbsoluteTop() == 0 && dialog.getAbsoluteLeft() == 0) { + dialog.setPosition(((Widget) chatIcon.getValue(ParentWidget.PARENT_UI)).getAbsoluteLeft() + 20, + 20); + } if (show) { dialog.show(); dialog.setZIndex(0); Modified: trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerViewImpl.java 2012-05-02 12:50:59 UTC (rev 1863) +++ trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerViewImpl.java 2012-05-02 23:30:11 UTC (rev 1864) @@ -25,6 +25,7 @@ import com.google.gwt.event.shared.EventBus; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.InlineLabel; @@ -36,50 +37,63 @@ public class SpinerViewImpl extends PopupViewWithUiHandlers<UiHandlers> implements SpinerView { - interface SpinerViewImplUiBinder extends UiBinder<Widget, SpinerViewImpl> { - } + interface SpinerViewImplUiBinder extends UiBinder<Widget, SpinerViewImpl> { + } - private static SpinerViewImplUiBinder uiBinder = GWT.create(SpinerViewImplUiBinder.class); + private static SpinerViewImplUiBinder uiBinder = GWT.create(SpinerViewImplUiBinder.class); - @UiField - Image img; + @UiField + Image img; - @UiField - InlineLabel label; + @UiField + InlineLabel label; - @UiField - HorizontalPanel panel; - private final PopupPanel popup; - Widget widget; + @UiField + HorizontalPanel panel; + private final PopupPanel popup; + Widget widget; - @Inject - public SpinerViewImpl(final EventBus eventBus) { - super(eventBus); - widget = uiBinder.createAndBindUi(this); - popup = new PopupPanel(false, false); - popup.add(widget); - popup.setPopupPosition(190, 0); - popup.setStyleName("k-spiner-popup"); - popup.show(); - } + @Inject + public SpinerViewImpl(final EventBus eventBus) { + super(eventBus); + widget = uiBinder.createAndBindUi(this); + popup = new PopupPanel(false, false); + popup.add(widget); + // popup.setPopupPosition(190, 0); + popup.setStyleName("k-spiner-popup"); + show(""); + } - @Override - public Widget asWidget() { - return popup; - } + @Override + public Widget asWidget() { + return popup; + } - @Override - public void fade() { - popup.hide(); + @Override + public void fade() { + popup.hide(); + } + + protected void setCenterPositionAndShow() { + popup.setPopupPositionAndShow(new PopupPanel.PositionCallback() { + @Override + public void setPosition(final int offsetWidth, final int offsetHeight) { + final int x = (Window.getClientWidth() - (label != null ? label.getOffsetWidth() : 0)) / 2; + final int y = 0; + popup.setPopupPosition(x, y); + } + }); + } + + @Override + public void show(final String message) { + if (message == null || message.isEmpty()) { + label.setText(""); + } else { + label.setText(message); } + setCenterPositionAndShow(); + // popup.show(); + } - @Override - public void show(final String message) { - if (message == null || message.isEmpty()) { - label.setText(""); - } else { - label.setText(message); - } - popup.show(); - } } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/MyGroupsMenu.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/MyGroupsMenu.java 2012-05-02 12:50:59 UTC (rev 1863) +++ trunk/src/main/java/cc/kune/core/client/sitebar/MyGroupsMenu.java 2012-05-02 23:30:11 UTC (rev 1864) @@ -64,7 +64,8 @@ this.siteOptions = siteOptions; menuShowAction.setMenu(this); setId(MENU_ID); - setParent(SitebarActions.RIGHT_TOOLBAR); + setParent(SitebarActions.LEFT_TOOLBAR); + setPosition(0); setStyles("k-no-backimage, k-btn-sitebar"); this.downloadProvider = downloadProvider; this.gotoGroupAction = gotoGroupAction; Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2012-05-02 12:50:59 UTC (rev 1863) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2012-05-02 23:30:11 UTC (rev 1864) @@ -27,8 +27,6 @@ import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuSeparatorDescriptor; -import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; -import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; import cc.kune.common.client.resources.CommonResources; import cc.kune.common.client.ui.KuneWindowUtils; import cc.kune.common.shared.i18n.I18nTranslationService; @@ -160,7 +158,6 @@ signInLink.get(); myGroupsMenu.get(); newGroupLink.get(); - new ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); createGotoKune(); MenuItemDescriptor.build(MORE_MENU, bugsAction); MenuItemDescriptor.build(MORE_MENU, errorAction); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2012-05-02 12:50:59 UTC (rev 1863) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2012-05-02 23:30:11 UTC (rev 1864) @@ -22,6 +22,8 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; +import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.events.MyGroupsChangedEvent; import cc.kune.core.client.events.UserSignInOrSignOutEvent; @@ -66,6 +68,8 @@ this.session = session; withId(NEW_GROUP_BTN_ID).withStyles("k-no-backimage, k-btn-sitebar, k-fl, k-noborder, k-nobackcolor"); withParent(SitebarActions.RIGHT_TOOLBAR); + final ToolbarSeparatorDescriptor separator = new ToolbarSeparatorDescriptor(Type.separator, + SitebarActions.RIGHT_TOOLBAR); eventBus.addHandler(MyGroupsChangedEvent.getType(), new MyGroupsChangedEvent.MyGroupsChangedHandler() { @Override @@ -78,6 +82,7 @@ public void onUserSignInOrSignOut(final UserSignInOrSignOutEvent event) { final boolean notLogged = !event.isLogged(); recalculate(notLogged); + separator.setVisible(notLogged); } }); Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2012-05-02 12:50:59 UTC (rev 1863) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2012-05-02 23:30:11 UTC (rev 1864) @@ -317,7 +317,6 @@ } .k-space-sel { - margin-right: 10px; background-color: #F2F2F2; } Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java 2012-05-02 12:50:59 UTC (rev 1863) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java 2012-05-02 23:30:11 UTC (rev 1864) @@ -169,6 +169,7 @@ getDefSNVisibility(isClosed)); final String title = i18n.t("About [%s]", group.getLongName()); initGroup(user, group, serverToolRegistry.getToolsRegisEnabledForGroups(), title, publicDescrip); + snCache.expire(user.getUserGroup()); return group; } else { throw new UserMustBeLoggedException(); Modified: trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmor.css 2012-05-02 12:50:59 UTC (rev 1863) +++ trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmor.css 2012-05-02 23:30:11 UTC (rev 1864) @@ -10,6 +10,7 @@ } .k-spaces { + } .k-group-space { @@ -20,7 +21,7 @@ } .k-space { - + } .floatRight { @@ -34,7 +35,12 @@ } .entityCentralContainer { - + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } .entityHeader { @@ -123,7 +129,7 @@ } .docEditorMargin { - + } .docEditor { @@ -187,10 +193,11 @@ } .entityToolsNorth { - + } .entityToolsNorth span { + } .entityToolsCenter { @@ -224,9 +231,7 @@ border-width: 7px; height: 0; width: 0; - position: relative; - bottom: 1px; - left: 36px; + margin-left: 13px; } .k-tool-item-selected-arrow { Modified: trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmorTheme.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmorTheme.css 2012-05-02 12:50:59 UTC (rev 1863) +++ trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmorTheme.css 2012-05-02 23:30:11 UTC (rev 1864) @@ -104,7 +104,10 @@ } .entityCentralContainer { - border-left: 2px solid bc1; + border-top: 1px solid bc1; + border-right: 1px solid bc2; + border-bottom: 1px solid bc2; + border-left: 2px solid bc2; } .entityHeader { @@ -134,6 +137,7 @@ .docSubheader { background-color: bc8; + border-top: 1px solid #FFF; } .docSubheader span {

1 0

[kune issues] #266: Events (in document) delete menu option
by kune issues 02 May '12

02 May '12

#266: Events (in document) delete menu option --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: minor | Milestone: Component: Group space | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ And then remove this: #kune.events.11.794 -- Ticket URL: <http://kune.ourproject.org/issues/ticket/266> kune issues <http://kune.ourproject.org/issues/>

1 0

r1863 - in trunk/src/main: java/cc/kune/core/public java/cc/kune/gspace/client/armor java/cc/kune/gspace/client/armor/resources java/cc/kune/gspace/client/viewers webapp/others/splash/style
by Vicente J. Ruiz Jurado 02 May '12

02 May '12

Author: vjrj_ Date: 2012-05-02 14:50:59 +0200 (Wed, 02 May 2012) New Revision: 1863 Removed: trunk/src/main/java/cc/kune/gspace/client/armor/impl/ Modified: trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/gspace/client/armor/GSpaceArmorDefault.java trunk/src/main/java/cc/kune/gspace/client/armor/GSpaceArmorDefault.ui.xml trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmor.css trunk/src/main/java/cc/kune/gspace/client/viewers/ToolbarStyles.java trunk/src/main/webapp/others/splash/style/main.css Log: CLOSED - # 263: Improve style of Breadcrumb http://kune.ourproject.org/issues/ticket/263 CLOSED - # 264: Document header reorganization http://kune.ourproject.org/issues/ticket/264 Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2012-05-02 11:16:45 UTC (rev 1862) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2012-05-02 12:50:59 UTC (rev 1863) @@ -1004,6 +1004,14 @@ opacity: 0.50 !important; } +button.k-button-right, button.k-button-right, button.k-button-alone { + kfilter: alpha(opacity = + 100) !important; + -moz-opacity: 1 !important; + -khtml-opacity: 1 !important; + opacity: 1 !important; +} + button.k-optionsborder img.k-iconlabel-left { border: 1px solid #ACACAC; -webkit-border-radius: 3px; Modified: trunk/src/main/java/cc/kune/gspace/client/armor/GSpaceArmorDefault.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/armor/GSpaceArmorDefault.java 2012-05-02 11:16:45 UTC (rev 1862) +++ trunk/src/main/java/cc/kune/gspace/client/armor/GSpaceArmorDefault.java 2012-05-02 12:50:59 UTC (rev 1863) @@ -38,7 +38,6 @@ import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.SplitLayoutPanel; import com.google.gwt.user.client.ui.TabLayoutPanel; -import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; import com.google.inject.Provider; @@ -54,7 +53,7 @@ private static GSpaceArmorDefaultUiBinder uiBinder = GWT.create(GSpaceArmorDefaultUiBinder.class); @UiField - VerticalPanel centerNorth; + FlowPanel centerNorth; @UiField GSpaceCenterPanel centerPanel; @UiField Modified: trunk/src/main/java/cc/kune/gspace/client/armor/GSpaceArmorDefault.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/armor/GSpaceArmorDefault.ui.xml 2012-05-02 11:16:45 UTC (rev 1862) +++ trunk/src/main/java/cc/kune/gspace/client/armor/GSpaceArmorDefault.ui.xml 2012-05-02 12:50:59 UTC (rev 1863) @@ -42,22 +42,18 @@ <g:center size="1.0"> <g:DockLayoutPanel unit="PX" ui:field="splitCenter" styleName="{res.style.entityCentralContainer}"> - <g:north size="153"> - <g:VerticalPanel width="100%" - ui:field="centerNorth" height="153px"> + <g:north size="135"> + <g:FlowPanel width="100%" ui:field="centerNorth" + height="135px"> <g:FlowPanel height="70px" width="100%" styleName="{res.style.entityHeader}" ui:field="entityHeader">  </g:FlowPanel> - <g:FlowPanel width="100%" height="38px" - styleName="{res.style.docHeader}" ui:field="docHeader"> - </g:FlowPanel> - <g:HTMLPanel ui:field="arrow" - styleName="{res.style.docSubheaderArrow}"/> - <g:FlowPanel width="100%" height="45px" - styleName="{res.style.docSubheader}" ui:field="docSubheader"> - </g:FlowPanel> - </g:VerticalPanel> + <g:FlowPanel width="100%" height="30px" + styleName="{res.style.docSubheader}" ui:field="docSubheader"/> + <g:FlowPanel width="100%" height="35px" + styleName="{res.style.docHeader}" ui:field="docHeader"/> + </g:FlowPanel> </g:north> <g:center> <g:DockLayoutPanel unit="PX" @@ -68,6 +64,10 @@ <g:east size="10"> <g:SimplePanel/> </g:east> + <g:north size="10"> + <g:HTMLPanel ui:field="arrow" + styleName="{res.style.docSubheaderArrow}"/> + </g:north> <g:center> <kg:GSpaceCenterPanel ui:field="centerPanel"/> Modified: trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmor.css 2012-05-02 11:16:45 UTC (rev 1862) +++ trunk/src/main/java/cc/kune/gspace/client/armor/resources/gSpaceArmor.css 2012-05-02 12:50:59 UTC (rev 1863) @@ -69,8 +69,8 @@ .docHeaderArrow { position: relative; - z-index: 10; - top: -25px; + z-index: 1000; + top: -20px; left: 10px; } @@ -79,7 +79,7 @@ font-weight: bold; margin-left: 15px; font: 'UbuntuBold', Arial; - line-height: 36px; + line-height: 32px; } .docHeader input { @@ -89,14 +89,14 @@ .docHeader img { float: left; - margin: 10px -10px 0 10px; + margin: 8px -10px 0 10px; } .docSubheader { overflow: hidden; border-collapse: separate; - margin: -14px 0 0; - padding: 10px 0 0; + margin: -5px 0 0; + padding: 5px 0 0; } .docSubheader button.k-fr { @@ -224,8 +224,8 @@ border-width: 7px; height: 0; width: 0; - position: relative; - bottom: 0px; + position: relative; + bottom: 1px; left: 36px; } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/ToolbarStyles.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/ToolbarStyles.java 2012-05-02 11:16:45 UTC (rev 1862) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/ToolbarStyles.java 2012-05-02 12:50:59 UTC (rev 1863) @@ -20,7 +20,7 @@ package cc.kune.gspace.client.viewers; public class ToolbarStyles { - public static final String CSSBTN = "k-button, k-fl"; + public static final String CSSBTN = "k-button, k-button-alone, k-fl"; public static final String CSSBTNC = "k-button, k-button-center, k-fl"; public static final String CSSBTNL = "k-button, k-button-left, k-fl"; public static final String CSSBTNR = "k-button, k-button-right, k-fl"; Modified: trunk/src/main/webapp/others/splash/style/main.css =================================================================== --- trunk/src/main/webapp/others/splash/style/main.css 2012-05-02 11:16:45 UTC (rev 1862) +++ trunk/src/main/webapp/others/splash/style/main.css 2012-05-02 12:50:59 UTC (rev 1863) @@ -29,7 +29,7 @@ background-color: #ffffff; color: #000000; line-height: 1.4; - font-family: Helvetica, Arial, sans-serif; + /* font-family: Helvetica, Arial, sans-serif; */ font-size: 12px; } @@ -52,7 +52,7 @@ input, select, table, textarea { font-size: 100%; - font-family: Arial, Helvetica, sans-serif; + /* font-family: Arial, Helvetica, sans-serif; */ } /* MAIN --------------------------------------------------------------------- */

1 0

[kune issues] #264: Document header reorganization
by kune issues 02 May '12

02 May '12

#264: Document header reorganization --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: minor | Milestone: Component: User space | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ -- Ticket URL: <http://kune.ourproject.org/issues/ticket/264> kune issues <http://kune.ourproject.org/issues/>

1 1

r1862 - in trunk/src/main/java/cc/kune: common/client/actions/gwtui common/client/actions/ui/descrip common/client/ui core/public gspace/client/viewers
by Vicente J. Ruiz Jurado 02 May '12

02 May '12

Author: vjrj_ Date: 2012-05-02 13:16:45 +0200 (Wed, 02 May 2012) New Revision: 1862 Added: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtLabelGui.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/LabelDescriptor.java Removed: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/ImageLabelDescriptor.java Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtComplexToolbar.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtGuiProvider.java trunk/src/main/java/cc/kune/common/client/ui/FlowToolbar.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java Log: CLOSED - # 263: Improve style of Breadcrumb http://kune.ourproject.org/issues/ticket/263 Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtComplexToolbar.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtComplexToolbar.java 2012-05-01 13:48:27 UTC (rev 1861) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtComplexToolbar.java 2012-05-02 11:16:45 UTC (rev 1862) @@ -29,80 +29,80 @@ public class GwtComplexToolbar extends Composite implements IsWidget { - private enum FlowDir { - left, right - } - private FlowDir currentFlow; - private final FlowToolbar toolbar; + private enum FlowDir { + left, right + } + private FlowDir currentFlow; + private final FlowToolbar toolbar; - public GwtComplexToolbar() { - toolbar = new FlowToolbar(); - currentFlow = FlowDir.left; - initWidget(toolbar); - } + public GwtComplexToolbar() { + toolbar = new FlowToolbar(); + currentFlow = FlowDir.left; + initWidget(toolbar); + } - protected void add(final AbstractGuiItem item) { - item.addStyleName(getFlow()); - toolbar.add(item); - } + protected void add(final AbstractGuiItem item) { + item.addStyleName(getFlow()); + toolbar.add(item); + } - public void add(final UIObject uiObject) { - uiObject.addStyleName(getFlow()); - toolbar.add((Widget) uiObject); - } + public void add(final UIObject uiObject) { + uiObject.addStyleName(getFlow()); + toolbar.add((Widget) uiObject); + } - public Widget addFill() { - currentFlow = FlowDir.right; - return toolbar.addFill(); - } + public Widget addFill() { + currentFlow = FlowDir.right; + return toolbar.addFill(); + } - public Widget addSeparator() { - return toolbar.addSeparator(); - } + public Widget addSeparator() { + return toolbar.addSeparator(); + } - public Widget addSpacer() { - return toolbar.addSpacer(); - } + public Widget addSpacer() { + return toolbar.addSpacer(); + } - private String getFlow() { - switch (currentFlow) { - case left: - return "oc-floatleft"; - case right: - default: - return "oc-floatright"; - } + private String getFlow() { + switch (currentFlow) { + case left: + return "oc-floatleft"; + case right: + default: + return "oc-floatright"; } + } - protected void insert(final AbstractGuiItem item, final int position) { - item.addStyleName(getFlow()); - toolbar.insert(item, position); - } + protected void insert(final AbstractGuiItem item, final int position) { + item.addStyleName(getFlow()); + toolbar.insert(item, position); + } - public void insert(final UIObject uiObject, final int position) { - uiObject.addStyleName(getFlow()); - toolbar.insert((Widget) uiObject, position); - } + public void insert(final UIObject uiObject, final int position) { + uiObject.addStyleName(getFlow()); + toolbar.insert((Widget) uiObject, position); + } - /** - * Set the blank style - */ - public void setCleanStyle() { - toolbar.setBlankStyle(); - } + /** + * Set the blank style + */ + public void setCleanStyle() { + toolbar.setBlankStyle(); + } - /** - * Set the normal grey style - */ - public void setNormalStyle() { - toolbar.setNormalStyle(); - } + /** + * Set the normal grey style + */ + public void setNormalStyle() { + toolbar.setNormalStyle(); + } - /** - * Set the blank style - */ - public void setTranspStyle() { - toolbar.setTranspStyle(); - } + /** + * Set the blank style + */ + public void setTranspStyle() { + toolbar.setTranspStyle(); + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtGuiProvider.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtGuiProvider.java 2012-05-01 13:48:27 UTC (rev 1861) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtGuiProvider.java 2012-05-02 11:16:45 UTC (rev 1862) @@ -22,6 +22,7 @@ import cc.kune.common.client.actions.ui.GuiProvider; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.IconLabelDescriptor; +import cc.kune.common.client.actions.ui.descrip.LabelDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuCheckItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; @@ -38,26 +39,29 @@ public class GwtGuiProvider { - @Inject - public GwtGuiProvider(final GuiProvider guiProvider, final Provider<GwtSubMenuGui> gwtSubMenuGui, - final Provider<GwtMenuGui> gwtMenuGui, final Provider<GwtMenuItemGui> gwtMenuItemGui, - final Provider<GwtMenuSeparatorGui> gwtMenuSeparatorGui, final Provider<GwtPushButtonGui> gwtPushButtonGui, - final Provider<GwtButtonGui> gwtButtonGui, final Provider<GwtIconLabelGui> gwtIconLabelGui, - final Provider<GwtToolbarGui> gwtToolbarGui, final Provider<GwtToolbarSeparatorGui> gwtToolbarSeparatorGui, - final Provider<GwtMenuTitleItemGui> gwtMenuTitleItemGui) { + @Inject + public GwtGuiProvider(final GuiProvider guiProvider, final Provider<GwtSubMenuGui> gwtSubMenuGui, + final Provider<GwtMenuGui> gwtMenuGui, final Provider<GwtMenuItemGui> gwtMenuItemGui, + final Provider<GwtMenuSeparatorGui> gwtMenuSeparatorGui, + final Provider<GwtPushButtonGui> gwtPushButtonGui, final Provider<GwtButtonGui> gwtButtonGui, + final Provider<GwtLabelGui> gwtLabelGui, final Provider<GwtIconLabelGui> gwtIconLabelGui, + final Provider<GwtToolbarGui> gwtToolbarGui, + final Provider<GwtToolbarSeparatorGui> gwtToolbarSeparatorGui, + final Provider<GwtMenuTitleItemGui> gwtMenuTitleItemGui) { - guiProvider.register(SubMenuDescriptor.class, gwtSubMenuGui); - guiProvider.register(MenuDescriptor.class, gwtMenuGui); - guiProvider.register(MenuRadioItemDescriptor.class, gwtMenuItemGui); - guiProvider.register(MenuCheckItemDescriptor.class, gwtMenuItemGui); - guiProvider.register(MenuTitleItemDescriptor.class, gwtMenuTitleItemGui); - guiProvider.register(MenuItemDescriptor.class, gwtMenuItemGui); - guiProvider.register(MenuSeparatorDescriptor.class, gwtMenuSeparatorGui); - guiProvider.register(PushButtonDescriptor.class, gwtPushButtonGui); - guiProvider.register(ButtonDescriptor.class, gwtButtonGui); - guiProvider.register(IconLabelDescriptor.class, gwtIconLabelGui); - guiProvider.register(ToolbarDescriptor.class, gwtToolbarGui); - guiProvider.register(ToolbarSeparatorDescriptor.class, gwtToolbarSeparatorGui); - } + guiProvider.register(SubMenuDescriptor.class, gwtSubMenuGui); + guiProvider.register(MenuDescriptor.class, gwtMenuGui); + guiProvider.register(MenuRadioItemDescriptor.class, gwtMenuItemGui); + guiProvider.register(MenuCheckItemDescriptor.class, gwtMenuItemGui); + guiProvider.register(MenuTitleItemDescriptor.class, gwtMenuTitleItemGui); + guiProvider.register(MenuItemDescriptor.class, gwtMenuItemGui); + guiProvider.register(MenuSeparatorDescriptor.class, gwtMenuSeparatorGui); + guiProvider.register(PushButtonDescriptor.class, gwtPushButtonGui); + guiProvider.register(ButtonDescriptor.class, gwtButtonGui); + guiProvider.register(IconLabelDescriptor.class, gwtIconLabelGui); + guiProvider.register(LabelDescriptor.class, gwtLabelGui); + guiProvider.register(ToolbarDescriptor.class, gwtToolbarGui); + guiProvider.register(ToolbarSeparatorDescriptor.class, gwtToolbarSeparatorGui); + } } Added: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtLabelGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtLabelGui.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtLabelGui.java 2012-05-02 11:16:45 UTC (rev 1862) @@ -0,0 +1,82 @@ +/* + * + * Copyright (C) 2007-2011 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 cc.kune.common.client.actions.gwtui; + +import cc.kune.common.client.actions.ui.AbstractGuiItem; +import cc.kune.common.client.actions.ui.ParentWidget; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; + +import com.google.gwt.user.client.ui.Label; + +public class GwtLabelGui extends AbstractGuiItem { + private Label label; + + @Override + protected void addStyle(final String style) { + label.addStyleName(style); + } + + @Override + protected void clearStyles() { + label.setStyleName("k-none"); + } + + @Override + public AbstractGuiItem create(final GuiActionDescrip descriptor) { + super.descriptor = descriptor; + label = new Label(""); + descriptor.putValue(ParentWidget.PARENT_UI, this); + final String id = descriptor.getId(); + if (id != null) { + label.ensureDebugId(id); + } + initWidget(label); + configureItemFromProperties(); + return this; + } + + @Override + public void setEnabled(final boolean enabled) { + super.setVisible(enabled); + } + + @Override + protected void setIconBackground(final String backgroundColor) { + } + + @Override + protected void setIconStyle(final String style) { + } + + @Override + public void setIconUrl(final String url) { + } + + @Override + public void setText(final String text) { + label.setText(text, descriptor.getDirection()); + } + + @Override + public boolean shouldBeAdded() { + return true; + } + +} \ No newline at end of file Deleted: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/ImageLabelDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/ImageLabelDescriptor.java 2012-05-01 13:48:27 UTC (rev 1861) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/ImageLabelDescriptor.java 2012-05-02 11:16:45 UTC (rev 1862) @@ -1,58 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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 cc.kune.common.client.actions.ui.descrip; - -import cc.kune.common.client.actions.AbstractAction; -import cc.kune.common.client.actions.BaseAction; - -import com.google.gwt.resources.client.ImageResource; - -public class ImageLabelDescriptor extends AbstractGuiActionDescrip { - - public ImageLabelDescriptor(final AbstractAction action) { - super(action); - } - - public ImageLabelDescriptor(final String text) { - this(new BaseAction(text, null)); - } - - public ImageLabelDescriptor(final String text, final ImageResource icon) { - this(new BaseAction(text, null, icon)); - } - - public ImageLabelDescriptor(final String text, final String tooltip) { - this(new BaseAction(text, tooltip)); - } - - public ImageLabelDescriptor(final String text, final String tooltip, final ImageResource icon) { - this(new BaseAction(text, tooltip, icon)); - } - - public ImageLabelDescriptor(final String text, final String tooltip, final String icon) { - this(new BaseAction(text, tooltip, icon)); - } - - @Override - public Class<?> getType() { - return ImageLabelDescriptor.class; - } - -} \ No newline at end of file Added: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/LabelDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/LabelDescriptor.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/LabelDescriptor.java 2012-05-02 11:16:45 UTC (rev 1862) @@ -0,0 +1,43 @@ +/* + * + * Copyright (C) 2007-2011 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 cc.kune.common.client.actions.ui.descrip; + +import cc.kune.common.client.actions.BaseAction; + +public class LabelDescriptor extends AbstractGuiActionDescrip { + + public LabelDescriptor() { + super(new BaseAction("", null)); + } + + public LabelDescriptor(final String text) { + super(new BaseAction(text, null)); + } + + public LabelDescriptor(final String text, final String tooltip) { + super(new BaseAction(text, tooltip)); + } + + @Override + public Class<?> getType() { + return LabelDescriptor.class; + } + +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/client/ui/FlowToolbar.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/FlowToolbar.java 2012-05-01 13:48:27 UTC (rev 1861) +++ trunk/src/main/java/cc/kune/common/client/ui/FlowToolbar.java 2012-05-02 11:16:45 UTC (rev 1862) @@ -29,129 +29,129 @@ public class FlowToolbar extends Composite implements AbstractToolbar, ForIsWidget { - private final FlowPanel childPanel; + private final FlowPanel childPanel; - public FlowToolbar() { - super(); - childPanel = new FlowPanel(); - initWidget(childPanel); - } + public FlowToolbar() { + super(); + childPanel = new FlowPanel(); + initWidget(childPanel); + } - @Override - public void add(final Widget widget) { - childPanel.add(widget); - } + @Override + public void add(final Widget widget) { + childPanel.add(widget); + } - @Override - public void add(final Widget widget, final VerticalAlignmentConstant valign) { - childPanel.add(widget); - } + @Override + public void add(final Widget widget, final VerticalAlignmentConstant valign) { + childPanel.add(widget); + } - @Override - public Widget addFill() { - final Label emptyLabel = new Label(""); - emptyLabel.addStyleName("oc-floatright"); - // emptyLabel.setWidth("100%"); - this.add(emptyLabel); - return emptyLabel; - } + @Override + public Widget addFill() { + final Label emptyLabel = new Label(""); + emptyLabel.addStyleName("oc-floatright"); + // emptyLabel.setWidth("100%"); + this.add(emptyLabel); + return emptyLabel; + } - @Override - public Widget addSeparator() { - final Label emptyLabel = new Label(""); - emptyLabel.setStyleName("k-tb-sep"); - emptyLabel.addStyleName("oc-tb-sep"); - emptyLabel.addStyleName("oc-floatleft"); - this.add(emptyLabel); - return emptyLabel; - } + @Override + public Widget addSeparator() { + final Label emptyLabel = new Label(""); + emptyLabel.setStyleName("k-tb-sep"); + emptyLabel.addStyleName("oc-tb-sep"); + emptyLabel.addStyleName("oc-floatleft"); + this.add(emptyLabel); + return emptyLabel; + } - @Override - public Widget addSpacer() { - final Label emptyLabel = new Label(""); - emptyLabel.setStyleName("oc-tb-spacer"); - emptyLabel.addStyleName("oc-floatleft"); - this.add(emptyLabel); - return emptyLabel; - } + @Override + public Widget addSpacer() { + final Label emptyLabel = new Label(""); + emptyLabel.setStyleName("oc-tb-spacer"); + emptyLabel.addStyleName("oc-floatleft"); + this.add(emptyLabel); + return emptyLabel; + } - public void clear() { - childPanel.clear(); - } + public void clear() { + childPanel.clear(); + } - @Override - public Widget getWidget(final int index) { - return childPanel.getWidget(index); - } + @Override + public Widget getWidget(final int index) { + return childPanel.getWidget(index); + } - @Override - public int getWidgetCount() { - return childPanel.getWidgetCount(); - } + @Override + public int getWidgetCount() { + return childPanel.getWidgetCount(); + } - @Override - public int getWidgetIndex(final IsWidget child) { - return childPanel.getWidgetIndex(child); - } + @Override + public int getWidgetIndex(final IsWidget child) { + return childPanel.getWidgetIndex(child); + } - @Override - public int getWidgetIndex(final Widget child) { - return childPanel.getWidgetIndex(child); - } + @Override + public int getWidgetIndex(final Widget child) { + return childPanel.getWidgetIndex(child); + } - @Override - public void insert(final Widget widget, final int position) { - childPanel.insert(widget, position); - } + @Override + public void insert(final Widget widget, final int position) { + childPanel.insert(widget, position); + } - @Override - public boolean remove(final int index) { - return childPanel.remove(index); - } + @Override + public boolean remove(final int index) { + return childPanel.remove(index); + } - @Override - public boolean remove(final Widget widget) { - return childPanel.remove(widget); - } + @Override + public boolean remove(final Widget widget) { + return childPanel.remove(widget); + } - @Override - public void removeAll() { - childPanel.clear(); - } + @Override + public void removeAll() { + childPanel.clear(); + } - private void setBasicStyle() { - setStyleName("x-toolbar-FIXME"); - addStyleName("x-panel-FIXME"); - } + private void setBasicStyle() { + setStyleName("x-toolbar-FIXME"); + addStyleName("x-panel-FIXME"); + } - /** - * Set the blank style - */ - @Override - public void setBlankStyle() { - setBasicStyle(); - addStyleName("oc-blank-toolbar"); - } + /** + * Set the blank style + */ + @Override + public void setBlankStyle() { + setBasicStyle(); + addStyleName("oc-blank-toolbar"); + } - @Override - public void setHeight(final String height) { - childPanel.setHeight(height); - } + @Override + public void setHeight(final String height) { + childPanel.setHeight(height); + } - /** - * Set the normal grey style - */ - @Override - public void setNormalStyle() { - setBasicStyle(); - addStyleName("oc-tb-bottom-line"); - } + /** + * Set the normal grey style + */ + @Override + public void setNormalStyle() { + setBasicStyle(); + addStyleName("oc-tb-bottom-line"); + } - /** - * Set the transparent style - */ - public void setTranspStyle() { - setBasicStyle(); - addStyleName("oc-transp"); - } + /** + * Set the transparent style + */ + public void setTranspStyle() { + setBasicStyle(); + addStyleName("oc-transp"); + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2012-05-01 13:48:27 UTC (rev 1861) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2012-05-02 11:16:45 UTC (rev 1862) @@ -1,5 +1,5 @@ -GCHARSET "UTF-8 "; - body { +GCHARSET "UTF-8 + "; body { background-color: transparent; color: black; font-family: "Ubuntu Beta", UbuntuBeta, Ubuntu, "Bitstream Vera Sans", @@ -932,6 +932,28 @@ margin-right: 0px !important; } +/* Derived from: from http://jonrohan.me/guide/css/creating-triangles-in-css/ */ +.k-button-arrow { + border-color: transparent transparent transparent #DDDDDD; + border-style: solid; + border-width: 5px; + bottom: -7px; + float: left; + height: 0; + left: -1px; + margin-right: -10px; + position: relative; + width: 0; +} + +/* IE6 */ +.k-button-arrow { + _border-top-color: pink; + _border-bottom-color: pink; + _border-right-color: pink; + _filter: literal("chroma(color=pink)"); +} + .k-button-right { border-left: 1px solid #CCCCCC !important; -webkit-border-top-left-radius: 0px !important; @@ -975,8 +997,8 @@ color: gray !important; border-color: #CCCCCC !important; background: inherits !important; - kfilter: alpha(opacity = - 50) !important; + kfilter: alpha(opacity = + 50) !important; -moz-opacity: 0.50 !important; -khtml-opacity: 0.50 !important; opacity: 0.50 !important; @@ -1268,8 +1290,8 @@ -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomleft: 5px; border-bottom-left-radius: 5px; - kfilter: alpha(opacity = - 90); + kfilter: alpha(opacity = + 90); -moz-opacity: 0.90; -khtml-opacity: 0.90; opacity: 0.90; @@ -1620,4 +1642,4 @@ padding: 10px; font-style: italic; color: #A05A2C; -} +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java 2012-05-01 13:48:27 UTC (rev 1861) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java 2012-05-02 11:16:45 UTC (rev 1862) @@ -21,6 +21,7 @@ import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.common.client.actions.ui.descrip.LabelDescriptor; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.common.shared.utils.TextUtils; import cc.kune.core.client.dnd.FolderContainerDropController; @@ -76,14 +77,18 @@ // for (int i = pathLength - 1; i >= 0; i--) { for (int i = 0; i < pathLength; i++) { final ButtonDescriptor btn = createPathButton(path[i], pathLength, i); + final boolean isNotTheLast = i != pathLength - 1; if (withDrop) { - if (i != pathLength - 1) { + if (isNotTheLast) { final FolderContainerDropController dropTarget = dropController.get(); dropTarget.setTarget(path[i].getStateToken()); btn.setDropTarget(dropTarget); } } actions.add(btn); + if (isNotTheLast) { + actions.add(new LabelDescriptor().withStyles("k-button-arrow")); + } } } return actions;

1 0