Refactor the packages of sonar-core

* The root package should be org.sonar.core -> org.sonar.persistence is moved to org.sonar.core.persistence
* Classes are grouped by functional domain (resource, review, rule, ...)

plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ManualViolationInjector.java

@@ -28,9 +28,9 @@ import org.sonar.api.resources.Resource;
 import org.sonar.api.rules.RuleFinder;
 import org.sonar.api.rules.RulePriority;
 import org.sonar.api.rules.Violation;
-import org.sonar.persistence.review.ReviewDao;
-import org.sonar.persistence.review.ReviewDto;
-import org.sonar.persistence.review.ReviewQuery;
+import org.sonar.core.review.ReviewDao;
+import org.sonar.core.review.ReviewDto;
+import org.sonar.core.review.ReviewQuery;
 
 import java.util.List;
 

plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/ViolationSeverityUpdater.java

@@ -27,9 +27,9 @@ import org.sonar.api.resources.Resource;
 import org.sonar.api.resources.ResourceUtils;
 import org.sonar.api.rules.RulePriority;
 import org.sonar.api.rules.Violation;
-import org.sonar.persistence.review.ReviewDao;
-import org.sonar.persistence.review.ReviewDto;
-import org.sonar.persistence.review.ReviewQuery;
+import org.sonar.core.review.ReviewDao;
+import org.sonar.core.review.ReviewDto;
+import org.sonar.core.review.ReviewQuery;
 import org.sonar.plugins.core.timemachine.ViolationTrackingDecorator;
 
 import java.util.List;

plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ManualMeasureDecoratorTest.java

@@ -24,7 +24,7 @@ import org.sonar.api.batch.DecoratorContext;
 import org.sonar.api.measures.Metric;
 import org.sonar.api.resources.JavaFile;
 import org.sonar.api.test.IsMeasure;
-import org.sonar.core.components.DefaultMetricFinder;
+import org.sonar.core.metric.DefaultMetricFinder;
 import org.sonar.jpa.test.AbstractDbUnitTestCase;
 
 import static org.mockito.Matchers.argThat;

plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ManualViolationInjectorTest.java

@@ -30,9 +30,9 @@ import org.sonar.api.rules.RuleFinder;
 import org.sonar.api.rules.RulePriority;
 import org.sonar.api.rules.Violation;
 import org.sonar.api.utils.DateUtils;
-import org.sonar.persistence.review.ReviewDao;
-import org.sonar.persistence.review.ReviewDto;
-import org.sonar.persistence.review.ReviewQuery;
+import org.sonar.core.review.ReviewDao;
+import org.sonar.core.review.ReviewDto;
+import org.sonar.core.review.ReviewQuery;
 
 import java.util.Arrays;
 import java.util.Date;

plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ViolationSeverityUpdaterTest.java

@@ -30,9 +30,9 @@ import org.sonar.api.resources.Resource;
 import org.sonar.api.rules.Rule;
 import org.sonar.api.rules.RulePriority;
 import org.sonar.api.rules.Violation;
-import org.sonar.persistence.review.ReviewDao;
-import org.sonar.persistence.review.ReviewDto;
-import org.sonar.persistence.review.ReviewQuery;
+import org.sonar.core.review.ReviewDao;
+import org.sonar.core.review.ReviewDto;
+import org.sonar.core.review.ReviewQuery;
 
 import java.util.Arrays;
 

plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest.java

@@ -30,7 +30,7 @@ import org.sonar.api.rules.RulePriority;
 import org.sonar.api.rules.Violation;
 import org.sonar.api.utils.DateUtils;
 import org.sonar.batch.index.ResourcePersister;
-import org.sonar.core.components.DefaultRuleFinder;
+import org.sonar.core.rule.DefaultRuleFinder;
 import org.sonar.jpa.test.AbstractDbUnitTestCase;
 
 import java.util.Arrays;

plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarEngine.java

@@ -42,7 +42,7 @@ import org.sonar.duplications.java.JavaTokenProducer;
 import org.sonar.duplications.statement.Statement;
 import org.sonar.duplications.statement.StatementChunker;
 import org.sonar.duplications.token.TokenChunker;
-import org.sonar.persistence.duplication.DuplicationDao;
+import org.sonar.core.duplication.DuplicationDao;
 import org.sonar.plugins.cpd.index.DbDuplicationsIndex;
 import org.sonar.plugins.cpd.index.SonarDuplicationsIndex;
 

plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/index/DbDuplicationsIndex.java

@@ -30,8 +30,8 @@ import org.sonar.api.resources.Resource;
 import org.sonar.batch.index.ResourcePersister;
 import org.sonar.duplications.block.Block;
 import org.sonar.duplications.block.ByteArray;
-import org.sonar.persistence.duplication.DuplicationDao;
-import org.sonar.persistence.duplication.DuplicationUnitDto;
+import org.sonar.core.duplication.DuplicationDao;
+import org.sonar.core.duplication.DuplicationUnitDto;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchDatabase.java

@@ -20,7 +20,7 @@
 package org.sonar.batch.bootstrap;
 
 import org.sonar.api.config.Settings;
-import org.sonar.persistence.DefaultDatabase;
+import org.sonar.core.persistence.DefaultDatabase;
 
 import java.util.Properties;
 

sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchModule.java

@@ -29,10 +29,10 @@ import org.sonar.batch.ProjectConfigurator;
 import org.sonar.batch.ProjectTree;
 import org.sonar.batch.components.*;
 import org.sonar.batch.index.*;
