You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by bu...@apache.org on 2013/02/20 15:12:34 UTC
svn commit: r851286 - in /websites/staging/marmotta/trunk/content: ./
dependencies.html installation.html rat-report.html
Author: buildbot
Date: Wed Feb 20 14:12:33 2013
New Revision: 851286
Log:
Staging update by buildbot for marmotta
Modified:
websites/staging/marmotta/trunk/content/ (props changed)
websites/staging/marmotta/trunk/content/dependencies.html
websites/staging/marmotta/trunk/content/installation.html
websites/staging/marmotta/trunk/content/rat-report.html
Propchange: websites/staging/marmotta/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Feb 20 14:12:33 2013
@@ -1 +1 @@
-1448160
+1448175
Modified: websites/staging/marmotta/trunk/content/dependencies.html
==============================================================================
--- websites/staging/marmotta/trunk/content/dependencies.html (original)
+++ websites/staging/marmotta/trunk/content/dependencies.html Wed Feb 20 14:12:33 2013
@@ -183,8 +183,8 @@
}
}
</script>
-<a name="Dependency_Tree"></a><div class="section"><h3>Dependency Tree<a name="Dependency_Tree"></a></h3><ul><li>org.apache.marmotta:marmotta-site:pom:3.0.0-incubating-SNAPSHOT <img id="_275702169" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_1022103826', '_275702169' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_1022103826" style="display:none"><table border="0" class="table table-striped"><tr class="a"><th>Apache Marmotta Site</th></tr><tr class="b"><td><p><b>Description: </b>Files for the Marmotta site (Apache CMS)</p><p><b>URL: </b><a class="externalLink" href="http://marmotta.incubator.apache.org">http://marmotta.incubator.apache.org</a></p><p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache Software License, Version 2.0</a></p></td></tr></table></div><ul><li>org.apache.marmotta:marmotta-reactor:pom:3.0.0-incubating-SNAPSHOT (compile) <img id="_
1636598403" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_752976836', '_1636598403' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_752976836" style="display:none"><table border="0" class="table table-striped"><tr class="a"><th>Apache Marmotta</th></tr><tr class="b"><td><p><b>Description: </b>Open implementation of the Linked Data Platform</p><p><b>URL: </b><a class="externalLink" href="http://marmotta.incubator.apache.org">http://marmotta.incubator.apache.org</a></p><p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0">Apache Software License, Version 2.0</a></p></td></tr></table></div></li><li>javax.servlet:servlet-api:jar:2.5 (provided) <img id="_1529693499" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_356862137', '_1529693499' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_356862137" style="displa
y:none"><table border="0" class="table table-striped"><tr class="a"><th>servlet-api</th></tr><tr class="b"><td><p><b>Description: </b>There is currently no description associated with this project.</p><p><b>Project License: </b>No license is defined for this project.</p></td></tr></table></div></li><li>junit:junit:jar:4.11 (test) <img id="_667582294" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_1619712563', '_667582294' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_1619712563" style="display:none"><table border="0" class="table table-striped"><tr class="a"><th>JUnit</th></tr><tr class="b"><td><p><b>Description: </b>JUnit is a regression testing framework written by Erich Gamma and Kent Beck.
- It is used by the developer who implements unit tests in Java.</p><p><b>URL: </b><a class="externalLink" href="http://junit.org">http://junit.org</a></p><p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li><li>org.hamcrest:hamcrest-library:jar:1.3 (test) <img id="_657958829" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_1986989365', '_657958829' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_1986989365" style="display:none"><table border="0" class="table table-striped"><tr class="a"><th>Hamcrest library</th></tr><tr class="b"><td><p><b>Description: </b>Hamcrest library of matcher implementations.</p><p><b>URL: </b><a class="externalLink" href="https://github.com/hamcrest/JavaHamcrest/hamcrest-library">https://github.com/hamcrest/JavaHamcrest/hamcrest-library</a></p><p><b>Project Licen
se: </b><a class="externalLink" href="http://www.opensource.org/licenses/bsd-license.php">New BSD License</a></p></td></tr></table></div></li><li>org.hamcrest:hamcrest-core:jar:1.3 (test) <img id="_1872718545" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_1171972484', '_1872718545' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_1171972484" style="display:none"><table border="0" class="table table-striped"><tr class="a"><th>Hamcrest Core</th></tr><tr class="b"><td><p><b>Description: </b>This is the core API of hamcrest matcher framework to be used by third-party framework providers. This includes the a foundation set of matcher implementations for common operations.</p><p><b>URL: </b><a class="externalLink" href="https://github.com/hamcrest/JavaHamcrest/hamcrest-core">https://github.com/hamcrest/JavaHamcrest/hamcrest-core</a></p><p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/l
icenses/bsd-license.php">New BSD License</a></p></td></tr></table></div></li></ul></li></ul></div></div><a name="Licenses"></a><div class="section"><h2>Licenses<a name="Licenses"></a></h2><p><b>Apache Software License, Version 2.0: </b>Apache Marmotta, Apache Marmotta Site</p><p><b>New BSD License: </b>Hamcrest Core, Hamcrest library</p><p><b>Unknown: </b>servlet-api</p><p><b>Common Public License Version 1.0: </b>JUnit</p></div><a name="Dependency_File_Details"></a><div class="section"><h2>Dependency File Details<a name="Dependency_File_Details"></a></h2><table border="0" class="table table-striped"><tr class="a"><th>Filename</th><th>Size</th><th>Entries</th><th>Classes</th><th>Packages</th><th>JDK Rev</th><th>Debug</th></tr><tr class="b"><td>servlet-api-2.5.jar</td><td>102.65 kB</td><td>68</td><td>42</td><td>2</td><td>1.5</td><td>debug</td></tr><tr class="a"><td>junit-4.11.jar</td><td>239.30 kB</td><td>266</td><td>233</td><td>28</td><td>1.5</td><td>debug</td></tr><tr class
="b"><td>marmotta-reactor-3.0.0-incubating-SNAPSHOT.pom</td><td>9.62 kB</td><td>-</td><td>-</td><td>-</td><td>-</td><td>-</td></tr><tr class="a"><td>hamcrest-core-1.3.jar</td><td>43.97 kB</td><td>52</td><td>45</td><td>3</td><td>1.5</td><td>debug</td></tr><tr class="b"><td>hamcrest-library-1.3.jar</td><td>51.83 kB</td><td>46</td><td>35</td><td>7</td><td>1.5</td><td>debug</td></tr><tr class="a"><th>Total</th><th>Size</th><th>Entries</th><th>Classes</th><th>Packages</th><th>JDK Rev</th><th>Debug</th></tr><tr class="b"><td>5</td><td>447.36 kB</td><td>432</td><td>355</td><td>40</td><td>1.5</td><td>4</td></tr><tr class="a"><td>compile: 1</td><td>compile: 9.62 kB</td><td>-</td><td>-</td><td>-</td><td>-</td><td>-</td></tr><tr class="b"><td>test: 3</td><td>test: 335.09 kB</td><td>test: 364</td><td>test: 313</td><td>test: 38</td><td>-</td><td>test: 3</td></tr><tr class="a"><td>provided: 1</td><td>provided: 102.65 kB</td><td>provided: 68</td><td>provided: 42</td><td>provided: 2</td><td
>-</td><td>provided: 1</td></tr></table></div>
+<a name="Dependency_Tree"></a><div class="section"><h3>Dependency Tree<a name="Dependency_Tree"></a></h3><ul><li>org.apache.marmotta:marmotta-site:pom:3.0.0-incubating-SNAPSHOT <img id="_1536348352" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_488303237', '_1536348352' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_488303237" style="display:none"><table border="0" class="table table-striped"><tr class="a"><th>Apache Marmotta Site</th></tr><tr class="b"><td><p><b>Description: </b>Files for the Marmotta site (Apache CMS)</p><p><b>URL: </b><a class="externalLink" href="http://marmotta.incubator.apache.org">http://marmotta.incubator.apache.org</a></p><p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache Software License, Version 2.0</a></p></td></tr></table></div><ul><li>org.apache.marmotta:marmotta-reactor:pom:3.0.0-incubating-SNAPSHOT (compile) <img id="_
947940191" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_973553477', '_947940191' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_973553477" style="display:none"><table border="0" class="table table-striped"><tr class="a"><th>Apache Marmotta</th></tr><tr class="b"><td><p><b>Description: </b>Open implementation of the Linked Data Platform</p><p><b>URL: </b><a class="externalLink" href="http://marmotta.incubator.apache.org">http://marmotta.incubator.apache.org</a></p><p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0">Apache Software License, Version 2.0</a></p></td></tr></table></div></li><li>javax.servlet:servlet-api:jar:2.5 (provided) <img id="_1073130790" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_1138216084', '_1073130790' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_1138216084" style="displa
y:none"><table border="0" class="table table-striped"><tr class="a"><th>servlet-api</th></tr><tr class="b"><td><p><b>Description: </b>There is currently no description associated with this project.</p><p><b>Project License: </b>No license is defined for this project.</p></td></tr></table></div></li><li>junit:junit:jar:4.11 (test) <img id="_1719336081" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_1622708347', '_1719336081' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_1622708347" style="display:none"><table border="0" class="table table-striped"><tr class="a"><th>JUnit</th></tr><tr class="b"><td><p><b>Description: </b>JUnit is a regression testing framework written by Erich Gamma and Kent Beck.
+ It is used by the developer who implements unit tests in Java.</p><p><b>URL: </b><a class="externalLink" href="http://junit.org">http://junit.org</a></p><p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li><li>org.hamcrest:hamcrest-library:jar:1.3 (test) <img id="_1975922867" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_1978017772', '_1975922867' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_1978017772" style="display:none"><table border="0" class="table table-striped"><tr class="a"><th>Hamcrest library</th></tr><tr class="b"><td><p><b>Description: </b>Hamcrest library of matcher implementations.</p><p><b>URL: </b><a class="externalLink" href="https://github.com/hamcrest/JavaHamcrest/hamcrest-library">https://github.com/hamcrest/JavaHamcrest/hamcrest-library</a></p><p><b>Project Lic
ense: </b><a class="externalLink" href="http://www.opensource.org/licenses/bsd-license.php">New BSD License</a></p></td></tr></table></div></li><li>org.hamcrest:hamcrest-core:jar:1.3 (test) <img id="_1919239934" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_444842630', '_1919239934' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_444842630" style="display:none"><table border="0" class="table table-striped"><tr class="a"><th>Hamcrest Core</th></tr><tr class="b"><td><p><b>Description: </b>This is the core API of hamcrest matcher framework to be used by third-party framework providers. This includes the a foundation set of matcher implementations for common operations.</p><p><b>URL: </b><a class="externalLink" href="https://github.com/hamcrest/JavaHamcrest/hamcrest-core">https://github.com/hamcrest/JavaHamcrest/hamcrest-core</a></p><p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/l
icenses/bsd-license.php">New BSD License</a></p></td></tr></table></div></li></ul></li></ul></div></div><a name="Licenses"></a><div class="section"><h2>Licenses<a name="Licenses"></a></h2><p><b>Apache Software License, Version 2.0: </b>Apache Marmotta, Apache Marmotta Site</p><p><b>New BSD License: </b>Hamcrest Core, Hamcrest library</p><p><b>Unknown: </b>servlet-api</p><p><b>Common Public License Version 1.0: </b>JUnit</p></div><a name="Dependency_File_Details"></a><div class="section"><h2>Dependency File Details<a name="Dependency_File_Details"></a></h2><table border="0" class="table table-striped"><tr class="a"><th>Filename</th><th>Size</th><th>Entries</th><th>Classes</th><th>Packages</th><th>JDK Rev</th><th>Debug</th></tr><tr class="b"><td>servlet-api-2.5.jar</td><td>102.65 kB</td><td>68</td><td>42</td><td>2</td><td>1.5</td><td>debug</td></tr><tr class="a"><td>junit-4.11.jar</td><td>239.30 kB</td><td>266</td><td>233</td><td>28</td><td>1.5</td><td>debug</td></tr><tr class
="b"><td>marmotta-reactor-3.0.0-incubating-SNAPSHOT.pom</td><td>9.62 kB</td><td>-</td><td>-</td><td>-</td><td>-</td><td>-</td></tr><tr class="a"><td>hamcrest-core-1.3.jar</td><td>43.97 kB</td><td>52</td><td>45</td><td>3</td><td>1.5</td><td>debug</td></tr><tr class="b"><td>hamcrest-library-1.3.jar</td><td>51.83 kB</td><td>46</td><td>35</td><td>7</td><td>1.5</td><td>debug</td></tr><tr class="a"><th>Total</th><th>Size</th><th>Entries</th><th>Classes</th><th>Packages</th><th>JDK Rev</th><th>Debug</th></tr><tr class="b"><td>5</td><td>447.36 kB</td><td>432</td><td>355</td><td>40</td><td>1.5</td><td>4</td></tr><tr class="a"><td>compile: 1</td><td>compile: 9.62 kB</td><td>-</td><td>-</td><td>-</td><td>-</td><td>-</td></tr><tr class="b"><td>test: 3</td><td>test: 335.09 kB</td><td>test: 364</td><td>test: 313</td><td>test: 38</td><td>-</td><td>test: 3</td></tr><tr class="a"><td>provided: 1</td><td>provided: 102.65 kB</td><td>provided: 68</td><td>provided: 42</td><td>provided: 2</td><td
>-</td><td>provided: 1</td></tr></table></div>
</div>
</div>
Modified: websites/staging/marmotta/trunk/content/installation.html
==============================================================================
--- websites/staging/marmotta/trunk/content/installation.html (original)
+++ websites/staging/marmotta/trunk/content/installation.html Wed Feb 20 14:12:33 2013
@@ -181,14 +181,59 @@
<li>on Windows, these can be found in the Start Menu under Apache -> Marmotta</li>
<li>on Linux, these are created on the desktop and also in the Applications menu under Apache Marmotta</li>
<li>on MacOS, there are two actions Start Marmotta and Shutdown Marmotta in the program folder of the Marmotta installation</li>
-</ul><p>After installation, you can access the administration interface of Marmottta by pointing your browser to <a class="externalLink" href="http://localhost:8080/">http://localhost:8080/</a> or by clicking on the Marmotta systray icon and selecting Administration from the menu.</p><h1>Installation (binary)</h1><p>@@TODO@@</p><h1>Installation (maven)</h1><p>@@TODO@@</p><h1>Installation (source)</h1><p>Considering you have git and maven installed, you just need to run the following commands:</p>
+</ul><p>After installation, you can access the administration interface of Marmottta by pointing your browser to <a class="externalLink" href="http://localhost:8080/">http://localhost:8080/</a> or by clicking on the Marmotta systray icon and selecting Administration from the menu.</p></div><div class="section"><h2>Installation (binary)<a name="Installation_binary"></a></h2><p>The binary installation comes as a Java Web Archive (<tt>.war</tt>) file that can be deployed in any JavaEE application server. The deployment procedure is as follows:</p>
+<ol style="list-style-type: decimal">
+ <li>Download and install the application server (Tomcat 7.0.x or Jetty 6.x) and the database you intend to use (optional, default is H2 embedded)</li>
+ <li>Set the environment variable <tt>LMF_HOME</tt> to the directory that will be used for storing the persistent runtime data of Marmotta</li>
+ <li>Deploy the <tt>.war</tt> file into the application server, copyint into deployment directory (Tomcat and Jetty: the <tt>webapps</tt> subdirectory) or whatever method provided</li>
+ <li>Startup the application server and go to the deployment URL with a web browser (e.g. <a class="externalLink" href="http://localhost:8080)">http://localhost:8080)</a>. Marmotta will then carry out initial setup, using an embedded H2 database by default. The default interface will also contain links to the admin area and API documentation.</li>
+ <li>(OPTIONAL) If you do not want to use H2, go to the admin interface and configure the database according to your own preferences. It is recommended that you restart the application server when you have done so.</li>
+</ol><p>To avoid setting the environment variable <tt>LMF_HOME</tt> every time you open a new terminal, you can also enter it persistently by adding the following lines to catalina.sh (Unix):</p>
+<div class="source"><pre class="prettyprint">export LMF_HOME=<PATH-TO-HOME>
+export JAVA_OPTS="-Djava.net.preferIPv4Stack=true -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError"
+</pre></div><p>The latter option will give more memory to Marmotta; you can even increase the value of 1024 to something higher as needed.</p><div class="section"><h3>Specific Settings for Tomcat<a name="Specific_Settings_for_Tomcat"></a></h3><p>In production environments, Apache Tomcat will be the application server of choice. This is a collection of issues arising with Tomcat installations.</p><div class="section"><h4>Tomcat Versions<a name="Tomcat_Versions"></a></h4><p>Tomcat 6.0.x used to be significantly faster and reliable, but that is not true anymore. So we strongly recommend to use Tomcat 7.0.x, precisely we recommend to use Tomcat >= 7.0.35 to work with Marmotta.</p></div><div class="section"><h4>Multiple instances<a name="Multiple_instances"></a></h4><p>In some settings it might be desirable to set up multiple instances of Marmotta in a shared application server installation under different contexts. This can be achieved by creating context definition files und
er <tt>conf/Catalina/localhost/{NAME}.xml</tt>, where <tt>{NAME}.xml</tt> is a context configuration file. {NAME}` is the name of the web application, e.g. marmotta or myapp. The file will contain a configuration similar to the following:</p>
+<div class="source"><pre class="prettyprint"><Context docBase="/path/to/marmotta.war" unpackWAR="false" useNaming="true">
+
+ <Parameter name="kiwi.home" value="/data/instances/lmf" override="false"/>
+
+ <Resource name="BeanManager" auth="Container"
+ type="javax.enterprise.inject.spi.BeanManager"
+ factory="org.jboss.weld.resources.ManagerObjectFactory"
+ />
+
+</Context>
+</pre></div><p>Where:</p>
+<ul>
+ <li><p>The <tt>docBase</tt> attribute specifies the location of the WAR file of Marmotta in case it is not located in the <tt>webapps</tt> directory.</p></li>
+ <li><p>The value of the parameter <tt>kiwi.home</tt> provides the location of Marmotta home directory (for <a class="externalLink" href="http://code.google.com/p/lmf/wiki/VersionNumbering">historical reasons</a> called <tt>kiwi.home</tt>). </p></li>
+ <li><p>The Resource registers a factory for creating the Java EE 6 Bean Manager. This entry will typically remain unchanged, but it is necessary for the system to work properly.</p></li>
+</ul></div></div><div class="section"><h3>Specific Settings for Jetty<a name="Specific_Settings_for_Jetty"></a></h3><p>Marmotta uses JNDI for looking up services. While most application servers have this enabled by default, Jetty needs a little bit of setup to enable JNDI functionality. The procedure is <a class="externalLink" href="http://docs.codehaus.org/display/JETTY/JNDI">described in the Jetty Documentation</a>.</p><p>In short, what you need to do is to copy the plus-settings from the <tt>jetty-plus.xml</tt> file to the <tt>jetty.xml</tt> file:</p>
+<div class="source"><pre class="prettyprint"><Array id="plusConfig" type="java.lang.String">
+ <Item>org.mortbay.jetty.webapp.WebInfConfiguration</Item>
+ <Item>org.mortbay.jetty.plus.webapp.EnvConfiguration</Item>
+ <Item>org.mortbay.jetty.plus.webapp.Configuration</Item>
+ <Item>org.mortbay.jetty.webapp.JettyWebXmlConfiguration</Item>
+ <Item>org.mortbay.jetty.webapp.TagLibConfiguration</Item>
+</Array>
+</pre></div><p>and then add the option</p>
+<div class="source"><pre class="prettyprint"><Set name="configurationClasses"><Ref id="plusConfig"/></Set>
+</pre></div><p>to the call of <tt>org.mortbay.jetty.deployer.WebAppDeployer</tt> (search <tt>jetty.xml</tt> for it).</p></div></div><div class="section"><h2>Installation (maven)<a name="Installation_maven"></a></h2><p>It is easy to build custom projects based on the Marmotta using a Maven archetype. To create a custom project, simply run the following command and enter the base information when prompted:</p>
+<div class="source"><pre class="prettyprint">mvn archetype:generate
+ -DarchetypeGroupId=org.apache.marmotta
+ -DarchetypeArtifactId=marmotta-archetype-webapp
+ -DarchetypeVersion=3.0.0-incubating-SNAPSHOT
+</pre></div><p>Afterwards, change to the newly created project directory and run:</p>
+<div class="source"><pre class="prettyprint">mvn clean tomcat7:run
+</pre></div><p>To start a clean Marmotta installation.</p></div><div class="section"><h2>Installation (source)<a name="Installation_source"></a></h2><p>Considering you have git and maven installed, you just need to run the following commands:</p>
<div class="source"><pre class="prettyprint">git clone https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git marmotta
-cd marmotta
+cd marmotta/
mvn clean install
+</pre></div><p>In case you would need a quick build, you may want to avoid running tests:</p>
+<div class="source"><pre class="prettyprint">mvn clean install -DskipTests -Dmaven.test.skip=true
</pre></div><p>And then youd have all artifact installed in your local Maven repository. Therefore you would be able to run the webapp launcher:</p>
-<div class="source"><pre class="prettyprint">cd launchers/webapp
+<div class="source"><pre class="prettyprint">cd launchers/marmotta-webapp/
mvn tomcat7:run
-</pre></div><p>This will launch Marmotta on an embedded Tomcat running at <a class="externalLink" href="http://localhost:8080/">http://localhost:8080/</a>.</p></div>
+</pre></div><p>This will launch Marmotta in an embedded Tomcat server running at <a class="externalLink" href="http://localhost:8080/">http://localhost:8080/</a>.</p></div>
</div>
</div>
Modified: websites/staging/marmotta/trunk/content/rat-report.html
==============================================================================
--- websites/staging/marmotta/trunk/content/rat-report.html (original)
+++ websites/staging/marmotta/trunk/content/rat-report.html Wed Feb 20 14:12:33 2013
@@ -170,7 +170,7 @@
*****************************************************
Summary
-------
-Generated at: 2013-02-20T13:34:53+00:00
+Generated at: 2013-02-20T14:12:30+00:00
Notes: 2
Binaries: 1
Archives: 0
@@ -365,19 +365,19 @@ Marmotta:
* on Linux, these are created on the desktop and also in the Applications menu under "Apache Marmotta"
* on MacOS, there are two actions "Start Marmotta" and "Shutdown Marmotta" in the program folder of the Marmotta installation
-After installation, you can access the administration interface of Marmottta by pointing your browser to
-[http://localhost:8080/](http://localhost:8080/) or by clicking on the Marmotta systray icon and selecting
-"Administration" from the menu.
-
-# Installation (binary)
-
-@@TODO@@
-
-# Installation (maven)
-
-@@TODO@@
-
-# Installation (source)
+After installation, you can access the administration interface of Marmottta by pointing your
+browser to [http://localhost:8080/](http://localhost:8080/) or by clicking on the Marmotta
+systray icon and selecting "Administration" from the menu.
+
+## Installation (binary)
+
+The binary installation comes as a Java Web Archive (`.war`) file that can be deployed in any
+JavaEE application server. The deployment procedure is as follows:
+
+1. Download and install the application server (Tomcat 7.0.x or Jetty 6.x) and the database you intend to use (optional, default is H2 embedded)
+2. Set the environment variable `LMF_HOME` to the directory that will be used for storing the persistent runtime data of Marmotta
+3. Deploy the `.war` file into the application server, copyint into deployment directory (Tomcat and Jetty: the `webapps` subdirectory) or whatever method provided
+4. Startup the application server and go to the deployment URL with a web browser (e.g. http://localhost:8080). Marmotta will then carry out initial setup, using an embedded H2 database by default. The default interface will also contain links to the admin area and API documentation.
=======================================================================
==content/resources/css/site.css