Permalink
Browse files

Site updates

  • Loading branch information...
1 parent bf1296e commit a46110057d6f213fce1d780739b6f37b9e1e5059 @pveentjer committed Apr 8, 2012
@@ -13,5 +13,5 @@ popd
mkdir target/site/
cp -R ../multiverse-core/target/site/apidocs target/site/apidocs
-echo "Generating the webiste"
+echo "Generating the website"
groovy menu.groovy
@@ -49,7 +49,7 @@ def menus = [
new Menu(name: 'Documentation', items: [
new MenuItem(title: 'Overview', pageid: 'documentationoverview'),
- new MenuItem(title: 'Reference Manual', url: 'manual/index.html'),
+ new MenuItem(title: 'Reference Manual', url: 'manual.html'),
new MenuItem(title: 'Javadoc', url: 'apidocs/index.html')
])
]
@@ -101,4 +101,7 @@ output.text = new File("$basedir/site/style.css").text
def index = new File("$outputdirectory/index.html")
index.text = new File("$basedir/site/index.html").text
+def manual = new File("$outputdirectory/manual.html")
+manual.text = new File("$basedir/site/manual.html").text
+
println('finished')
@@ -16,7 +16,7 @@
public class Account{
private final TxnRef<Date> lastUpdate;
- private final TxnInteger balance = newTxnInteger();
+ private final TxnInteger balance;
public Account(int balance){
this.lastUpdate = newTxnRef<Date>(new Date());
@@ -1,6 +1,5 @@
<h1>Development</h1>
-On this page you can find all information related to developing Multiverse. For more information about how to set up
-your project that depends on Multiverse, check the <a href="developconfiguration.html">following</a> page.
+On this page you can find all information related to developing Multiverse.
<h2>Links</h2>
Underneath you can find the most important links:
@@ -9,17 +8,11 @@
</ul>
<h2>Building the project</h2>
-You need to install <a href="http://www.gradle.org">Gradle</a> 1.0 Milestone 9
-(<a href="http://services.gradle.org/distributions/gradle-1.0-milestone-9-bin.zip">download</a>). If you go to the root directory
-and type 'gradle -i' (the -i adds progress information) the project will automatically be compiled and the
-artifacts will also be stored in your local maven repository. Other important commands:
-<pre>
- //builds the jar from scratch (unit tests are not executed)
- gradle -i clean install
- //runs the tests
- gradle -i test
+<pre>
+ //build the project
+ mvn clean install
- //runs the integration tests (this can some time).
- gradle -i integrationtest
+ //build the project including the stresstests (the normal tests are skipped).
+ mvn -Pstresstest clean install
</pre>
@@ -27,7 +27,7 @@ <h2 id="reference.manual">Multiverse 0.7 Reference and API</h2>
And don't be scared to check out the Javadoc and source code. Understanding the source also helps to
understand how to use Multiverse more effectivly or how to extend it.
<ul>
- <li><a href="http://multiverse.codehaus.org/apidocs/">API</a> (Javadoc)</li>
+ <li><a href="http://multiverse.codehaus.org/apidocs/index.html">API</a> (Javadoc)</li>
<li><a href="http://multiverse.codehaus.org/development.html">Browse Source</a></li>
</ul>
Or check the <a href="download.html">download page</a> to download Multiverse artifacts.
@@ -1,8 +1,52 @@
<h2>Download</h2>
-<h3>Releases</h3>
Multiverse <a href="http://repository.codehaus.org/org/multiverse/multiverse-core/0.7.0/">0.7.0</a> is the most recent final release.
+<br/>
+<br/>
+To include the jar in your Maven build, add the following snippet to your pom.xml.
+
+<pre>
+ &lt;dependencies&gt;
+ &lt;dependency&gt;
+ &lt;groupId&gt;org.multiverse&lt;/groupId&gt;
+ &lt;artifactId&gt;multiverse-core&lt;/artifactId&gt;
+ &lt;version&gt;0.7.0&lt;/version&gt;
+ &lt;/dependency&gt;
+ ....
+ &lt;/dependencies&gt;
+
+ &lt;repositories&gt;
+ &lt;repository&gt;
+ &lt;id&gt;codehaus&lt;/id&gt;
+ &lt;name&gt;Codehaus Release Repo&lt;/name&gt;
+ &lt;url&gt;http://dist.codehaus.org/&lt;/url&gt;
+ &lt;/repository&gt;
+ &lt;/repositories&gt;
+</pre>
<h3>Snapshots</h3>
Multiverse <a href="http://snapshots.repository.codehaus.org/org/multiverse/multiverse-core/0.8.0-SNAPSHOT">0.8.0-SNAPSHOT</a> is the most
- recent development version.
+recent development version.
+<br/>
+<br/>
+To include the jar in your Maven build, add the following snippet to your pom.xml:
+
+<pre>
+ &lt;dependencies&gt;
+ &lt;dependency&gt;
+ &lt;groupId&gt;org.multiverse&lt;/groupId&gt;
+ &lt;artifactId&gt;multiverse-core&lt;/artifactId&gt;
+ &lt;version&gt;0.8.0-SNAPSHOT&lt;/version&gt;
+ &lt;/dependency&gt;
+ ....
+ &lt;/dependencies&gt;
+
+ &lt;repositories&gt;
+ &lt;repository&gt;
+ &lt;id&gt;codehaus-snapshot&lt;/id&gt;
+ &lt;name&gt;Codehaus Snapshot Repo&lt;/name&gt;
+ &lt;url&gt;http://snapshots.repository.codehaus.org&lt;/url&gt;
+ &lt;/repository&gt;
+ ...
+ &lt;/repositories&gt;
+</pre>
@@ -0,0 +1 @@
+Manual will follow shortly.
@@ -5,7 +5,7 @@
<ol>
<li>
<b>Language independent:</b> so it can be used without relying on instrumentation and therefore can
- easily be used with other languages that can run on the JVM like like Scala, Groovy or JRuby.
+ easily be used with other languages that can run on the JVM like Scala, Groovy or JRuby.
<li>
<b>Framework:</b> for different STM implementation. This makes it easy to experiment with new features
or build a customized STM implementation.
@@ -16,7 +16,7 @@
<h2>News</h2>
<ul>
<li>
- <b>1 May 2012: </b> release of <a href="release-0.7.html">Multiverse 0.7</a>. A complete redesign
+ <b>7 April 2012: </b> release of <a href="download.html">Multiverse 0.7.0</a>. A complete redesign
where the central clock is removed to improve scalability, a lot of performance improvements, support for
commute, ensure/privatize, atomic operations on references, isolation levels and pessimistic lock mode levels.
</li>
View
@@ -124,6 +124,7 @@
</includes>
<argLine>-Xmx256m</argLine>
<forkMode>once</forkMode>
+ <redirectTestOutputToFile>false</redirectTestOutputToFile>
</configuration>
</plugin>
</plugins>

0 comments on commit a461100

Please sign in to comment.