-import org.sonar.core.components.CacheMetricFinder;
-import org.sonar.core.components.CacheRuleFinder;
-import org.sonar.core.components.DefaultUserFinder;
-import org.sonar.core.notifications.DefaultNotificationManager;
+import org.sonar.core.metric.CacheMetricFinder;
+import org.sonar.core.notification.DefaultNotificationManager;
+import org.sonar.core.rule.CacheRuleFinder;
+import org.sonar.core.user.DefaultUserFinder;
 import org.sonar.jpa.dao.MeasuresDao;
 
 /**

sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java

@@ -30,8 +30,8 @@ import org.sonar.batch.config.BatchSettingsEnhancer;
 import org.sonar.jpa.session.DatabaseSessionProvider;
 import org.sonar.jpa.session.DefaultDatabaseConnector;
 import org.sonar.jpa.session.ThreadLocalDatabaseSessionFactory;
-import org.sonar.persistence.DaoUtils;
-import org.sonar.persistence.MyBatis;
+import org.sonar.core.persistence.DaoUtils;
+import org.sonar.core.persistence.MyBatis;
 
 import java.net.URLClassLoader;
 

sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectModule.java

@@ -39,7 +39,7 @@ import org.sonar.batch.index.DefaultIndex;
 import org.sonar.batch.index.DefaultResourcePersister;
 import org.sonar.batch.phases.Phases;
 import org.sonar.batch.phases.PhasesTimeProfiler;
-import org.sonar.core.components.DefaultModelFinder;
+import org.sonar.core.qualitymodel.DefaultModelFinder;
 import org.sonar.jpa.dao.DaoFacade;
 import org.sonar.jpa.dao.ProfilesDao;
 import org.sonar.jpa.dao.RulesDao;

sonar-batch/src/main/java/org/sonar/batch/index/DefaultResourcePersister.java

@@ -27,7 +27,7 @@ import org.sonar.api.database.model.ResourceModel;
 import org.sonar.api.database.model.Snapshot;
 import org.sonar.api.resources.*;
 import org.sonar.api.utils.SonarException;
-import org.sonar.persistence.resource.ResourceIndexerDao;
+import org.sonar.core.resource.ResourceIndexerDao;
 
 import javax.persistence.NonUniqueResultException;
 import javax.persistence.Query;

sonar-batch/src/test/java/org/sonar/batch/index/DefaultResourcePersisterTest.java

@@ -26,7 +26,7 @@ import org.sonar.api.resources.JavaPackage;
 import org.sonar.api.resources.Library;
 import org.sonar.api.resources.Project;
 import org.sonar.jpa.test.AbstractDbUnitTestCase;
-import org.sonar.persistence.resource.ResourceIndexerDao;
+import org.sonar.core.resource.ResourceIndexerDao;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

sonar-batch/src/test/java/org/sonar/batch/index/MeasurePersisterTest.java

@@ -20,7 +20,6 @@
 package org.sonar.batch.index;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.sonar.api.database.model.MeasureModel;
 import org.sonar.api.database.model.Snapshot;
@@ -31,19 +30,16 @@ import org.sonar.api.measures.PersistenceMode;
 import org.sonar.api.resources.JavaFile;
 import org.sonar.api.resources.JavaPackage;
 import org.sonar.api.resources.Project;
-import org.sonar.core.components.DefaultRuleFinder;
+import org.sonar.core.rule.DefaultRuleFinder;
 import org.sonar.jpa.test.AbstractDbUnitTestCase;
 
 import java.util.List;
 
-import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 public class MeasurePersisterTest extends AbstractDbUnitTestCase {
 

sonar-batch/src/test/java/org/sonar/batch/phases/UpdateStatusJobTest.java

@@ -25,7 +25,7 @@ import org.sonar.api.database.model.Snapshot;
 import org.sonar.batch.ServerMetadata;
 import org.sonar.batch.index.DefaultResourcePersister;
 import org.sonar.jpa.test.AbstractDbUnitTestCase;
-import org.sonar.persistence.resource.ResourceIndexerDao;
+import org.sonar.core.resource.ResourceIndexerDao;
 
 import javax.persistence.Query;
 

sonar-core/src/main/java/org/sonar/persistence/dashboard/ActiveDashboardDao.java → sonar-core/src/main/java/org/sonar/core/dashboard/ActiveDashboardDao.java

@@ -17,12 +17,12 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dashboard;
+package org.sonar.core.dashboard;
 
 import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.BatchComponent;
 import org.sonar.api.ServerComponent;
-import org.sonar.persistence.MyBatis;
+import org.sonar.core.persistence.MyBatis;
 
 public class ActiveDashboardDao implements BatchComponent, ServerComponent {
 

sonar-core/src/main/java/org/sonar/persistence/dashboard/ActiveDashboardDto.java → sonar-core/src/main/java/org/sonar/core/dashboard/ActiveDashboardDto.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dashboard;
+package org.sonar.core.dashboard;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;

sonar-core/src/main/java/org/sonar/persistence/dashboard/ActiveDashboardMapper.java → sonar-core/src/main/java/org/sonar/core/dashboard/ActiveDashboardMapper.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dashboard;
+package org.sonar.core.dashboard;
 
 
 public interface ActiveDashboardMapper {

sonar-core/src/main/java/org/sonar/persistence/dashboard/DashboardDao.java → sonar-core/src/main/java/org/sonar/core/dashboard/DashboardDao.java

@@ -17,12 +17,12 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dashboard;
+package org.sonar.core.dashboard;
 
 import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.BatchComponent;
 import org.sonar.api.ServerComponent;
-import org.sonar.persistence.MyBatis;
+import org.sonar.core.persistence.MyBatis;
 
 public class DashboardDao implements BatchComponent, ServerComponent {
 

sonar-core/src/main/java/org/sonar/persistence/dashboard/DashboardDto.java → sonar-core/src/main/java/org/sonar/core/dashboard/DashboardDto.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dashboard;
+package org.sonar.core.dashboard;
 
 import com.google.common.collect.Lists;
 

sonar-core/src/main/java/org/sonar/persistence/dashboard/DashboardMapper.java → sonar-core/src/main/java/org/sonar/core/dashboard/DashboardMapper.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dashboard;
+package org.sonar.core.dashboard;
 
 
 public interface DashboardMapper {

sonar-core/src/main/java/org/sonar/persistence/dashboard/WidgetDto.java → sonar-core/src/main/java/org/sonar/core/dashboard/WidgetDto.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dashboard;
+package org.sonar.core.dashboard;
 
 import com.google.common.collect.Lists;
 

sonar-core/src/main/java/org/sonar/persistence/dashboard/WidgetMapper.java → sonar-core/src/main/java/org/sonar/core/dashboard/WidgetMapper.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dashboard;
+package org.sonar.core.dashboard;
 
 public interface WidgetMapper {
 

sonar-core/src/main/java/org/sonar/persistence/dashboard/WidgetPropertyDto.java → sonar-core/src/main/java/org/sonar/core/dashboard/WidgetPropertyDto.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dashboard;
+package org.sonar.core.dashboard;
 
 public final class WidgetPropertyDto {
 

sonar-core/src/main/java/org/sonar/persistence/dashboard/WidgetPropertyMapper.java → sonar-core/src/main/java/org/sonar/core/dashboard/WidgetPropertyMapper.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dashboard;
+package org.sonar.core.dashboard;
 
 public interface WidgetPropertyMapper {
 

sonar-core/src/main/java/org/sonar/persistence/duplication/DuplicationDao.java → sonar-core/src/main/java/org/sonar/core/duplication/DuplicationDao.java

@@ -17,13 +17,13 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.duplication;
+package org.sonar.core.duplication;
 
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.BatchComponent;
 import org.sonar.api.ServerComponent;
-import org.sonar.persistence.MyBatis;
+import org.sonar.core.persistence.MyBatis;
 
 import java.util.Collection;
 import java.util.List;

sonar-core/src/main/java/org/sonar/persistence/duplication/DuplicationMapper.java → sonar-core/src/main/java/org/sonar/core/duplication/DuplicationMapper.java

@@ -17,12 +17,12 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.duplication;
-
-import java.util.List;
+package org.sonar.core.duplication;
 
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface DuplicationMapper {
 
   List<DuplicationUnitDto> selectCandidates(

sonar-core/src/main/java/org/sonar/persistence/duplication/DuplicationUnitDto.java → sonar-core/src/main/java/org/sonar/core/duplication/DuplicationUnitDto.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.duplication;
+package org.sonar.core.duplication;
 
 /**
  * A simple DTO (Data Transfer Object) class that provides the mapping of data to a table.

sonar-core/src/main/java/org/sonar/core/components/CacheMetricFinder.java → sonar-core/src/main/java/org/sonar/core/metric/CacheMetricFinder.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.core.components;
+package org.sonar.core.metric;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

sonar-core/src/main/java/org/sonar/core/components/DefaultMetricFinder.java → sonar-core/src/main/java/org/sonar/core/metric/DefaultMetricFinder.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.core.components;
+package org.sonar.core.metric;
 
 import com.google.common.collect.Lists;
 import org.sonar.api.measures.Metric;

sonar-core/src/main/java/org/sonar/core/notifications/DefaultNotificationManager.java → sonar-core/src/main/java/org/sonar/core/notification/DefaultNotificationManager.java

@@ -17,14 +17,13 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.core.notifications;
+package org.sonar.core.notification;
 
 import org.sonar.api.database.DatabaseSession;
 import org.sonar.api.database.configuration.Property;
 import org.sonar.api.database.model.User;
 import org.sonar.api.notifications.Notification;
 import org.sonar.api.notifications.NotificationManager;
-import org.sonar.jpa.entity.NotificationQueueElement;
 import org.sonar.jpa.session.DatabaseSessionFactory;
 
 import java.util.Date;

sonar-core/src/main/java/org/sonar/jpa/entity/NotificationQueueElement.java → sonar-core/src/main/java/org/sonar/core/notification/NotificationQueueElement.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.jpa.entity;
+package org.sonar.core.notification;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
@@ -25,11 +25,10 @@ import org.apache.commons.lang.builder.ToStringStyle;
 import org.sonar.api.notifications.Notification;
 import org.sonar.api.utils.SonarException;
 
+import javax.persistence.*;
 import java.io.*;
 import java.util.Date;
 
-import javax.persistence.*;
-
 @Entity
 @Table(name = "notifications")
 public class NotificationQueueElement {

sonar-core/src/main/java/org/sonar/persistence/DaoUtils.java → sonar-core/src/main/java/org/sonar/core/persistence/DaoUtils.java

@@ -17,15 +17,15 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence;
+package org.sonar.core.persistence;
 
-import org.sonar.persistence.dashboard.ActiveDashboardDao;
-import org.sonar.persistence.dashboard.DashboardDao;
-import org.sonar.persistence.duplication.DuplicationDao;
-import org.sonar.persistence.resource.ResourceIndexerDao;
-import org.sonar.persistence.review.ReviewDao;
-import org.sonar.persistence.rule.RuleDao;
-import org.sonar.persistence.template.LoadedTemplateDao;
+import org.sonar.core.dashboard.ActiveDashboardDao;
+import org.sonar.core.dashboard.DashboardDao;
+import org.sonar.core.duplication.DuplicationDao;
+import org.sonar.core.resource.ResourceIndexerDao;
+import org.sonar.core.review.ReviewDao;
+import org.sonar.core.rule.RuleDao;
+import org.sonar.core.template.LoadedTemplateDao;
 
 import java.util.Arrays;
 import java.util.List;

sonar-core/src/main/java/org/sonar/persistence/Database.java → sonar-core/src/main/java/org/sonar/core/persistence/Database.java

@@ -17,9 +17,9 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence;
+package org.sonar.core.persistence;
 
-import org.sonar.persistence.dialect.Dialect;
+import org.sonar.core.persistence.dialect.Dialect;
 
 import javax.sql.DataSource;
 import java.util.Properties;

sonar-core/src/main/java/org/sonar/persistence/DatabaseMigrator.java → sonar-core/src/main/java/org/sonar/core/persistence/DatabaseMigrator.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence;
+package org.sonar.core.persistence;
 
 import org.apache.ibatis.session.SqlSession;
 import org.slf4j.LoggerFactory;

sonar-core/src/main/java/org/sonar/persistence/DatabaseUtils.java → sonar-core/src/main/java/org/sonar/core/persistence/DatabaseUtils.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence;
+package org.sonar.core.persistence;
 
 /**
  * @since 2.13

sonar-core/src/main/java/org/sonar/persistence/DdlUtils.java → sonar-core/src/main/java/org/sonar/core/persistence/DdlUtils.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence;
+package org.sonar.core.persistence;
 
 import org.apache.commons.io.output.NullWriter;
 import org.apache.ibatis.io.Resources;

sonar-core/src/main/java/org/sonar/persistence/DefaultDatabase.java → sonar-core/src/main/java/org/sonar/core/persistence/DefaultDatabase.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence;
+package org.sonar.core.persistence;
 
 import org.apache.commons.dbcp.BasicDataSource;
 import org.apache.commons.dbcp.BasicDataSourceFactory;
@@ -27,8 +27,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.config.Settings;
 import org.sonar.api.database.DatabaseProperties;
+import org.sonar.core.persistence.dialect.*;
 import org.sonar.jpa.session.CustomHibernateConnectionProvider;
-import org.sonar.persistence.dialect.*;
 
 import javax.sql.DataSource;
 import java.sql.SQLException;

sonar-core/src/main/java/org/sonar/persistence/MyBatis.java → sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence;
+package org.sonar.core.persistence;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
@@ -27,18 +27,18 @@ import org.apache.ibatis.session.*;
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.sonar.api.BatchComponent;
 import org.sonar.api.ServerComponent;
-import org.sonar.persistence.dashboard.*;
-import org.sonar.persistence.duplication.DuplicationMapper;
-import org.sonar.persistence.duplication.DuplicationUnitDto;
-import org.sonar.persistence.resource.ResourceDto;
-import org.sonar.persistence.resource.ResourceIndexDto;
-import org.sonar.persistence.resource.ResourceIndexerMapper;
-import org.sonar.persistence.review.ReviewDto;
-import org.sonar.persistence.review.ReviewMapper;
-import org.sonar.persistence.rule.RuleDto;
-import org.sonar.persistence.rule.RuleMapper;
-import org.sonar.persistence.template.LoadedTemplateDto;
-import org.sonar.persistence.template.LoadedTemplateMapper;
+import org.sonar.core.dashboard.*;
+import org.sonar.core.duplication.DuplicationMapper;
+import org.sonar.core.duplication.DuplicationUnitDto;
+import org.sonar.core.resource.ResourceDto;
+import org.sonar.core.resource.ResourceIndexDto;
+import org.sonar.core.resource.ResourceIndexerMapper;
+import org.sonar.core.review.ReviewDto;
+import org.sonar.core.review.ReviewMapper;
+import org.sonar.core.rule.RuleDto;
+import org.sonar.core.rule.RuleMapper;
+import org.sonar.core.template.LoadedTemplateDto;
+import org.sonar.core.template.LoadedTemplateMapper;
 
 import java.io.IOException;
 import java.io.InputStream;

sonar-core/src/main/java/org/sonar/persistence/dialect/Derby.java → sonar-core/src/main/java/org/sonar/core/persistence/dialect/Derby.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dialect;
+package org.sonar.core.persistence.dialect;
 
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.dialect.DerbyDialect;

sonar-core/src/main/java/org/sonar/persistence/dialect/Dialect.java → sonar-core/src/main/java/org/sonar/core/persistence/dialect/Dialect.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dialect;
+package org.sonar.core.persistence.dialect;
 
 /**
  * @since 1.12

sonar-core/src/main/java/org/sonar/persistence/dialect/DialectUtils.java → sonar-core/src/main/java/org/sonar/core/persistence/dialect/DialectUtils.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dialect;
+package org.sonar.core.persistence.dialect;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterators;

sonar-core/src/main/java/org/sonar/persistence/dialect/MsSql.java → sonar-core/src/main/java/org/sonar/core/persistence/dialect/MsSql.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dialect;
+package org.sonar.core.persistence.dialect;
 
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.HibernateException;

sonar-core/src/main/java/org/sonar/persistence/dialect/MySql.java → sonar-core/src/main/java/org/sonar/core/persistence/dialect/MySql.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dialect;
+package org.sonar.core.persistence.dialect;
 
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.dialect.MySQLDialect;

sonar-core/src/main/java/org/sonar/persistence/dialect/Oracle.java → sonar-core/src/main/java/org/sonar/core/persistence/dialect/Oracle.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dialect;
+package org.sonar.core.persistence.dialect;
 
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.dialect.Oracle10gDialect;

sonar-core/src/main/java/org/sonar/persistence/dialect/OracleSequenceGenerator.java → sonar-core/src/main/java/org/sonar/core/persistence/dialect/OracleSequenceGenerator.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dialect;
+package org.sonar.core.persistence.dialect;
 
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.MappingException;

sonar-core/src/main/java/org/sonar/persistence/dialect/PostgreSQLSequenceGenerator.java → sonar-core/src/main/java/org/sonar/core/persistence/dialect/PostgreSQLSequenceGenerator.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dialect;
+package org.sonar.core.persistence.dialect;
 
 import org.hibernate.MappingException;
 import org.hibernate.dialect.Dialect;

sonar-core/src/main/java/org/sonar/persistence/dialect/PostgreSql.java → sonar-core/src/main/java/org/sonar/core/persistence/dialect/PostgreSql.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dialect;
+package org.sonar.core.persistence.dialect;
 
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.dialect.PostgreSQLDialect;

sonar-core/src/main/java/org/sonar/core/plugins/ResourcesClassloader.java

@@ -19,9 +19,8 @@
  */
 package org.sonar.core.plugins;
 
