Modified: websites/staging/marmotta/trunk/content/apidocs/org/apache/marmotta/platform/user/webservices/package-use.html ============================================================================== --- websites/staging/marmotta/trunk/content/apidocs/org/apache/marmotta/platform/user/webservices/package-use.html (original) +++ websites/staging/marmotta/trunk/content/apidocs/org/apache/marmotta/platform/user/webservices/package-use.html Mon May 2 12:51:22 2016 @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_51) on Mon May 02 12:31:18 UTC 2016 --> +<!-- Generated by javadoc (version 1.7.0_51) on Mon May 02 12:43:06 UTC 2016 --> <meta http-equiv="Content-Type" content="text/html" charset="UTF-8"> <title>Uses of Package org.apache.marmotta.platform.user.webservices (Apache Marmotta Site 3.3.0 API)</title> <meta name="date" content="2016-05-02">
Modified: websites/staging/marmotta/trunk/content/apidocs/overview-frame.html ============================================================================== --- websites/staging/marmotta/trunk/content/apidocs/overview-frame.html (original) +++ websites/staging/marmotta/trunk/content/apidocs/overview-frame.html Mon May 2 12:51:22 2016 @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_51) on Mon May 02 12:31:17 UTC 2016 --> +<!-- Generated by javadoc (version 1.7.0_51) on Mon May 02 12:43:04 UTC 2016 --> <meta http-equiv="Content-Type" content="text/html" charset="UTF-8"> <title>Overview List (Apache Marmotta Site 3.3.0 API)</title> <meta name="date" content="2016-05-02"> Modified: websites/staging/marmotta/trunk/content/apidocs/overview-summary.html ============================================================================== --- websites/staging/marmotta/trunk/content/apidocs/overview-summary.html (original) +++ websites/staging/marmotta/trunk/content/apidocs/overview-summary.html Mon May 2 12:51:22 2016 @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_51) on Mon May 02 12:31:18 UTC 2016 --> +<!-- Generated by javadoc (version 1.7.0_51) on Mon May 02 12:43:06 UTC 2016 --> <meta http-equiv="Content-Type" content="text/html" charset="UTF-8"> <title>Overview (Apache Marmotta Site 3.3.0 API)</title> <meta name="date" content="2016-05-02"> Modified: websites/staging/marmotta/trunk/content/apidocs/overview-tree.html ============================================================================== --- websites/staging/marmotta/trunk/content/apidocs/overview-tree.html (original) +++ websites/staging/marmotta/trunk/content/apidocs/overview-tree.html Mon May 2 12:51:22 2016 @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_51) on Mon May 02 12:31:18 UTC 2016 --> +<!-- Generated by javadoc (version 1.7.0_51) on Mon May 02 12:43:06 UTC 2016 --> <meta http-equiv="Content-Type" content="text/html" charset="UTF-8"> <title>Class Hierarchy (Apache Marmotta Site 3.3.0 API)</title> <meta name="date" content="2016-05-02"> @@ -799,14 +799,14 @@ <ul> <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true"; title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true"; title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true"; title="class or interface in java.io">Serializable</a>) <ul> +<li type="circle">org.apache.marmotta.kiwi.generator.<a href="org/apache/marmotta/kiwi/generator/IDGeneratorType.html" title="enum in org.apache.marmotta.kiwi.generator"><span class="strong">IDGeneratorType</span></a></li> <li type="circle">org.apache.marmotta.kiwi.config.<a href="org/apache/marmotta/kiwi/config/RegistryStrategy.html" title="enum in org.apache.marmotta.kiwi.config"><span class="strong">RegistryStrategy</span></a></li> <li type="circle">org.apache.marmotta.kiwi.config.<a href="org/apache/marmotta/kiwi/config/CachingBackends.html" title="enum in org.apache.marmotta.kiwi.config"><span class="strong">CachingBackends</span></a></li> <li type="circle">org.apache.marmotta.kiwi.config.<a href="org/apache/marmotta/kiwi/config/CacheMode.html" title="enum in org.apache.marmotta.kiwi.config"><span class="strong">CacheMode</span></a></li> -<li type="circle">org.apache.marmotta.kiwi.generator.<a href="org/apache/marmotta/kiwi/generator/IDGeneratorType.html" title="enum in org.apache.marmotta.kiwi.generator"><span class="strong">IDGeneratorType</span></a></li> <li type="circle">org.apache.marmotta.ldcache.api.<a href="org/apache/marmotta/ldcache/api/LDCachingService.RefreshOpts.html" title="enum in org.apache.marmotta.ldcache.api"><span class="strong">LDCachingService.RefreshOpts</span></a></li> <li type="circle">org.apache.marmotta.platform.ldp.api.<a href="org/apache/marmotta/platform/ldp/api/LdpService.InteractionModel.html" title="enum in org.apache.marmotta.platform.ldp.api"><span class="strong">LdpService.InteractionModel</span></a></li> -<li type="circle">org.apache.marmotta.platform.security.model.<a href="org/apache/marmotta/platform/security/model/SecurityConstraint.Type.html" title="enum in org.apache.marmotta.platform.security.model"><span class="strong">SecurityConstraint.Type</span></a></li> <li type="circle">org.apache.marmotta.platform.security.model.<a href="org/apache/marmotta/platform/security/model/HTTPMethods.html" title="enum in org.apache.marmotta.platform.security.model"><span class="strong">HTTPMethods</span></a></li> +<li type="circle">org.apache.marmotta.platform.security.model.<a href="org/apache/marmotta/platform/security/model/SecurityConstraint.Type.html" title="enum in org.apache.marmotta.platform.security.model"><span class="strong">SecurityConstraint.Type</span></a></li> <li type="circle">org.apache.marmotta.platform.sparql.api.sparql.<a href="org/apache/marmotta/platform/sparql/api/sparql/QueryType.html" title="enum in org.apache.marmotta.platform.sparql.api.sparql"><span class="strong">QueryType</span></a></li> <li type="circle">org.apache.marmotta.platform.user.model.<a href="org/apache/marmotta/platform/user/model/UserAccount.PasswordHash.html" title="enum in org.apache.marmotta.platform.user.model"><span class="strong">UserAccount.PasswordHash</span></a></li> </ul> Modified: websites/staging/marmotta/trunk/content/apidocs/serialized-form.html ============================================================================== --- websites/staging/marmotta/trunk/content/apidocs/serialized-form.html (original) +++ websites/staging/marmotta/trunk/content/apidocs/serialized-form.html Mon May 2 12:51:22 2016 @@ -2,7 +2,7 @@ <!-- NewPage --> <html lang="en"> <head> -<!-- Generated by javadoc (version 1.7.0_51) on Mon May 02 12:31:17 UTC 2016 --> +<!-- Generated by javadoc (version 1.7.0_51) on Mon May 02 12:43:04 UTC 2016 --> <meta http-equiv="Content-Type" content="text/html" charset="UTF-8"> <title>Serialized Form (Apache Marmotta Site 3.3.0 API)</title> <meta name="date" content="2016-05-02"> Modified: websites/staging/marmotta/trunk/content/installation.html ============================================================================== --- websites/staging/marmotta/trunk/content/installation.html (original) +++ websites/staging/marmotta/trunk/content/installation.html Mon May 2 12:51:22 2016 @@ -513,14 +513,14 @@ export JAVA_OPTS="-Djava.net.prefer </div> <div class="section" id="docker"> <h2 id="docker">Installation (docker)</h2> -<p>If you want to run it in <a class="externalLink" href="https://www.docker.com/";>Docker</a>, there is a <a class="externalLink" href="https://hub.docker.com/r/wikier/apachemarmotta/";>public image</a> ready to use with PostgreSQL configured:</p> +<p>If you want to run it in <a class="externalLink" href="https://www.docker.com/";>Docker</a>, there is a <a class="externalLink" href="https://hub.docker.com/r/apache/marmotta/";>public image</a> ready to use with PostgreSQL configured:</p> <div class="source"> -<pre>docker pull wikier/apachemarmotta -docker run -p 8080:8080 wikier/apachemarmotta +<pre>docker pull apache/marmotta +docker run -p 8080:8080 apache/marmotta </pre></div> <p>and then access <a class="externalLink" href="http://localhost:8080/marmotta";>localhost:8080/marmotta</a>.</p> -<p>Futher details, including the <a class="externalLink" href="https://github.com/apache/marmotta/blob/develop/launchers/marmotta-webapp/Dockerfile";>Dockerfile</a>, in the <a class="externalLink" href="https://github.com/apache/marmotta/blob/develop/launchers/marmotta-webapp/README.md#docker";>source code documentation</a>.</p> +<p>Futher details, including the <a class="externalLink" href="https://github.com/apache/marmotta/blob/develop/Dockerfile";>Dockerfile</a>, in the <a class="externalLink" href="https://github.com/apache/marmotta/blob/develop/launchers/marmotta-webapp/README.md#docker";>source code documentation</a>.</p> </div> <div class="section" id="source"> <h2 id="source">Installation (source)</h2>
