Author: wikier
Date: Fri Nov 22 10:49:38 2013
New Revision: 1544480

URL: http://svn.apache.org/r1544480
Log:
MARMOTTA-372: cleanning 'incubation' label from our web site

Modified:
    marmotta/site/trunk/HOWTO.txt
    marmotta/site/trunk/content/markdown/development.md
    marmotta/site/trunk/content/markdown/installation.md.vm
    marmotta/site/trunk/content/resources/doap.rdf
    marmotta/site/trunk/content/site.xml
    marmotta/site/trunk/content/templates/custom-site.vm
    marmotta/site/trunk/pom.xml

Modified: marmotta/site/trunk/HOWTO.txt
URL: 
http://svn.apache.org/viewvc/marmotta/site/trunk/HOWTO.txt?rev=1544480&r1=1544479&r2=1544480&view=diff
==============================================================================
--- marmotta/site/trunk/HOWTO.txt (original)
+++ marmotta/site/trunk/HOWTO.txt Fri Nov 22 10:49:38 2013
@@ -3,7 +3,7 @@ How to update the Marmotta website
 
 INTRO
 -----
-The http://marmotta.incubator.apache.org/ is managed by the ASF CMS
+The http://marmotta.apache.org web site is managed by the ASF CMS
 (https://cms.apache.org).
 
 All Marmotta committers have read-write access to the website content,
@@ -24,7 +24,7 @@ For help see also:
 WORKING IN SVN
 --------------
 Committing content under
-  https://svn.apache.org/repos/asf/incubator/marmotta/site/trunk
+  https://svn.apache.org/repos/asf/marmotta/site/trunk
 causes a staging build of the website to be executed.
 
 The staged content becomes available under 

Modified: marmotta/site/trunk/content/markdown/development.md
URL: 
http://svn.apache.org/viewvc/marmotta/site/trunk/content/markdown/development.md?rev=1544480&r1=1544479&r2=1544480&view=diff
==============================================================================
--- marmotta/site/trunk/content/markdown/development.md (original)
+++ marmotta/site/trunk/content/markdown/development.md Fri Nov 22 10:49:38 2013
@@ -7,12 +7,10 @@ Marmotta source code and/or contributing
 
 ## Communication
 
-The project [team](team-list.html) uses different 
-[mailing lists](http://marmotta.incubator.apache.org/mail-lists.html)
-for internal communication:
+The project [team](team-list.html) uses different [mailing 
lists](mail-lists.html) for internal communication:
 
-* Everything has to be discussed on the developer mailing list 
<[[email protected]](mailto:[email protected])>
 prior to any implementation action. If it is not on the list, it did not 
happen ([the Apache way](http://incubator.apache.org/learn/theapacheway.html)).
-* Users' support is done at the users mailing list 
<[[email protected]](mailto:[email protected])>.
+* Everything has to be discussed on the developer mailing list 
<[[email protected]](mailto:[email protected])> prior to any 
implementation action. If it is not on the list, it did not happen ([the Apache 
way](http://incubator.apache.org/learn/theapacheway.html)).
+* Users' support is done at the users mailing list 
<[[email protected]](mailto:[email protected])>.
 
 Twitter ([@ApacheMarmotta](http://twitter.com/ApacheMarmotta)) is also used, 
but more 
 for quick updates of the project and some informal communications.
@@ -27,7 +25,7 @@ and sent to the mailing list to mitigate
 The code is managed using [Git](http://git-scm.com), and you access the 
 [repository](source-repository.html) at:
 
-    git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git
+    git:https://git-wip-us.apache.org/repos/asf/marmotta.git
 
 There you would find something similar to the following structure:
 
@@ -67,7 +65,7 @@ on the right, which uses the following f
 Besides the actual code of the project, the code of this web site is also 
available, via 
 [Subversion](http://subversion.apache.org/) in this case:
 
-    svn:https://svn.apache.org/repos/asf/incubator/marmotta/site/trunk
+    svn:https://svn.apache.org/repos/asf/marmotta/site/trunk
 
 ## Versions
 

Modified: marmotta/site/trunk/content/markdown/installation.md.vm
URL: 
http://svn.apache.org/viewvc/marmotta/site/trunk/content/markdown/installation.md.vm?rev=1544480&r1=1544479&r2=1544480&view=diff
==============================================================================
--- marmotta/site/trunk/content/markdown/installation.md.vm (original)
+++ marmotta/site/trunk/content/markdown/installation.md.vm Fri Nov 22 10:49:38 
2013
@@ -141,7 +141,7 @@ To start a clean Marmotta installation.
 
 Considering you have git and maven installed, you just need to run the 
following commands:
 
-    git clone https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git 
marmotta
+    git clone https://git-wip-us.apache.org/repos/asf/marmotta.git marmotta
     cd marmotta/
     mvn clean install
 

Modified: marmotta/site/trunk/content/resources/doap.rdf
URL: 
http://svn.apache.org/viewvc/marmotta/site/trunk/content/resources/doap.rdf?rev=1544480&r1=1544479&r2=1544480&view=diff
==============================================================================
--- marmotta/site/trunk/content/resources/doap.rdf (original)
+++ marmotta/site/trunk/content/resources/doap.rdf Fri Nov 22 10:49:38 2013
@@ -23,29 +23,22 @@
          xmlns:foaf="http://xmlns.com/foaf/0.1/";
          xmlns:sioc="http://rdfs.org/sioc/ns#";>
 
-  <Project rdf:about="http://marmotta.incubator.apache.org";>
-    <name>Apache Marmotta (incubator)</name>
-    <homepage rdf:resource="http://marmotta.incubator.apache.org"; />
+  <Project rdf:about="http://marmotta.apache.org";>
+    <name>Apache Marmotta</name>
+    <homepage rdf:resource="http://marmotta.apache.org"; />
     <created>2012-12-03</created>
     <license rdf:resource="http://usefulinc.com/doap/licenses/asl20"; />
     <asfext:pmc rdf:resource="http://incubator.apache.org"; />
     <shortdesc>An Open Platform for Linked Data</shortdesc>
     <description>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</description>
     <bug-database rdf:resource="http://issues.apache.org/jira/browse/MARMOTTA"; 
/>
-    <mailing-list 
rdf:resource="http://marmotta.incubator.apache.org/mail-lists.html"; />
-    <download-page 
rdf:resource="http://marmotta.incubator.apache.org/download.html"; />
+    <mailing-list rdf:resource="http://marmotta.iapache.org/mail-lists.html"; />
+    <download-page rdf:resource="http://marmotta.apache.org/download.html"; />
     <programming-language>Java</programming-language>
     <owl:sameAs rdf:resource="http://rdfohloh.wikier.org/project/marmotta"; />
 
     <developer>
       <foaf:Person>
-        <foaf:name>Andy Seaborne</foaf:name>
-        <foaf:mbox rdf:resource="mailto:[email protected]"/>
-        <foaf:homepage rdf:resource="http://twitter.com/AndySeaborne"/>
-      </foaf:Person>
-    </developer>
-    <developer>
-      <foaf:Person>
         <foaf:name>Dietmar Glachs</foaf:name>
         <foaf:mbox rdf:resource="mailto:[email protected]"/>
       </foaf:Person>
@@ -105,6 +98,12 @@
         <foaf:mbox rdf:resource="mailto:[email protected]"/>
       </foaf:Person>
     </developer>
+    <developer>
+      <foaf:Person>
+        <foaf:name>Peter Ansell</foaf:name>
+        <foaf:mbox rdf:resource="mailto:[email protected]"/>
+      </foaf:Person>
+    </developer>
     
     <release>
       <Version>
@@ -126,7 +125,16 @@
         <asfext:title>Linked Data Platform</asfext:title>
         <asfext:body>W3C</asfext:body>
         <asfext:id>ldp</asfext:id>
-        <asfext:url rdf:resource="http://www.w3.org/TR/ldp/"/>
+        <asfext:url rdf:resource="http://www.w3.org/TR/ldp/"; />
+      </asfext:Standard>
+    </asfext:implements>
+
+    <asfext:implements>
+      <asfext:Standard>
+        <asfext:title>SPARQL 1.1</asfext:title>
+        <asfext:body>W3C</asfext:body>
+        <asfext:id>sparql</asfext:id>
+        <asfext:url rdf:resource="http://www.w3.org/TR/sparql11-overview/"; />
       </asfext:Standard>
     </asfext:implements>
 

Modified: marmotta/site/trunk/content/site.xml
URL: 
http://svn.apache.org/viewvc/marmotta/site/trunk/content/site.xml?rev=1544480&r1=1544479&r2=1544480&view=diff
==============================================================================
--- marmotta/site/trunk/content/site.xml (original)
+++ marmotta/site/trunk/content/site.xml Fri Nov 22 10:49:38 2013
@@ -19,7 +19,7 @@
          name="Apache Marmotta">
     
     <bannerRight>
-        <name>Apache Marmotta (incubating)</name>
+        <name>Apache Marmotta</name>
         <src>/images/Marmotta_GraduationLogo_250x102.png</src>
     </bannerRight>  
 
@@ -32,13 +32,13 @@
     <custom>
         <meta>
             <description>Apache Marmotta - An Open Platform for Linked 
Data</description>
-            <keywords>Apache Marmotta, Linked Data, LDP, LDC</keywords>
+            <keywords>Apache Marmotta, Linked Data, LDP, LDC, SPARQL</keywords>
         </meta>
         <fluidoSkin>
             <topBarEnabled>true</topBarEnabled>
             <topBarIcon>
-                <name>Apache Marmotta (incubating)</name>
-                <alt>Apache Marmotta (incubating)</alt>
+                <name>Apache Marmotta</name>
+                <alt>Apache Marmotta</alt>
                 <src>/images/Marmotta_Head.png</src>
                 <href>/</href>
             </topBarIcon>
@@ -131,7 +131,6 @@
         <menu name="Project" ref="reports" inherit="top" />
         <menu name="The ASF">
             <item name="The Apache Software Foundation" 
href="http://www.apache.org"; />
-            <item name="Apache Incubator" href="http://incubator.apache.org"; />
             <item name="How Apache Works" 
href="http://www.apache.org/foundation/how-it-works.html"; />
             <item name="Security" href="http://www.apache.org/security/"; />
             <item name="Become a Sponsor" 
href="http://www.apache.org/foundation/sponsorship.html"; />

Modified: marmotta/site/trunk/content/templates/custom-site.vm
URL: 
http://svn.apache.org/viewvc/marmotta/site/trunk/content/templates/custom-site.vm?rev=1544480&r1=1544479&r2=1544480&view=diff
==============================================================================
--- marmotta/site/trunk/content/templates/custom-site.vm (original)
+++ marmotta/site/trunk/content/templates/custom-site.vm Fri Nov 22 10:49:38 
2013
@@ -1078,7 +1078,6 @@
 
         #if ( !$sideBarEnabled )
         <p id="poweredBy" class="pull-right">
-          #incubatorLogo()
           #builtByLogo( $decoration.poweredBy )
         </p>
         #end

Modified: marmotta/site/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/marmotta/site/trunk/pom.xml?rev=1544480&r1=1544479&r2=1544480&view=diff
==============================================================================
--- marmotta/site/trunk/pom.xml (original)
+++ marmotta/site/trunk/pom.xml Fri Nov 22 10:49:38 2013
@@ -672,9 +672,9 @@
     </organization>
 
     <scm>
-        
<url>https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</url>
-        
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</connection>
-        
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</developerConnection>
+        <url>https://git-wip-us.apache.org/repos/asf/marmotta.git</url>
+        
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/marmotta.git</connection>
+        
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/marmotta.git</developerConnection>
     </scm>
 
     <issueManagement>
@@ -688,7 +688,7 @@
         <notifiers>
             <notifier>
                 <type>mail</type>
-                <address>[email protected]</address>
+                <address>[email protected]</address>
                 <configuration />
             </notifier>
         </notifiers>


Reply via email to