JC-1373 Implementation

.gitignore

@@ -17,10 +17,9 @@
 *.ipr
 *.iws
 *.war
-*.jar
 
 #log files
-*.log
+*.log*
 
 # Netbeans project files
 nbproject
@@ -29,12 +28,8 @@ nbproject
 target
 logs
 
-/jcommune-view/jcommune-web-controller/test-output
-/jcommune-model/test-output
-/jcommune-service/test-output
-/jcommune-view/jcommune-web-view/test-output
-/jcommune-view/jcommune-web-controller/bin
-/jcommune-view/jcommune-web-view/bin
+test-output
+bin
 /jcommune-view/jcommune-web-view/src/main/webapp/resources/wro
-/jcommune-service/bin
-/jcommune-model/bin
+dependency-reduced-pom.xml
+pom.xml.versionsBackup

README.md

@@ -4,19 +4,19 @@ JCommune is a part of [JTalks](http://jtalks.org) ecosystem of projects which re
 
 * [Installation Guide](docs/installation/general-installation-guide.md) is to be read if you want just to try the app or you want to install it locally
 * You can find live production instance: [JavaTalks Forum](http://javatalks.ru)
+* If you want to install plugins, read [plugins page](jcommune-plugins/README.md)
 
 For developers/QA/PMs/Leads:
 * [How to join us](docs/how-to-join-us.md)
 * [Sonar](http://sonar.jtalks.org/dashboard/index/1)
-* [Deployment Pipeline](http://ci.jtalks.org/view/JCommune.%20Pipeline)
+* [Deployment Pipeline](http://ci.jtalks.org/view/JC.%20Pipeline/)
 * [Stack of Technologies](http://wiki.jtalks.org/display/jtalks/Stack+of+technologies)
 * [Commit Conventions](docs/commit-conventions.md)
 * [Code Conventions](http://wiki.jtalks.org/display/jtalks/Code+Conventions)
 
 ####State of Project
 
 - Questions'n'Answers plugins is under development
-- Plugin API to be worked on soon
 - First the project was connected to Poulpe a lot - everything was administrated via admin panel. Now we think that Poulpe
 should manage only Users and Groups and thus the project is in transition from "configuration in Poulpe" state to
 "configuration in JCommune itself" state.

docs/installation/general-installation-guide.md

@@ -23,3 +23,22 @@ So if you want to run the app locally (from binaries or sources), you need to in
  - Clone the project: `git@github.com:jtalks-org/jcommune.git`. Now you can work with that project from your IDE.
  - If you want to deploy it from command line.. Step into the folder and build it: `mvn clean package`
  - Repeat everything from _Installing from Binaries_ but instead of downloading war-file, just grab it from `jcommune/jcommune-view/jcommunew-web-view/target`
+
+####Advanced configuration of MySQL Server
+ - Make sure that you are using MySQL Server ver. 5.7.9 or higher. Edit the my.cnf file (my.ini on Windows operating systems) in your MySQL server. The configuration file may be located on one of the following paths (in priority order):
+    WINDOWS:
+        - %PROGRAMDATA%\MySQL\MySQL Server X.X\my.ini (my.cnf)
+        - %WINDIR%\my.ini (my.cnf)
+        - C:\my.ini (my.cnf)
+        - INSTALLDIR\my.ini (my.cnf)
+    Unix, Linux и OS X:
+        - /etc/my.cnf
+        - /etc/mysql/my.cnf
+        - SYSCONFDIR/my.cnf
+ - Locate the [mysqld] section in the file, and add or modify the following parameters:
+    [mysqld]
+        character-set-client-handshake = FALSE
+        character-set-server = utf8mb4
+        collation-server = utf8mb4_unicode_ci
+ - Without making this changes symbols from UTF8MB4 character set will be displayed like '??'.
+ - Restart your MySQL server for the changes to take effect.

docs/installation/jcommune.xml

@@ -13,16 +13,21 @@
   <!-- SMTP server that's used to send mails to the end user (e.g. during registration) -->
   <!-- Please, don't use these credentials if possible (and don't use it for bad things ;)), -->
   <!-- but if you want just to quickly try the app or you're a part of dev team, feel free to use these credentials -->
-  <Environment name="SMTP_HOST" value="smtp.mail.ru" type="java.lang.String"/>
+  <Environment name="SMTP_HOST" value="smtp.gmail.com" type="java.lang.String"/>
   <!--for smtp default port value is 25, for smtps - 465-->
   <Environment name="SMTP_PORT" value="465" type="java.lang.String"/>
-  <Environment name="MAIL_USERNAME" value="jtalks@inbox.ru" type="java.lang.String"/>
-  <Environment name="MAIL_PASSWORD" value="javatalks" type="java.lang.String"/>
-  <Environment name="SSL_ENABLED" value="true" type="java.lang.String" />
+  <Environment name="MAIL_USERNAME" value="example.smtp.jtalk@gmail.com" type="java.lang.String"/>
+  <Environment name="MAIL_PASSWORD" value="Jtalk111" type="java.lang.String"/>
+  <Environment name="SSL_ENABLED" value="true" type="java.lang.String"/>
   <!--This is where you need to put plugins jar files if you need to install any. -->
   <!--This property is used in jcommune-service\src\main\resources\org\jtalks\jcommune\service\applicationContext-service.xml -->
   <Environment name="JCOMMUNE_PLUGIN_FOLDER" value="~" type="java.lang.String"/>
 
+  <!--You will need this property for changing path to log4j configuration file. -->
+  <!--Example of log4j you can find in jcommune-view\jcommune-web-view\src\main\resources\log4j.xml -->
+  <!--that used by default.  -->
+  <!--<Environment name="JCOMMUNE_LOG4J_CONFIGURATION_FILE" value="/log4j.xml" type="java.lang.String"/> -->
+
   <!-- You'll need this configuration to be in $TOMCAT_HOME/conf only if you need to run Poulpe together with JCommune -->
   <!-- Note, that if you really need this, ehcache configuration should have the same port as Poulpe ehcache configuration. -->
   <!--Environment name="EH_CACHE_CONFIG" value="file:/home/tomcat/app/tomcat-uat/conf/jcommune.ehcache.xml" type="java.lang.String" /-->

docs/installation/linux/basic-environment.md

@@ -6,9 +6,10 @@ Java:
  - Add it to your PATH: `PATH=$JAVA_HOME/bin:$PATH`
 
 MySQL:
- - Install it: `sudo apt-get install mysql-server-5.5`
+ - Install it: `sudo apt-get install mysql-server-5.7`
  - Log into MySQL terminal, it may look like `mysql -uroot -proot`
- - Create database: `create database jtalks character set utf8`
+ - Create database: `create database jtalks character set utf8mb4`
+ - NB: some functionality (like posting extended unicode symbols e.g. smiles) is not going to work with default MySQL configuration, read details in the [Advanced configuration of MySQL Server](https://github.com/jtalks-org/jcommune/blob/master/docs/installation/general-installation-guide.md#advanced-configuration-of-mysql-server)
 
 Tomcat:
  - Download it: `wget http://apache.softded.ru/tomcat/tomcat-7/v7.0.35/bin/apache-tomcat-7.0.35.zip`

docs/installation/windows/basic-environment.md

@@ -7,7 +7,9 @@ Java:
 MySQL:
  - [Install latest version](http://dev.mysql.com/downloads/mysql)
  - Log into MySQL terminal, it may look like `mysql -uroot -proot`
- - Create database: `create database jtalks character set utf8`
+ - Create database: `create database jtalks character set utf8mb4`
+ - NB: some functionality (like posting extended unicode symbols e.g. smiles) is not going to work with default MySQL configuration, read details in the [Advanced configuration of MySQL Server](https://github.com/jtalks-org/jcommune/blob/master/docs/installation/general-installation-guide.md#advanced-configuration-of-mysql-server)
+
 
 Tomcat:
  - Download it: `wget http://apache.softded.ru/tomcat/tomcat-7/v7.0.35/bin/apache-tomcat-7.0.35.zip`

jcommune-model/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>jcommune</artifactId>
     <groupId>org.jtalks.jcommune</groupId>
-    <version>2.14-SNAPSHOT</version>
+    <version>3.13-SNAPSHOT</version>
   </parent>
   <artifactId>jcommune-model</artifactId>
   <name>${project.artifactId}</name>
@@ -22,10 +22,6 @@
       <groupId>org.jtalks.common</groupId>
       <artifactId>jtalks-common-service</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jtalks.common</groupId>
-      <artifactId>jtalks-common-security</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
@@ -129,10 +125,6 @@
       <groupId>net.sf.ehcache</groupId>
       <artifactId>ehcache-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache-jgroupsreplication</artifactId>
-    </dependency>
     <!--
         Used for cache monitoring. Has conflicts with used version of slf4j.
     -->
@@ -144,10 +136,18 @@
       <groupId>com.googlecode.flyway</groupId>
       <artifactId>flyway-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.googlecode.lambdaj</groupId>
       <artifactId>lambdaj</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.qala.datagen</groupId>
+      <artifactId>qala-datagen</artifactId>
+    </dependency>
   </dependencies>
 
   <properties>

jcommune-model/src/main/java/org/jtalks/jcommune/model/dao/GroupDao.java

@@ -15,13 +15,15 @@
 package org.jtalks.jcommune.model.dao;
 
 import org.jtalks.common.model.entity.Group;
+import org.jtalks.jcommune.model.dto.GroupAdministrationDto;
+import org.jtalks.jcommune.model.dto.PageRequest;
+import org.jtalks.jcommune.model.dto.UserDto;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * Data access object for manipulating groups
- * 
+ *
  * @author Mikhail Stryzhonok
  */
 public interface GroupDao extends org.jtalks.common.model.dao.GroupDao {
@@ -32,4 +34,38 @@ public interface GroupDao extends org.jtalks.common.model.dao.GroupDao {
      * @return the list of found groups
      */
     List<Group> getGroupsByIds(List<Long> ids);
+
+    /**
+     * Get the list of all groups.
+     *
+     * @return list of groups
+     */
+    List<Group> getAll();
+
+    /**
+     * Get the list of all groups which names contains the specified name.
+     *
+     * @param name group name
+     * @return list of groups
+     * @throws IllegalArgumentException if name is null
+     */
+    List<Group> getByNameContains(String name);
+
+    /**
+     * Get the list of all groups which name matches ignoring case the specified name.
+     *
+     * @param name group name
+     * @return list of groups
+     * @throws IllegalArgumentException if name is null
+     */
+    List<Group> getByName(String name);
+
+    /**
+     * @return list of GroupAdministrationDto
+     */
+    List<GroupAdministrationDto> getGroupNamesWithCountOfUsers();
+
+    List<UserDto> getGroupUsersPage(long id, PageRequest pageRequest);
+
+    int getGroupUserCount(long id);
 }

jcommune-model/src/main/java/org/jtalks/jcommune/model/dao/SpamRuleDao.java

@@ -0,0 +1,30 @@
+/**
+ * Copyright (C) 2011  JTalks.org Team
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * This library 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
+ * Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package org.jtalks.jcommune.model.dao;
+
+
+import org.jtalks.common.model.dao.Crud;
+import org.jtalks.jcommune.model.entity.SpamRule;
+
+import java.util.List;
+
+/**
+ * @author Oleg Tkachenko
+ */
+public interface SpamRuleDao extends Crud<SpamRule> {
+    List<SpamRule> getAllRules();
+    List<SpamRule> getEnabledRules();
+}

jcommune-model/src/main/java/org/jtalks/jcommune/model/dao/TopicDraftDao.java

@@ -0,0 +1,42 @@
+/**
+ * Copyright (C) 2011  JTalks.org Team
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * This library 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
+ * Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+package org.jtalks.jcommune.model.dao;
+
+import org.jtalks.common.model.dao.Crud;
+import org.jtalks.jcommune.model.dao.hibernate.TopicDraftHibernateDao;
+import org.jtalks.jcommune.model.entity.TopicDraft;
+import org.jtalks.jcommune.model.entity.JCUser;
+
+/**
+ * DAO for {@link TopicDraft} objects
+ *
+ * @author Dmitry S. Dolzhenko
+ * @see TopicDraftHibernateDao
+ */
+public interface TopicDraftDao extends Crud<TopicDraft> {
+    /**
+     * Get a draft topic of specified user
+     *
+     * @param user the user
+     * @return the draft topic or null
+     */
+    TopicDraft getForUser(JCUser user);
+
+    /**
+     * Delete the draft topic of specified user
+     * @param user the user
+     */
+    void deleteByUser(JCUser user);
+}

jcommune-model/src/main/java/org/jtalks/jcommune/model/dao/UserDao.java

@@ -14,7 +14,9 @@
  */
 package org.jtalks.jcommune.model.dao;
 
+import org.hibernate.ObjectNotFoundException;
 import org.jtalks.common.model.entity.User;
+import org.jtalks.jcommune.model.dto.UserDto;
 import org.jtalks.jcommune.model.entity.JCUser;
 
 import java.util.Collection;
@@ -97,4 +99,23 @@ public interface UserDao extends org.jtalks.common.model.dao.UserDao<JCUser> {
      * @return the list of found user names
      */
     List<String> getUsernames(String pattern, int count);
+
+    /**
+     * Gets list of users by part of username or email
+     *
+     * @param pattern part of username (case insensitive)
+     * @param count max count of users in result
+     * @return list of found users
+     */
+    List<JCUser> findByUsernameOrEmail(String pattern, int count);
+
+    /**
+     * May return a proxy (without hitting DB). If no row found the object is returned but it
+     * throws {@link ObjectNotFoundException} when properties are first accessed.
+     * @param id stored user identifier.
+     * @return proxy of JCUser object.
+     */
+    JCUser loadById(Long id);
+
+    List<UserDto> findByUsernameOrEmailNotInGroup(String pattern, long groupId, int count);
 }