public final static int VERSION_UNKNOWN = -1;
- public static final int LAST_VERSION = 240;
- public static final int VERSION_2_13 = 240;
+ public static final int LAST_VERSION = 241;
+ public static final int VERSION_2_13 = 241;
public final static String TABLE_NAME = "schema_migrations";
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('238');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('239');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('240');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('241');
INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '2011-09-26 22:27:48.0', '2011-09-26 22:27:48.0', null, null);
ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;
}
private void startDatabaseConnectors(ServletContext servletContext) {
+ System.out.println("Start database connectors");
rootContainer = new ComponentContainer();
rootContainer.addSingleton(servletContext);
rootContainer.addSingleton(IocContainer.class); // for backward compatibility
rootContainer.addSingleton(EmbeddedDatabaseFactory.class);
rootContainer.addSingleton(DefaultDatabase.class);
rootContainer.addSingleton(MyBatis.class);
- rootContainer.addSingleton(ResourceIndexer.class); // for the migration -> see org.sonar.server.startup.IndexProjects
+ rootContainer.addSingleton(ResourceIndexer.class); // for the migration 241
rootContainer.addSingleton(DefaultDatabaseConnector.class);
rootContainer.addSingleton(DefaultServerUpgradeStatus.class);
rootContainer.addSingleton(DatabaseMigrator.class);
startupContainer.addSingleton(DeleteDeprecatedMeasures.class);
startupContainer.addSingleton(GeneratePluginIndex.class);
startupContainer.addSingleton(RegisterNewDashboards.class);
- startupContainer.addSingleton(IndexProjects.class);
startupContainer.startComponents();
startupContainer.getComponentByType(ServerLifecycleNotifier.class).notifyStart();
+++ /dev/null
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2011 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar 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 3 of the License, or (at your option) any later version.
- *
- * Sonar 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 Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02
- */
-package org.sonar.server.startup;
-
-import org.sonar.api.ServerComponent;
-import org.sonar.api.platform.ServerUpgradeStatus;
-import org.sonar.api.utils.TimeProfiler;
-import org.sonar.core.resource.ResourceIndexer;
-import org.sonar.jpa.entity.SchemaMigration;
-
-/**
- * Index existing projects during migration to 2.13. Since this latter version, resources are automatically indexed
- * during project analysis.
- *
- * @since 2.13
- */
-public class IndexProjects implements ServerComponent {
-
- private ServerUpgradeStatus upgradeStatus;
- private ResourceIndexer indexer;
-
- public IndexProjects(ServerUpgradeStatus upgradeStatus, ResourceIndexer indexer) {
- this.upgradeStatus = upgradeStatus;
- this.indexer = indexer;
- }
-
- public void start() {
- if (shouldIndex()) {
- index();
- }
- }
-
- private boolean shouldIndex() {
- return upgradeStatus.isUpgraded() && upgradeStatus.getInitialDbVersion() < SchemaMigration.VERSION_2_13;
- }
-
- private void index() {
- TimeProfiler profiler = new TimeProfiler().start("Index projects");
- indexer.indexAll();
- profiler.stop();
- }
-
-}
import org.sonar.api.utils.ValidationMessages;
import org.sonar.api.web.*;
import org.sonar.core.i18n.RuleI18nManager;
-import org.sonar.markdown.Markdown;
import org.sonar.core.persistence.Database;
import org.sonar.core.persistence.DatabaseMigrator;
+import org.sonar.core.resource.ResourceIndexer;
+import org.sonar.markdown.Markdown;
import org.sonar.server.configuration.Backup;
import org.sonar.server.configuration.ProfilesManager;
import org.sonar.server.filters.Filter;
return i18n.getJsDictionnary(rubyLocale);
}
+ public void indexResources() {
+ getContainer().getComponentByType(ResourceIndexer.class).indexAll();
+ }
+
public void logError(String message) {
LoggerFactory.getLogger(getClass()).error(message);
}
public ComponentContainer getContainer() {
return Platform.getInstance().getContainer();
}
+
+
}
--- /dev/null
+#
+# Sonar, entreprise quality control tool.
+# Copyright (C) 2008-2011 SonarSource
+# mailto:contact AT sonarsource DOT com
+#
+# Sonar 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 3 of the License, or (at your option) any later version.
+#
+# Sonar 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 Sonar; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02
+#
+
+#
+# Note: this migration must be executed after 240_delete_resource_orphans.
+#
+# Sonar 2.13
+#
+class IndexResources < ActiveRecord::Migration
+
+ def self.up
+ Java::OrgSonarServerUi::JRubyFacade.getInstance().indexResources()
+ end
+
+end
+++ /dev/null
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2008-2011 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar 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 3 of the License, or (at your option) any later version.
- *
- * Sonar 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 Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02
- */
-package org.sonar.server.startup;
-
-import org.junit.Test;
-import org.sonar.api.platform.ServerUpgradeStatus;
-import org.sonar.core.resource.ResourceIndexer;
-import org.sonar.jpa.entity.SchemaMigration;
-
-import static org.mockito.Mockito.*;
-
-public class IndexProjectsTest {
-
- @Test
- public void doNotIndexOnFreshInstalls() {
- ResourceIndexer indexer = mock(ResourceIndexer.class);
- ServerUpgradeStatus status = mock(ServerUpgradeStatus.class);
- when(status.isUpgraded()).thenReturn(false);
- when(status.isFreshInstall()).thenReturn(true);
-
- new IndexProjects(status, indexer).start();
-
- verifyZeroInteractions(indexer);
- }
-
- @Test
- public void doNotIndexOnUpgradesSince213() {
- ResourceIndexer indexer = mock(ResourceIndexer.class);
- ServerUpgradeStatus status = mock(ServerUpgradeStatus.class);
- when(status.isUpgraded()).thenReturn(true);
- when(status.isFreshInstall()).thenReturn(false);
- when(status.getInitialDbVersion()).thenReturn(SchemaMigration.VERSION_2_13 + 10);
-
- new IndexProjects(status, indexer).start();
-
- verifyZeroInteractions(indexer);
- }
-
- @Test
- public void doIndexOnUpgradeBefore213() {
- ResourceIndexer indexer = mock(ResourceIndexer.class);
- ServerUpgradeStatus status = mock(ServerUpgradeStatus.class);
- when(status.isUpgraded()).thenReturn(true);
- when(status.isFreshInstall()).thenReturn(false);
- when(status.getInitialDbVersion()).thenReturn(SchemaMigration.VERSION_2_13 - 10);
-
- new IndexProjects(status, indexer).start();
-
- verify(indexer).indexAll();
- }
-}
projects / sonarqube.git / commitdiff