-import org.apache.commons.lang.StringUtils;
-
 import com.google.common.collect.Lists;
+import org.apache.commons.lang.StringUtils;
 
 import java.net.URL;
 import java.net.URLClassLoader;

sonar-core/src/main/java/org/sonar/core/components/DefaultModelFinder.java → sonar-core/src/main/java/org/sonar/core/qualitymodel/DefaultModelFinder.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.core.components;
+package org.sonar.core.qualitymodel;
 
 import org.sonar.api.database.DatabaseSession;
 import org.sonar.api.qualitymodel.Model;

sonar-core/src/main/java/org/sonar/persistence/resource/ResourceDto.java → sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.resource;
+package org.sonar.core.resource;
 
 public final class ResourceDto {
 

sonar-core/src/main/java/org/sonar/persistence/resource/ResourceIndexDto.java → sonar-core/src/main/java/org/sonar/core/resource/ResourceIndexDto.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.resource;
+package org.sonar.core.resource;
 
 public final class ResourceIndexDto {
 

sonar-core/src/main/java/org/sonar/persistence/resource/ResourceIndexerDao.java → sonar-core/src/main/java/org/sonar/core/resource/ResourceIndexerDao.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.resource;
+package org.sonar.core.resource;
 
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -25,7 +25,7 @@ import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.ResultContext;
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.SqlSession;
-import org.sonar.persistence.MyBatis;
+import org.sonar.core.persistence.MyBatis;
 
 public class ResourceIndexerDao {
 

sonar-core/src/main/java/org/sonar/persistence/resource/ResourceIndexerFilter.java → sonar-core/src/main/java/org/sonar/core/resource/ResourceIndexerFilter.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.resource;
+package org.sonar.core.resource;
 
 public final class ResourceIndexerFilter {
   private boolean enabled = true;

sonar-core/src/main/java/org/sonar/persistence/resource/ResourceIndexerMapper.java → sonar-core/src/main/java/org/sonar/core/resource/ResourceIndexerMapper.java

@@ -17,11 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.resource;
-
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
+package org.sonar.core.resource;
 
 public interface ResourceIndexerMapper {
 

sonar-core/src/main/java/org/sonar/persistence/review/ReviewDao.java → sonar-core/src/main/java/org/sonar/core/review/ReviewDao.java

@@ -17,13 +17,13 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.review;
+package org.sonar.core.review;
 
 import com.google.common.collect.Lists;
 import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.BatchComponent;
 import org.sonar.api.ServerComponent;
-import org.sonar.persistence.MyBatis;
+import org.sonar.core.persistence.MyBatis;
 
 import java.util.List;
 

sonar-core/src/main/java/org/sonar/persistence/review/ReviewDto.java → sonar-core/src/main/java/org/sonar/core/review/ReviewDto.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.review;
+package org.sonar.core.review;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;

sonar-core/src/main/java/org/sonar/persistence/review/ReviewMapper.java → sonar-core/src/main/java/org/sonar/core/review/ReviewMapper.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.review;
+package org.sonar.core.review;
 
 import org.apache.ibatis.annotations.Param;
 

sonar-core/src/main/java/org/sonar/persistence/review/ReviewQuery.java → sonar-core/src/main/java/org/sonar/core/review/ReviewQuery.java

@@ -17,10 +17,10 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.review;
+package org.sonar.core.review;
 
 import com.google.common.collect.Lists;
-import org.sonar.persistence.DatabaseUtils;
+import org.sonar.core.persistence.DatabaseUtils;
 
 import java.util.Collection;
 import java.util.List;

sonar-core/src/main/java/org/sonar/core/components/CacheRuleFinder.java → sonar-core/src/main/java/org/sonar/core/rule/CacheRuleFinder.java

@@ -17,13 +17,14 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.core.components;
+package org.sonar.core.rule;
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.Maps;
 import org.sonar.api.rules.Rule;
 import org.sonar.api.rules.RuleQuery;
+import org.sonar.core.rule.DefaultRuleFinder;
 import org.sonar.jpa.session.DatabaseSessionFactory;
 
 import java.util.Map;

sonar-core/src/main/java/org/sonar/core/components/DefaultRuleFinder.java → sonar-core/src/main/java/org/sonar/core/rule/DefaultRuleFinder.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.core.components;
+package org.sonar.core.rule;
 
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.database.DatabaseSession;

sonar-core/src/main/java/org/sonar/persistence/rule/RuleDao.java → sonar-core/src/main/java/org/sonar/core/rule/RuleDao.java

@@ -17,12 +17,12 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.rule;
+package org.sonar.core.rule;
 
 import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.BatchComponent;
 import org.sonar.api.ServerComponent;
-import org.sonar.persistence.MyBatis;
+import org.sonar.core.persistence.MyBatis;
 
 import java.util.List;
 

sonar-core/src/main/java/org/sonar/persistence/rule/RuleDto.java → sonar-core/src/main/java/org/sonar/core/rule/RuleDto.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.rule;
+package org.sonar.core.rule;
 
 public final class RuleDto {
   private Long id;

sonar-core/src/main/java/org/sonar/persistence/rule/RuleMapper.java → sonar-core/src/main/java/org/sonar/core/rule/RuleMapper.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.rule;
+package org.sonar.core.rule;
 
 import java.util.List;
 

sonar-core/src/main/java/org/sonar/persistence/template/LoadedTemplateDao.java → sonar-core/src/main/java/org/sonar/core/template/LoadedTemplateDao.java

@@ -17,12 +17,12 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.template;
+package org.sonar.core.template;
 
 import org.apache.ibatis.session.SqlSession;
 import org.sonar.api.BatchComponent;
 import org.sonar.api.ServerComponent;
-import org.sonar.persistence.MyBatis;
+import org.sonar.core.persistence.MyBatis;
 
 public class LoadedTemplateDao implements BatchComponent, ServerComponent {
 

sonar-core/src/main/java/org/sonar/persistence/template/LoadedTemplateDto.java → sonar-core/src/main/java/org/sonar/core/template/LoadedTemplateDto.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.template;
+package org.sonar.core.template;
 
 public final class LoadedTemplateDto {
 

sonar-core/src/main/java/org/sonar/persistence/template/LoadedTemplateMapper.java → sonar-core/src/main/java/org/sonar/core/template/LoadedTemplateMapper.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.template;
+package org.sonar.core.template;
 
 import org.apache.ibatis.annotations.Param;
 

sonar-core/src/main/java/org/sonar/core/components/DefaultUserFinder.java → sonar-core/src/main/java/org/sonar/core/user/DefaultUserFinder.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.core.components;
+package org.sonar.core.user;
 
 import org.sonar.api.database.DatabaseSession;
 import org.sonar.api.database.model.User;

sonar-core/src/main/java/org/sonar/jpa/session/AbstractDatabaseConnector.java

@@ -22,9 +22,9 @@ package org.sonar.jpa.session;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.utils.Logs;
+import org.sonar.core.persistence.Database;
+import org.sonar.core.persistence.dialect.Dialect;
 import org.sonar.jpa.entity.SchemaMigration;
-import org.sonar.persistence.Database;
-import org.sonar.persistence.dialect.Dialect;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;

sonar-core/src/main/java/org/sonar/jpa/session/DatabaseConnector.java

@@ -19,7 +19,7 @@
  */
 package org.sonar.jpa.session;
 
-import org.sonar.persistence.dialect.Dialect;
+import org.sonar.core.persistence.dialect.Dialect;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;

sonar-core/src/main/java/org/sonar/jpa/session/DefaultDatabaseConnector.java

@@ -20,8 +20,8 @@
 package org.sonar.jpa.session;
 
 import org.sonar.api.utils.SonarException;
+import org.sonar.core.persistence.Database;
 import org.sonar.jpa.entity.SchemaMigration;
-import org.sonar.persistence.Database;
 
 import java.sql.Connection;
 import java.sql.SQLException;

sonar-core/src/main/java/org/sonar/jpa/session/MemoryDatabaseConnector.java

@@ -19,8 +19,8 @@
  */
 package org.sonar.jpa.session;
 
+import org.sonar.core.persistence.Database;
 import org.sonar.jpa.entity.SchemaMigration;
-import org.sonar.persistence.Database;
 
 import javax.persistence.EntityManager;
 

sonar-core/src/main/resources/META-INF/persistence.xml

@@ -35,7 +35,7 @@
     <class>org.sonar.api.rules.ActiveRuleChange</class>
     <class>org.sonar.api.rules.ActiveRuleParamChange</class>
     <class>org.sonar.jpa.entity.Review</class>
-    <class>org.sonar.jpa.entity.NotificationQueueElement</class>
+    <class>org.sonar.core.notification.NotificationQueueElement</class>
 
     <properties>
       <property name="hibernate.current_session_context_class" value="thread"/>

sonar-core/src/main/resources/org/sonar/persistence/dashboard/ActiveDashboardMapper-oracle.xml → sonar-core/src/main/resources/org/sonar/core/dashboard/ActiveDashboardMapper-oracle.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.persistence.dashboard.ActiveDashboardMapper">
+<mapper namespace="org.sonar.core.dashboard.ActiveDashboardMapper">
 
   <insert id="insert" parameterType="ActiveDashboard" keyColumn="id" useGeneratedKeys="true" keyProperty ="id">
     <selectKey order="BEFORE" resultType="Long" keyProperty="id" >

sonar-core/src/main/resources/org/sonar/persistence/dashboard/ActiveDashboardMapper.xml → sonar-core/src/main/resources/org/sonar/core/dashboard/ActiveDashboardMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.persistence.dashboard.ActiveDashboardMapper">
+<mapper namespace="org.sonar.core.dashboard.ActiveDashboardMapper">
 
   <insert id="insert" parameterType="ActiveDashboard" useGeneratedKeys="true" keyProperty ="id">
     INSERT INTO active_dashboards (dashboard_id, user_id, order_index)

sonar-core/src/main/resources/org/sonar/persistence/dashboard/DashboardMapper-oracle.xml → sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper-oracle.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.persistence.dashboard.DashboardMapper">
+<mapper namespace="org.sonar.core.dashboard.DashboardMapper">
 
   <select id="selectGlobalDashboard" parameterType="string" resultType="Dashboard">
     select id, user_id as "userId", name, description, column_layout as "columnLayout", shared, created_at as "createdAt", updated_at as "updatedAt"

sonar-core/src/main/resources/org/sonar/persistence/dashboard/DashboardMapper.xml → sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.persistence.dashboard.DashboardMapper">
+<mapper namespace="org.sonar.core.dashboard.DashboardMapper">
 
   <select id="selectGlobalDashboard" parameterType="string" resultType="Dashboard">
     select id, user_id as "userId", name, description, column_layout as "columnLayout", shared, created_at as "createdAt", updated_at as "updatedAt"

sonar-core/src/main/resources/org/sonar/persistence/dashboard/WidgetMapper-oracle.xml → sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetMapper-oracle.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.persistence.dashboard.WidgetMapper">
+<mapper namespace="org.sonar.core.dashboard.WidgetMapper">
 
   <insert id="insert" parameterType="Widget" keyColumn="id" useGeneratedKeys="true" keyProperty ="id">
     <selectKey order="BEFORE" resultType="Long" keyProperty="id" >

sonar-core/src/main/resources/org/sonar/persistence/dashboard/WidgetMapper.xml → sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.persistence.dashboard.WidgetMapper">
+<mapper namespace="org.sonar.core.dashboard.WidgetMapper">
 
   <insert id="insert" parameterType="Widget" useGeneratedKeys="true" keyProperty ="id">
     INSERT INTO widgets (dashboard_id, widget_key, name, description, column_index, row_index, configured, created_at, updated_at)

sonar-core/src/main/resources/org/sonar/persistence/dashboard/WidgetPropertyMapper-oracle.xml → sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetPropertyMapper-oracle.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.persistence.dashboard.WidgetPropertyMapper">
+<mapper namespace="org.sonar.core.dashboard.WidgetPropertyMapper">
 
   <insert id="insert" parameterType="WidgetProperty" keyColumn="id" useGeneratedKeys="false" keyProperty="id">
     INSERT INTO widget_properties (id, widget_id, kee, text_value)

sonar-core/src/main/resources/org/sonar/persistence/dashboard/WidgetPropertyMapper.xml → sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetPropertyMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.persistence.dashboard.WidgetPropertyMapper">
+<mapper namespace="org.sonar.core.dashboard.WidgetPropertyMapper">
 
   <insert id="insert" parameterType="WidgetProperty" useGeneratedKeys="true" keyProperty="id">
     INSERT INTO widget_properties (widget_id, kee, text_value)

sonar-core/src/main/resources/org/sonar/persistence/duplication/DuplicationMapper-mssql.xml → sonar-core/src/main/resources/org/sonar/core/duplication/DuplicationMapper-mssql.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.persistence.duplication.DuplicationMapper">
+<mapper namespace="org.sonar.core.duplication.DuplicationMapper">
 
   <select id="selectCandidates" parameterType="map" resultType="DuplicationUnit">
     SELECT DISTINCT to_blocks.hash hash, res.kee resourceKey, to_blocks.index_in_file indexInFile, to_blocks.start_line startLine, to_blocks.end_line endLine

sonar-core/src/main/resources/org/sonar/persistence/duplication/DuplicationMapper-oracle.xml → sonar-core/src/main/resources/org/sonar/core/duplication/DuplicationMapper-oracle.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.persistence.duplication.DuplicationMapper">
+<mapper namespace="org.sonar.core.duplication.DuplicationMapper">
 
   <select id="selectCandidates" parameterType="map" resultType="DuplicationUnit">
     SELECT DISTINCT to_blocks.hash hash, res.kee resourceKey, to_blocks.index_in_file indexInFile, to_blocks.start_line startLine, to_blocks.end_line endLine

sonar-core/src/main/resources/org/sonar/persistence/duplication/DuplicationMapper.xml → sonar-core/src/main/resources/org/sonar/core/duplication/DuplicationMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.persistence.duplication.DuplicationMapper">
+<mapper namespace="org.sonar.core.duplication.DuplicationMapper">
 
   <select id="selectCandidates" parameterType="map" resultType="DuplicationUnit">
     SELECT DISTINCT to_blocks.hash hash, res.kee resourceKey, to_blocks.index_in_file indexInFile, to_blocks.start_line startLine, to_blocks.end_line endLine

sonar-core/src/main/resources/org/sonar/persistence/resource/ResourceIndexerMapper.xml → sonar-core/src/main/resources/org/sonar/core/resource/ResourceIndexerMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.persistence.resource.ResourceIndexerMapper">
+<mapper namespace="org.sonar.core.resource.ResourceIndexerMapper">
 
   <select id="selectResourcesToIndex" parameterType="map" resultType="Resource">
     select id, root_id as "rootId", name, scope, qualifier

sonar-core/src/main/resources/org/sonar/persistence/review/ReviewMapper.xml → sonar-core/src/main/resources/org/sonar/core/review/ReviewMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.persistence.review.ReviewMapper">
+<mapper namespace="org.sonar.core.review.ReviewMapper">
 
   <resultMap id="reviewResultMap" type="Review">
     <result property="createdAt" column="created_at"/>
@@ -32,7 +32,7 @@
     from reviews where resource_id=#{id}
   </select>
 
-  <select id="selectByQuery" parameterType="org.sonar.persistence.review.ReviewQuery" resultMap="reviewResultMap">
+  <select id="selectByQuery" parameterType="org.sonar.core.review.ReviewQuery" resultMap="reviewResultMap">
     select
     <include refid="reviewColumns"/>
     from reviews

sonar-core/src/main/resources/org/sonar/persistence/rule/RuleMapper.xml → sonar-core/src/main/resources/org/sonar/core/rule/RuleMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.persistence.rule.RuleMapper">
+<mapper namespace="org.sonar.core.rule.RuleMapper">
   <select id="selectAll" resultType="Rule">
     select id, plugin_rule_key as "ruleKey", plugin_name as "repositoryKey", description, enabled, name from rules
   </select>

sonar-core/src/main/resources/org/sonar/persistence/template/LoadedTemplateMapper-oracle.xml → sonar-core/src/main/resources/org/sonar/core/template/LoadedTemplateMapper-oracle.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.persistence.template.LoadedTemplateMapper">
+<mapper namespace="org.sonar.core.template.LoadedTemplateMapper">
 
   <resultMap id="loadedTemplateResultMap" type="LoadedTemplate">
     <result property="id" column="id"/>

sonar-core/src/main/resources/org/sonar/persistence/template/LoadedTemplateMapper.xml → sonar-core/src/main/resources/org/sonar/core/template/LoadedTemplateMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.persistence.template.LoadedTemplateMapper">
+<mapper namespace="org.sonar.core.template.LoadedTemplateMapper">
 
   <resultMap id="loadedTemplateResultMap" type="LoadedTemplate">
     <result property="id" column="id"/>

sonar-core/src/test/java/org/sonar/persistence/dashboard/ActiveDashboardDaoTest.java → sonar-core/src/test/java/org/sonar/core/dashboard/ActiveDashboardDaoTest.java

@@ -17,11 +17,11 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dashboard;
+package org.sonar.core.dashboard;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.sonar.persistence.DaoTestCase;
+import org.sonar.core.persistence.DaoTestCase;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;

sonar-core/src/test/java/org/sonar/persistence/dashboard/DashboardDaoTest.java → sonar-core/src/test/java/org/sonar/core/dashboard/DashboardDaoTest.java

@@ -17,11 +17,11 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.dashboard;
+package org.sonar.core.dashboard;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.sonar.persistence.DaoTestCase;
+import org.sonar.core.persistence.DaoTestCase;
 
 import java.util.Date;
 

sonar-core/src/test/java/org/sonar/persistence/duplication/DuplicationDaoTest.java → sonar-core/src/test/java/org/sonar/core/duplication/DuplicationDaoTest.java

@@ -17,19 +17,17 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence.duplication;
+package org.sonar.core.duplication;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import org.junit.Before;
+import org.junit.Test;
+import org.sonar.core.persistence.DaoTestCase;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.sonar.persistence.DaoTestCase;
-import org.sonar.persistence.duplication.DuplicationDao;
-import org.sonar.persistence.duplication.DuplicationUnitDto;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
 
 public class DuplicationDaoTest extends DaoTestCase {
 

sonar-core/src/test/java/org/sonar/core/components/CacheMetricFinderTest.java → sonar-core/src/test/java/org/sonar/core/metric/CacheMetricFinderTest.java

@@ -17,10 +17,11 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.core.components;
+package org.sonar.core.metric;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.sonar.core.metric.CacheMetricFinder;
 import org.sonar.jpa.test.AbstractDbUnitTestCase;
 
 import java.util.Arrays;

sonar-core/src/test/java/org/sonar/core/components/DefaultMetricFinderTest.java → sonar-core/src/test/java/org/sonar/core/metric/DefaultMetricFinderTest.java

@@ -17,10 +17,11 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.core.components;
+package org.sonar.core.metric;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.sonar.core.metric.DefaultMetricFinder;
 import org.sonar.jpa.test.AbstractDbUnitTestCase;
 
 import java.util.Arrays;

sonar-core/src/test/java/org/sonar/core/notifications/DefaultNotificationManagerTest.java → sonar-core/src/test/java/org/sonar/core/notification/DefaultNotificationManagerTest.java

@@ -17,18 +17,17 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.core.notifications;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+package org.sonar.core.notification;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.sonar.api.notifications.Notification;
-import org.sonar.jpa.entity.NotificationQueueElement;
 import org.sonar.jpa.test.AbstractDbUnitTestCase;
 
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertThat;
+
 public class DefaultNotificationManagerTest extends AbstractDbUnitTestCase {
 
   private DefaultNotificationManager manager;

sonar-core/src/test/java/org/sonar/persistence/DaoTestCase.java → sonar-core/src/test/java/org/sonar/core/persistence/DaoTestCase.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence;
+package org.sonar.core.persistence;
 
 import org.apache.commons.io.IOUtils;
 import org.dbunit.Assertion;
@@ -29,11 +29,8 @@ import org.dbunit.database.IDatabaseConnection;
 import org.dbunit.dataset.*;
 import org.dbunit.dataset.filter.DefaultColumnFilter;
 import org.dbunit.dataset.xml.FlatXmlDataSet;
-import org.dbunit.ext.mssql.InsertIdentityOperation;
-import org.dbunit.operation.DatabaseOperation;
 import org.junit.*;
 import org.sonar.api.config.Settings;
-import org.sonar.persistence.*;
 
 import java.io.InputStream;
 import java.io.StringWriter;

sonar-core/src/test/java/org/sonar/persistence/DaoUtilsTest.java → sonar-core/src/test/java/org/sonar/core/persistence/DaoUtilsTest.java

@@ -17,10 +17,9 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence;
+package org.sonar.core.persistence;
 
 import org.junit.Test;
-import org.sonar.persistence.DaoUtils;
 
 import static org.hamcrest.Matchers.greaterThan;
 import static org.junit.Assert.assertThat;

sonar-core/src/test/java/org/sonar/persistence/DatabaseCommands.java → sonar-core/src/test/java/org/sonar/core/persistence/DatabaseCommands.java

@@ -17,7 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.persistence;
+package org.sonar.core.persistence;
 
 import org.apache.commons.lang.StringUtils;
 import org.dbunit.dataset.datatype.DefaultDataTypeFactory;
@@ -28,7 +28,7 @@ import org.dbunit.ext.mysql.MySqlDataTypeFactory;
 import org.dbunit.ext.oracle.Oracle10DataTypeFactory;
 import org.dbunit.ext.postgresql.PostgresqlDataTypeFactory;
 import org.dbunit.operation.DatabaseOperation;
-import org.sonar.persistence.dialect.*;
+import org.sonar.core.persistence.dialect.*;
 
 import java.util.Arrays;
 import java.util.List;