MARMOTTA-371: removed references to incubat(or|ing|ion)
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/1a5cd178 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/1a5cd178 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/1a5cd178 Branch: refs/heads/develop Commit: 1a5cd1780f28d47d32c456712a874776f87b0a82 Parents: cc59b55 Author: Jakob Frank <[email protected]> Authored: Fri Nov 22 13:07:45 2013 +0100 Committer: Jakob Frank <[email protected]> Committed: Fri Nov 22 14:15:10 2013 +0100 ---------------------------------------------------------------------- .../codemirror/src/main/resources/ldpath.html | 4 +- .../codemirror/src/main/resources/skwrl.html | 4 +- .../webjars/snorql/src/main/resources/snorql.js | 2 +- .../src/main/resources/images/splashscreen.png | Bin 78597 -> 69972 bytes .../src/main/resources/images/splashscreen.psd | Bin 545248 -> 398736 bytes .../src/main/resources/installer/standalone.xml | 2 +- .../splash/systray/SystrayListener.java | 4 +- .../src/main/doc/README.txt | 4 +- .../marmotta-webapp/src/main/doc/README.txt | 4 +- .../versioning/test/SnapshotRepositoryTest.java | 52 +++++++++---------- .../test/VersioningRepositoryTest.java | 16 +++--- .../kiwi/versioning/test/version-base.rdf | 4 +- .../kiwi/versioning/test/version-update1.rdf | 4 +- .../kiwi/versioning/test/version-update2.rdf | 4 +- .../ldclient/test/rdf/ohloh-marmotta.sparql | 4 +- .../src/main/doc/README.txt | 4 +- .../tests/functions/text/StringTestTest.java | 2 +- .../src/main/resources/web/admin/about.html | 2 +- .../main/resources/config-defaults.properties | 2 +- .../src/main/resources/web/admin/about.html | 2 +- 20 files changed, 60 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/extras/webjars/codemirror/src/main/resources/ldpath.html ---------------------------------------------------------------------- diff --git a/extras/webjars/codemirror/src/main/resources/ldpath.html b/extras/webjars/codemirror/src/main/resources/ldpath.html index 4a0ea12..51361e2 100644 --- a/extras/webjars/codemirror/src/main/resources/ldpath.html +++ b/extras/webjars/codemirror/src/main/resources/ldpath.html @@ -199,8 +199,8 @@ a.download:hover { <body> <h1>CodeMirror: LDPath demo</h1> <div> - Read about the <a href="http://marmotta.incubator.apache.org/ldpath/language.html"; title="LDPath">LDPath Syntax</a> - in <a href="http://marmotta.incubator.apache.org/";>Apache Marmotta</a>. + Read about the <a href="http://marmotta.apache.org/ldpath/language.html"; title="LDPath">LDPath Syntax</a> + in <a href="http://marmotta.apache.org/";>Apache Marmotta</a>. </div> <div> <button onclick="javascript:createEditor()">Editor</button> http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/extras/webjars/codemirror/src/main/resources/skwrl.html ---------------------------------------------------------------------- diff --git a/extras/webjars/codemirror/src/main/resources/skwrl.html b/extras/webjars/codemirror/src/main/resources/skwrl.html index 6ed695b..430767b 100644 --- a/extras/webjars/codemirror/src/main/resources/skwrl.html +++ b/extras/webjars/codemirror/src/main/resources/skwrl.html @@ -199,8 +199,8 @@ a.download:hover { <body> <h1>CodeMirror: SKWRL demo</h1> <div> - Read about the <a href="http://marmotta.incubator.apache.org/kiwi/reasoner.html"; title="Simple KiWi Reasoning Language">SKWRL Langugae</a> - in <a href="http://marmotta.incubator.apache.org/";>Apache Marmotta</a>. + Read about the <a href="http://marmotta.apache.org/kiwi/reasoner.html"; title="Simple KiWi Reasoning Language">SKWRL Langugae</a> + in <a href="http://marmotta.apache.org/";>Apache Marmotta</a>. </div> <div> <button onclick="javascript:createEditor()">Editor</button> http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/extras/webjars/snorql/src/main/resources/snorql.js ---------------------------------------------------------------------- diff --git a/extras/webjars/snorql/src/main/resources/snorql.js b/extras/webjars/snorql/src/main/resources/snorql.js index b1346de..67fbcb2 100644 --- a/extras/webjars/snorql/src/main/resources/snorql.js +++ b/extras/webjars/snorql/src/main/resources/snorql.js @@ -29,7 +29,7 @@ function Snorql() { // modify this._endpoint to point to your SPARQL endpoint this._endpoint = _BASIC_URL + 'sparql/select'; // modify these to your liking - this._poweredByLink = 'http://marmotta.incubator.apache.org'; + this._poweredByLink = 'http://marmotta.apache.org'; this._poweredByLabel = 'Snorql & Apache Marmotta'; this._enableNamedGraphs = false; http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/launchers/marmotta-installer/src/main/resources/images/splashscreen.png ---------------------------------------------------------------------- diff --git a/launchers/marmotta-installer/src/main/resources/images/splashscreen.png b/launchers/marmotta-installer/src/main/resources/images/splashscreen.png index 9bc4d6c..ddc4b09 100644 Binary files a/launchers/marmotta-installer/src/main/resources/images/splashscreen.png and b/launchers/marmotta-installer/src/main/resources/images/splashscreen.png differ http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/launchers/marmotta-installer/src/main/resources/images/splashscreen.psd ---------------------------------------------------------------------- diff --git a/launchers/marmotta-installer/src/main/resources/images/splashscreen.psd b/launchers/marmotta-installer/src/main/resources/images/splashscreen.psd index 5c4efc7..1801f9c 100644 Binary files a/launchers/marmotta-installer/src/main/resources/images/splashscreen.psd and b/launchers/marmotta-installer/src/main/resources/images/splashscreen.psd differ http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/launchers/marmotta-installer/src/main/resources/installer/standalone.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-installer/src/main/resources/installer/standalone.xml b/launchers/marmotta-installer/src/main/resources/installer/standalone.xml index 50d7e89..6b8c004 100644 --- a/launchers/marmotta-installer/src/main/resources/installer/standalone.xml +++ b/launchers/marmotta-installer/src/main/resources/installer/standalone.xml @@ -29,7 +29,7 @@ <appname>Apache Marmotta</appname> <appversion>${MARMOTTA_VERSION}</appversion> <appsubpath>marmotta</appsubpath> - <url>http://marmotta.incubator.apache.org</url> + <url>http://marmotta.apache.org</url> <authors> <author name="Sebastian Schaffert" email="[email protected]" /> <author name="Thomas Kurz" email="[email protected]" /> http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/launchers/marmotta-splash/src/main/java/org/apache/marmotta/splash/systray/SystrayListener.java ---------------------------------------------------------------------- diff --git a/launchers/marmotta-splash/src/main/java/org/apache/marmotta/splash/systray/SystrayListener.java b/launchers/marmotta-splash/src/main/java/org/apache/marmotta/splash/systray/SystrayListener.java index 8481aee..4ccf170 100644 --- a/launchers/marmotta-splash/src/main/java/org/apache/marmotta/splash/systray/SystrayListener.java +++ b/launchers/marmotta-splash/src/main/java/org/apache/marmotta/splash/systray/SystrayListener.java @@ -190,7 +190,7 @@ public class SystrayListener implements LifecycleListener { TaskDialogs.inform(null, "About Apache Marmotta \n", "(c)2013 The Apache Software Foundation \n" + - "Visit http://marmotta.incubator.apache.org for further details"); + "Visit http://marmotta.apache.org for further details"); } }); popup.add(about); @@ -198,7 +198,7 @@ public class SystrayListener implements LifecycleListener { MenuItem issues = createMenuItem("Issues Reports", "https://issues.apache.org/jira/browse/MARMOTTA";); popup.add(issues); - MenuItem homepage = createMenuItem("Project Homepage", "http://marmotta.incubator.apache.org";); + MenuItem homepage = createMenuItem("Project Homepage", "http://marmotta.apache.org";); popup.add(homepage); http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/launchers/marmotta-webapp-bigdata/src/main/doc/README.txt ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp-bigdata/src/main/doc/README.txt b/launchers/marmotta-webapp-bigdata/src/main/doc/README.txt index e8b47f2..739c2fc 100644 --- a/launchers/marmotta-webapp-bigdata/src/main/doc/README.txt +++ b/launchers/marmotta-webapp-bigdata/src/main/doc/README.txt @@ -15,7 +15,7 @@ However, most other servers should also work without problems. The following sections give a short introduction how to deploy the Marmotta Web Application in your server. More detailed instructions are available at: -http://marmotta.incubator.apache.org/installation.html +http://marmotta.apache.org/installation.html 1. Requirements @@ -108,4 +108,4 @@ Special note for MySQL: for legal reasons, we cannot distribute the MySQL Java drivers that are needed to access a MySQL database. In case you aim to use MySQL, please download the MySQL JDBC connector manually and place it either in the application server lib/ directory or in the WEB-INF/lib -directory of Apache Marmotta. \ No newline at end of file +directory of Apache Marmotta. http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/launchers/marmotta-webapp/src/main/doc/README.txt ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp/src/main/doc/README.txt b/launchers/marmotta-webapp/src/main/doc/README.txt index 014c7ad..b10b6a0 100644 --- a/launchers/marmotta-webapp/src/main/doc/README.txt +++ b/launchers/marmotta-webapp/src/main/doc/README.txt @@ -12,7 +12,7 @@ However, most other servers should also work without problems. The following sections give a short introduction how to deploy the Marmotta Web Application in your server. More detailed instructions are available at: -http://marmotta.incubator.apache.org/installation.html +http://marmotta.apache.org/installation.html 1. Requirements @@ -106,4 +106,4 @@ Special note for MySQL: for legal reasons, we cannot distribute the MySQL Java drivers that are needed to access a MySQL database. In case you aim to use MySQL, please download the MySQL JDBC connector manually and place it either in the application server lib/ directory or in the WEB-INF/lib -directory of Apache Marmotta. \ No newline at end of file +directory of Apache Marmotta. http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/SnapshotRepositoryTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/SnapshotRepositoryTest.java b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/SnapshotRepositoryTest.java index 0268db5..b2550f6 100644 --- a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/SnapshotRepositoryTest.java +++ b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/SnapshotRepositoryTest.java @@ -107,7 +107,7 @@ public class SnapshotRepositoryTest { RepositoryConnection connectionBase = repository.getConnection(); try { - connectionBase.add(baseData, "http://marmotta.incubator.apache.org/testing/ns1/";, RDFFormat.RDFXML); + connectionBase.add(baseData, "http://marmotta.apache.org/testing/ns1/";, RDFFormat.RDFXML); connectionBase.commit(); } finally { connectionBase.close(); @@ -125,7 +125,7 @@ public class SnapshotRepositoryTest { RepositoryConnection connectionUpdate1 = repository.getConnection(); try { - connectionUpdate1.add(update1Data, "http://marmotta.incubator.apache.org/testing/ns1/";, RDFFormat.RDFXML); + connectionUpdate1.add(update1Data, "http://marmotta.apache.org/testing/ns1/";, RDFFormat.RDFXML); connectionUpdate1.commit(); } finally { connectionUpdate1.close(); @@ -144,7 +144,7 @@ public class SnapshotRepositoryTest { RepositoryConnection connectionUpdate2 = repository.getConnection(); try { - connectionUpdate2.add(update2Data, "http://marmotta.incubator.apache.org/testing/ns1/";, RDFFormat.RDFXML); + connectionUpdate2.add(update2Data, "http://marmotta.apache.org/testing/ns1/";, RDFFormat.RDFXML); connectionUpdate2.commit(); } finally { connectionUpdate2.close(); @@ -154,12 +154,12 @@ public class SnapshotRepositoryTest { // test snapshot connection for date2 (i.e. after base import and before updates) RepositoryConnection snapshot1 = repository.getSnapshot(date2); - // query all triples for http://marmotta.incubator.apache.org/testing/ns1/R1, should be exactly 3 - List<Statement> s1_r1_triples = asList(snapshot1.getStatements(repository.getValueFactory().createURI("http://marmotta.incubator.apache.org/testing/ns1/R1";), null, null, true)); + // query all triples for http://marmotta.apache.org/testing/ns1/R1, should be exactly 3 + List<Statement> s1_r1_triples = asList(snapshot1.getStatements(repository.getValueFactory().createURI("http://marmotta.apache.org/testing/ns1/R1";), null, null, true)); Assert.assertEquals(3, s1_r1_triples.size()); - // query all triples for http://marmotta.incubator.apache.org/testing/ns1/R2, should be zero - List<Statement> s1_r2_triples = asList(snapshot1.getStatements(repository.getValueFactory().createURI("http://marmotta.incubator.apache.org/testing/ns1/R2";), null, null, true)); + // query all triples for http://marmotta.apache.org/testing/ns1/R2, should be zero + List<Statement> s1_r2_triples = asList(snapshot1.getStatements(repository.getValueFactory().createURI("http://marmotta.apache.org/testing/ns1/R2";), null, null, true)); Assert.assertEquals(0, s1_r2_triples.size()); snapshot1.commit(); @@ -168,12 +168,12 @@ public class SnapshotRepositoryTest { // test snapshot connection for date3 (i.e. after first update) RepositoryConnection snapshot2 = repository.getSnapshot(date3); - // query all triples for http://marmotta.incubator.apache.org/testing/ns1/R1, should be exactly 4 - List<Statement> s2_r1_triples = asList(snapshot2.getStatements(repository.getValueFactory().createURI("http://marmotta.incubator.apache.org/testing/ns1/R1";), null, null, true)); + // query all triples for http://marmotta.apache.org/testing/ns1/R1, should be exactly 4 + List<Statement> s2_r1_triples = asList(snapshot2.getStatements(repository.getValueFactory().createURI("http://marmotta.apache.org/testing/ns1/R1";), null, null, true)); Assert.assertEquals(3, s2_r1_triples.size()); - // query all triples for http://marmotta.incubator.apache.org/testing/ns1/R2, should be 3 - List<Statement> s2_r2_triples = asList(snapshot2.getStatements(repository.getValueFactory().createURI("http://marmotta.incubator.apache.org/testing/ns1/R2";), null, null, true)); + // query all triples for http://marmotta.apache.org/testing/ns1/R2, should be 3 + List<Statement> s2_r2_triples = asList(snapshot2.getStatements(repository.getValueFactory().createURI("http://marmotta.apache.org/testing/ns1/R2";), null, null, true)); Assert.assertEquals(3, s2_r2_triples.size()); snapshot2.commit(); @@ -183,12 +183,12 @@ public class SnapshotRepositoryTest { // test snapshot connection for now (i.e. after both updates) RepositoryConnection snapshot3 = repository.getSnapshot(new Date()); - // query all triples for http://marmotta.incubator.apache.org/testing/ns1/R1, should be exactly 4 - List<Statement> s3_r1_triples = asList(snapshot3.getStatements(repository.getValueFactory().createURI("http://marmotta.incubator.apache.org/testing/ns1/R1";), null, null, true)); + // query all triples for http://marmotta.apache.org/testing/ns1/R1, should be exactly 4 + List<Statement> s3_r1_triples = asList(snapshot3.getStatements(repository.getValueFactory().createURI("http://marmotta.apache.org/testing/ns1/R1";), null, null, true)); Assert.assertEquals(4, s3_r1_triples.size()); - // query all triples for http://marmotta.incubator.apache.org/testing/ns1/R2, should be 3 - List<Statement> s3_r2_triples = asList(snapshot3.getStatements(repository.getValueFactory().createURI("http://marmotta.incubator.apache.org/testing/ns1/R2";), null, null, true)); + // query all triples for http://marmotta.apache.org/testing/ns1/R2, should be 3 + List<Statement> s3_r2_triples = asList(snapshot3.getStatements(repository.getValueFactory().createURI("http://marmotta.apache.org/testing/ns1/R2";), null, null, true)); Assert.assertEquals(3, s3_r2_triples.size()); snapshot3.commit(); @@ -210,7 +210,7 @@ public class SnapshotRepositoryTest { RepositoryConnection connectionBase = repository.getConnection(); try { - connectionBase.add(baseData, "http://marmotta.incubator.apache.org/testing/ns1/";, RDFFormat.RDFXML); + connectionBase.add(baseData, "http://marmotta.apache.org/testing/ns1/";, RDFFormat.RDFXML); connectionBase.commit(); } finally { connectionBase.close(); @@ -228,7 +228,7 @@ public class SnapshotRepositoryTest { RepositoryConnection connectionUpdate1 = repository.getConnection(); try { - connectionUpdate1.add(update1Data, "http://marmotta.incubator.apache.org/testing/ns1/";, RDFFormat.RDFXML); + connectionUpdate1.add(update1Data, "http://marmotta.apache.org/testing/ns1/";, RDFFormat.RDFXML); connectionUpdate1.commit(); } finally { connectionUpdate1.close(); @@ -247,7 +247,7 @@ public class SnapshotRepositoryTest { RepositoryConnection connectionUpdate2 = repository.getConnection(); try { - connectionUpdate2.add(update2Data, "http://marmotta.incubator.apache.org/testing/ns1/";, RDFFormat.RDFXML); + connectionUpdate2.add(update2Data, "http://marmotta.apache.org/testing/ns1/";, RDFFormat.RDFXML); connectionUpdate2.commit(); } finally { connectionUpdate2.close(); @@ -257,12 +257,12 @@ public class SnapshotRepositoryTest { // test snapshot connection for date2 (i.e. after base import and before updates) RepositoryConnection snapshot1 = repository.getSnapshot(date2); - // query all triples for http://marmotta.incubator.apache.org/testing/ns1/R1, should be exactly 3 - BooleanQuery query1_1 = snapshot1.prepareBooleanQuery(QueryLanguage.SPARQL, "ASK { <http://marmotta.incubator.apache.org/testing/ns1/R1> ?p ?o }"); + // query all triples for http://marmotta.apache.org/testing/ns1/R1, should be exactly 3 + BooleanQuery query1_1 = snapshot1.prepareBooleanQuery(QueryLanguage.SPARQL, "ASK { <http://marmotta.apache.org/testing/ns1/R1> ?p ?o }"); Assert.assertTrue("SPARQL query for R1 did not return true", query1_1.evaluate()); - // query all triples for http://marmotta.incubator.apache.org/testing/ns1/R2, should be zero - BooleanQuery query1_2 = snapshot1.prepareBooleanQuery(QueryLanguage.SPARQL, "ASK { <http://marmotta.incubator.apache.org/testing/ns1/R2> ?p ?o }"); + // query all triples for http://marmotta.apache.org/testing/ns1/R2, should be zero + BooleanQuery query1_2 = snapshot1.prepareBooleanQuery(QueryLanguage.SPARQL, "ASK { <http://marmotta.apache.org/testing/ns1/R2> ?p ?o }"); Assert.assertFalse("SPARQL query for R2 did not return false", query1_2.evaluate()); snapshot1.commit(); @@ -271,12 +271,12 @@ public class SnapshotRepositoryTest { // test snapshot connection for date3 (i.e. after first update) RepositoryConnection snapshot2 = repository.getSnapshot(date3); - // query all triples for http://marmotta.incubator.apache.org/testing/ns1/R1, should be exactly 3 - BooleanQuery query2_1 = snapshot2.prepareBooleanQuery(QueryLanguage.SPARQL, "ASK { <http://marmotta.incubator.apache.org/testing/ns1/R1> ?p ?o }"); + // query all triples for http://marmotta.apache.org/testing/ns1/R1, should be exactly 3 + BooleanQuery query2_1 = snapshot2.prepareBooleanQuery(QueryLanguage.SPARQL, "ASK { <http://marmotta.apache.org/testing/ns1/R1> ?p ?o }"); Assert.assertTrue("SPARQL query for R1 did not return true", query2_1.evaluate()); - // query all triples for http://marmotta.incubator.apache.org/testing/ns1/R2, should be 3 - BooleanQuery query2_2 = snapshot2.prepareBooleanQuery(QueryLanguage.SPARQL, "ASK { <http://marmotta.incubator.apache.org/testing/ns1/R2> ?p ?o }"); + // query all triples for http://marmotta.apache.org/testing/ns1/R2, should be 3 + BooleanQuery query2_2 = snapshot2.prepareBooleanQuery(QueryLanguage.SPARQL, "ASK { <http://marmotta.apache.org/testing/ns1/R2> ?p ?o }"); Assert.assertTrue("SPARQL query for R2 did not return true", query2_2.evaluate()); snapshot2.commit(); http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java index a1830f7..6f2d0c0 100644 --- a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java +++ b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java @@ -110,7 +110,7 @@ public class VersioningRepositoryTest { RepositoryConnection connectionBase = repository.getConnection(); try { - connectionBase.add(baseData, "http://marmotta.incubator.apache.org/testing/ns1/";, RDFFormat.RDFXML); + connectionBase.add(baseData, "http://marmotta.apache.org/testing/ns1/";, RDFFormat.RDFXML); connectionBase.commit(); } finally { connectionBase.close(); @@ -128,7 +128,7 @@ public class VersioningRepositoryTest { RepositoryConnection connectionUpdate1 = repository.getConnection(); try { - connectionUpdate1.add(update1Data, "http://marmotta.incubator.apache.org/testing/ns1/";, RDFFormat.RDFXML); + connectionUpdate1.add(update1Data, "http://marmotta.apache.org/testing/ns1/";, RDFFormat.RDFXML); connectionUpdate1.commit(); } finally { connectionUpdate1.close(); @@ -140,7 +140,7 @@ public class VersioningRepositoryTest { RepositoryConnection connectionUpdate2 = repository.getConnection(); try { - connectionUpdate2.add(update2Data, "http://marmotta.incubator.apache.org/testing/ns1/";, RDFFormat.RDFXML); + connectionUpdate2.add(update2Data, "http://marmotta.apache.org/testing/ns1/";, RDFFormat.RDFXML); connectionUpdate2.commit(); } finally { connectionUpdate2.close(); @@ -180,7 +180,7 @@ public class VersioningRepositoryTest { RepositoryConnection connectionBase = repository.getConnection(); try { - connectionBase.add(baseData, "http://marmotta.incubator.apache.org/testing/ns1/";, RDFFormat.RDFXML); + connectionBase.add(baseData, "http://marmotta.apache.org/testing/ns1/";, RDFFormat.RDFXML); connectionBase.commit(); } finally { connectionBase.close(); @@ -198,7 +198,7 @@ public class VersioningRepositoryTest { RepositoryConnection connectionUpdate1 = repository.getConnection(); try { - connectionUpdate1.add(update1Data, "http://marmotta.incubator.apache.org/testing/ns1/";, RDFFormat.RDFXML); + connectionUpdate1.add(update1Data, "http://marmotta.apache.org/testing/ns1/";, RDFFormat.RDFXML); connectionUpdate1.commit(); } finally { connectionUpdate1.close(); @@ -210,7 +210,7 @@ public class VersioningRepositoryTest { RepositoryConnection connectionUpdate2 = repository.getConnection(); try { - connectionUpdate2.add(update2Data, "http://marmotta.incubator.apache.org/testing/ns1/";, RDFFormat.RDFXML); + connectionUpdate2.add(update2Data, "http://marmotta.apache.org/testing/ns1/";, RDFFormat.RDFXML); connectionUpdate2.commit(); } finally { connectionUpdate2.close(); @@ -220,8 +220,8 @@ public class VersioningRepositoryTest { List<Version> versions = asList(vsail.listVersions()); Assert.assertEquals("expected 3 versions!", 3, versions.size()); - URI subject = repository.getValueFactory().createURI("http://marmotta.incubator.apache.org/testing/ns1/R1";); - URI predicate = repository.getValueFactory().createURI("http://marmotta.incubator.apache.org/testing/ns1/P2";); + URI subject = repository.getValueFactory().createURI("http://marmotta.apache.org/testing/ns1/R1";); + URI predicate = repository.getValueFactory().createURI("http://marmotta.apache.org/testing/ns1/P2";); RepositoryConnection connectionBeforeRevert = repository.getConnection(); try { http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-base.rdf ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-base.rdf b/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-base.rdf index b21cdb7..5aa11aa 100644 --- a/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-base.rdf +++ b/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-base.rdf @@ -17,8 +17,8 @@ --> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:ns1="http://marmotta.incubator.apache.org/testing/ns1/";> - <ns1:C rdf:about="http://marmotta.incubator.apache.org/testing/ns1/R1";> + xmlns:ns1="http://marmotta.apache.org/testing/ns1/";> + <ns1:C rdf:about="http://marmotta.apache.org/testing/ns1/R1";> <ns1:P1>property 1 value 1</ns1:P1> <ns1:P2>property 2 value 1</ns1:P2> </ns1:C> http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update1.rdf ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update1.rdf b/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update1.rdf index d7d3ab4..9e671ef 100644 --- a/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update1.rdf +++ b/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update1.rdf @@ -17,8 +17,8 @@ --> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:ns1="http://marmotta.incubator.apache.org/testing/ns1/";> - <ns1:C rdf:about="http://marmotta.incubator.apache.org/testing/ns1/R2";> + xmlns:ns1="http://marmotta.apache.org/testing/ns1/";> + <ns1:C rdf:about="http://marmotta.apache.org/testing/ns1/R2";> <ns1:P1>property 1 value 2</ns1:P1> <ns1:P3>property 3 value 2</ns1:P3> </ns1:C> http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update2.rdf ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update2.rdf b/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update2.rdf index 913b6a3..2d50df9 100644 --- a/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update2.rdf +++ b/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update2.rdf @@ -17,8 +17,8 @@ --> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:ns1="http://marmotta.incubator.apache.org/testing/ns1/";> - <ns1:C rdf:about="http://marmotta.incubator.apache.org/testing/ns1/R1";> + xmlns:ns1="http://marmotta.apache.org/testing/ns1/";> + <ns1:C rdf:about="http://marmotta.apache.org/testing/ns1/R1";> <ns1:P3>property 3 value 1</ns1:P3> </ns1:C> http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/libraries/ldclient/ldclient-provider-rdf/src/test/resources/org/apache/marmotta/ldclient/test/rdf/ohloh-marmotta.sparql ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-rdf/src/test/resources/org/apache/marmotta/ldclient/test/rdf/ohloh-marmotta.sparql b/libraries/ldclient/ldclient-provider-rdf/src/test/resources/org/apache/marmotta/ldclient/test/rdf/ohloh-marmotta.sparql index f8d125e..0fbaf78 100644 --- a/libraries/ldclient/ldclient-provider-rdf/src/test/resources/org/apache/marmotta/ldclient/test/rdf/ohloh-marmotta.sparql +++ b/libraries/ldclient/ldclient-provider-rdf/src/test/resources/org/apache/marmotta/ldclient/test/rdf/ohloh-marmotta.sparql @@ -21,6 +21,6 @@ PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX doap: <http://usefulinc.com/ns/doap#> ASK { <http://rdfohloh.wikier.org/project/marmotta> rdf:type doap:Project ; - doap:name "Apache Marmotta (incubator)" ; - doap:homepage <http://marmotta.incubator.apache.org> . + doap:name "Apache Marmotta" ; + doap:homepage <http://marmotta.apache.org> . } http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/README.txt ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/README.txt b/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/README.txt index d772784..65968b5 100644 --- a/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/README.txt +++ b/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/README.txt @@ -31,7 +31,7 @@ java -jar ldpath-${project.version}.jar \ LDPath allows for very complex path expression. The full language documen- tation is available at: -http://marmotta.incubator.apache.org/ldpath/language.html +http://marmotta.apache.org/ldpath/language.html 2. Path Programs @@ -77,7 +77,7 @@ java -jar ldpath-${project.version}.jar \ A full list of supported providers with usage instructions is given on: -http://marmotta.incubator.apache.org/ldclient/modules.html +http://marmotta.apache.org/ldclient/modules.html http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/libraries/ldpath/ldpath-functions-text/src/test/java/org/apache/marmotta/ldpath/model/tests/functions/text/StringTestTest.java ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-functions-text/src/test/java/org/apache/marmotta/ldpath/model/tests/functions/text/StringTestTest.java b/libraries/ldpath/ldpath-functions-text/src/test/java/org/apache/marmotta/ldpath/model/tests/functions/text/StringTestTest.java index 2da31a7..bb94c40 100644 --- a/libraries/ldpath/ldpath-functions-text/src/test/java/org/apache/marmotta/ldpath/model/tests/functions/text/StringTestTest.java +++ b/libraries/ldpath/ldpath-functions-text/src/test/java/org/apache/marmotta/ldpath/model/tests/functions/text/StringTestTest.java @@ -48,7 +48,7 @@ public class StringTestTest extends AbstractTestBase { public static List<String[]> data() { return Arrays.asList( new String[] { "Welcome to The Apache Software Foundation!" }, - new String[] { "Apache Marmotta (incubator) is an Open Platform for Linked Data" } + new String[] { "Apache Marmotta is an Open Platform for Linked Data" } ); } private static Random rnd; http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/about.html ---------------------------------------------------------------------- diff --git a/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/about.html b/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/about.html index 706bfda..bfb4903 100644 --- a/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/about.html +++ b/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/about.html @@ -30,7 +30,7 @@ An Open Platform for Linked Data </h2> <p>The goal of Apache Marmotta is to provide an open implementation of a Linked Data Platform that can be used, extended, and deployed easily by organizations who want to publish Linked Data or build custom applications on Linked Data.</p> -<p>You can find more information about the project and the supported features on <a href="http://marmotta.incubator.apache.org/";>http://marmotta.incubator.apache.org</a>.</p> +<p>You can find more information about the project and the supported features on <a href="http://marmotta.apache.org/";>http://marmotta.apache.org</a>.</p> <h2> Links to common features </h2> http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/platform/marmotta-core/src/main/resources/config-defaults.properties ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/resources/config-defaults.properties b/platform/marmotta-core/src/main/resources/config-defaults.properties index 809c696..bb0390a 100644 --- a/platform/marmotta-core/src/main/resources/config-defaults.properties +++ b/platform/marmotta-core/src/main/resources/config-defaults.properties @@ -54,7 +54,7 @@ kiwi.pages.project.marmotta.footer = Copyright © 2013 The Apache Software F kiwi.pages.project.custom.logo = core/public/img/logo/custom-logo.png # lmf footer -kiwi.pages.project.custom.footer = Your Footer powered by <a href="http://marmotta.incubator.apache.org/";>Apache Marmotta</a>. +kiwi.pages.project.custom.footer = Your Footer powered by <a href="http://marmotta.apache.org/";>Apache Marmotta</a>. # supported styles kiwi.pages.style_path = core/public/style/blue/ http://git-wip-us.apache.org/repos/asf/marmotta/blob/1a5cd178/platform/marmotta-core/src/main/resources/web/admin/about.html ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/resources/web/admin/about.html b/platform/marmotta-core/src/main/resources/web/admin/about.html index 706bfda..bfb4903 100644 --- a/platform/marmotta-core/src/main/resources/web/admin/about.html +++ b/platform/marmotta-core/src/main/resources/web/admin/about.html @@ -30,7 +30,7 @@ An Open Platform for Linked Data </h2> <p>The goal of Apache Marmotta is to provide an open implementation of a Linked Data Platform that can be used, extended, and deployed easily by organizations who want to publish Linked Data or build custom applications on Linked Data.</p> -<p>You can find more information about the project and the supported features on <a href="http://marmotta.incubator.apache.org/";>http://marmotta.incubator.apache.org</a>.</p> +<p>You can find more information about the project and the supported features on <a href="http://marmotta.apache.org/";>http://marmotta.apache.org</a>.</p> <h2> Links to common features </h2>
