implemented upgrade scripts to allow migrating to new database schema
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/01be878a Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/01be878a Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/01be878a Branch: refs/heads/develop Commit: 01be878af1581357a4e213b58e15ff819e7c1f7b Parents: 1b601c1 Author: Sebastian Schaffert <[email protected]> Authored: Fri May 24 22:06:39 2013 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Fri May 24 22:06:39 2013 +0200 ---------------------------------------------------------------------- launchers/marmotta-webapp/pom.xml | 39 +------------- .../persistence/KWRLProgramPersistenceTest.java | 2 +- .../kiwi/persistence/mysql/create_base_tables.sql | 2 +- .../org/apache/marmotta/kiwi/test/DialectTest.java | 7 ++- .../apache/marmotta/kiwi/test/PersistenceTest.java | 2 +- .../versioning/test/VersioningPersistenceTest.java | 2 +- .../backend/kiwi/test/LDCachePersistenceTest.java | 2 +- .../core/startup/MarmottaStartupService.java | 7 +++ 8 files changed, 21 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/01be878a/launchers/marmotta-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml index 002cf57..cc114a8 100644 --- a/launchers/marmotta-webapp/pom.xml +++ b/launchers/marmotta-webapp/pom.xml @@ -35,7 +35,7 @@ <properties> <!-- these are used for the goals tomcat6/7:run or jetty:run --> <marmotta.home>/tmp/marmotta</marmotta.home> - <marmotta.context>/</marmotta.context> + <marmotta.context>/marmotta</marmotta.context> <marmotta.port>8080</marmotta.port> </properties> @@ -76,19 +76,7 @@ <skip>true</skip> </configuration> </plugin> - <plugin> - <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat6-maven-plugin</artifactId> - <version>2.1</version> - <configuration> - <path>${marmotta.context}</path> - <port>${marmotta.port}</port> - <systemProperties> - <marmotta.home>${marmotta.home}</marmotta.home> - </systemProperties> - </configuration> - </plugin> - <plugin> + <plugin> <groupId>org.apache.tomcat.maven</groupId> <artifactId>tomcat7-maven-plugin</artifactId> <version>2.1</version> @@ -102,28 +90,7 @@ <!-- <backgroundProcessorDelay>10</backgroundProcessorDelay> --> </configuration> </plugin> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.10</version> - <configuration> - <contextPath>${marmotta.context}</contextPath> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>${marmotta.port}</port> - </connector> - </connectors> - <systemProperties> - <systemProperty> - <name>marmotta.home</name> - <value>${marmotta.home}</value> - </systemProperty> - </systemProperties> - <stopKey>marmotta</stopKey> - <stopPort>9999</stopPort> - </configuration> - </plugin> - </plugins> + </plugins> </pluginManagement> <resources> <resource> http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/01be878a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/persistence/KWRLProgramPersistenceTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/persistence/KWRLProgramPersistenceTest.java b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/persistence/KWRLProgramPersistenceTest.java index 4120df0..453af56 100644 --- a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/persistence/KWRLProgramPersistenceTest.java +++ b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/persistence/KWRLProgramPersistenceTest.java @@ -192,7 +192,7 @@ public class KWRLProgramPersistenceTest { Assert.assertThat(connection.getDatabaseTables(), hasItems( "reasoner_programs", "reasoner_program_namespaces", "reasoner_program_rules", "reasoner_rules", "reasoner_justifications", "reasoner_just_supp_triples", "reasoner_just_supp_rules")); - Assert.assertEquals(1, connection.getDatabaseVersion()); + Assert.assertEquals(2, connection.getDatabaseVersion()); connection.commit(); } finally { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/01be878a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/create_base_tables.sql ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/create_base_tables.sql b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/create_base_tables.sql index 9cc39d3..083e5b6 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/create_base_tables.sql +++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/create_base_tables.sql @@ -88,5 +88,5 @@ CREATE INDEX idx_namespaces_uri ON namespaces(uri); CREATE INDEX idx_namespaces_prefix ON namespaces(prefix); -- insert initial metadata -INSERT INTO metadata(mkey,mvalue) VALUES ('version','1'); +INSERT INTO metadata(mkey,mvalue) VALUES ('version','2'); INSERT INTO metadata(mkey,mvalue) VALUES ('created',DATE_FORMAT(now(),'%Y-%m-%d %H:%i:%s') ); http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/01be878a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/DialectTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/DialectTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/DialectTest.java index a7af15b..a7ad54d 100644 --- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/DialectTest.java +++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/DialectTest.java @@ -110,7 +110,12 @@ public class DialectTest { String migrateScript = dialect.getMigrationScript(1,"base"); Assert.assertNotNull(migrateScript); - Assert.assertTrue("".equals(migrateScript)); + Assert.assertFalse("".equals(migrateScript)); + + String migrateScript2 = dialect.getMigrationScript(2,"base"); + + Assert.assertNotNull(migrateScript2); + Assert.assertTrue("".equals(migrateScript2)); } http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/01be878a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java index 15f8a52..ab52451 100644 --- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java +++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java @@ -177,7 +177,7 @@ public class PersistenceTest { KiWiConnection connection = persistence.getConnection(); try { Assert.assertThat(connection.getDatabaseTables(),hasItems("nodes","triples","namespaces")); - Assert.assertEquals(1, connection.getDatabaseVersion()); + Assert.assertEquals(2, connection.getDatabaseVersion()); connection.commit(); } finally { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/01be878a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java index 9d723f3..732e424 100644 --- a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java +++ b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java @@ -175,7 +175,7 @@ public class VersioningPersistenceTest { KiWiConnection connection = vpersistence.getConnection(); try { Assert.assertThat(connection.getDatabaseTables(), hasItems("versions", "versions_added", "versions_removed")); - Assert.assertEquals(1, connection.getDatabaseVersion()); + Assert.assertEquals(2, connection.getDatabaseVersion()); connection.commit(); } finally { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/01be878a/libraries/ldcache/ldcache-backend-kiwi/src/test/java/org/apache/marmotta/ldcache/backend/kiwi/test/LDCachePersistenceTest.java ---------------------------------------------------------------------- diff --git a/libraries/ldcache/ldcache-backend-kiwi/src/test/java/org/apache/marmotta/ldcache/backend/kiwi/test/LDCachePersistenceTest.java b/libraries/ldcache/ldcache-backend-kiwi/src/test/java/org/apache/marmotta/ldcache/backend/kiwi/test/LDCachePersistenceTest.java index 27cf34c..02a0ebe 100644 --- a/libraries/ldcache/ldcache-backend-kiwi/src/test/java/org/apache/marmotta/ldcache/backend/kiwi/test/LDCachePersistenceTest.java +++ b/libraries/ldcache/ldcache-backend-kiwi/src/test/java/org/apache/marmotta/ldcache/backend/kiwi/test/LDCachePersistenceTest.java @@ -170,7 +170,7 @@ public class LDCachePersistenceTest { LDCachingKiWiPersistenceConnection connection = vpersistence.getConnection(); try { Assert.assertThat(connection.getDatabaseTables(), hasItems("ldcache_entries")); - Assert.assertEquals(1, connection.getDatabaseVersion()); + Assert.assertEquals(2, connection.getDatabaseVersion()); connection.commit(); } finally { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/01be878a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/startup/MarmottaStartupService.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/startup/MarmottaStartupService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/startup/MarmottaStartupService.java index e3523f5..23d88b2 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/startup/MarmottaStartupService.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/startup/MarmottaStartupService.java @@ -263,4 +263,11 @@ public class MarmottaStartupService { log.info("Apache Marmotta Core shutting down ..."); } + public boolean isConfigurationStarted() { + return configurationStarted; + } + + public boolean isHostStarted() { + return hostStarted; + } }
