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> - <!-- http://stackoverflow.com/questions/882338/hibernate-preinsertevent-getsource... --> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - </exclusion> - </exclusions> - </dependency> + <!-- <dependency> --> + <!-- <groupId>org.hibernate</groupId> --> + <!-- <artifactId>hibernate-annotations</artifactId> --> + <!-- <version>3.5.6-Final</version> --> + <!-- </dependency> --> + <!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-commons-annotations</artifactId> + <version>3.3.0.ga</version> --> + <!-- http://stackoverflow.com/questions/882338/hibernate-preinsertevent-getsource... --> + <!-- <exclusions> <exclusion> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> + </exclusion> </exclusions> </dependency> --> <!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> --> - <!-- <version>3.3.1.GA</version> </dependency> --> + <!-- <version>4.1.1.Final</version> </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-defi... @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"/> <!-- change to "ram" later --> <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", "[email protected]", "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", "[email protected]", "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", "[email protected]", "diggest".getBytes(), "salt".getBytes(), english, gb, getTimeZone());