You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/07/09 15:49:54 UTC
[4/5] isis-site git commit: ISIS-1133: web.xml
ISIS-1133: web.xml
Project: http://git-wip-us.apache.org/repos/asf/isis-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis-site/commit/ddab015d
Tree: http://git-wip-us.apache.org/repos/asf/isis-site/tree/ddab015d
Diff: http://git-wip-us.apache.org/repos/asf/isis-site/diff/ddab015d
Branch: refs/heads/asf-site
Commit: ddab015dc93dcb2fdc4591b8e5ea5b7317cb1c4b
Parents: 8f4afa1
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jul 9 13:48:22 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jul 9 13:48:22 2015 +0100
----------------------------------------------------------------------
content/editor-templates.html | 10 +-
content/guides/dg.html | 44 +-
content/guides/images/runtime/web-xml/key.png | Bin 0 -> 3195 bytes
.../guides/images/runtime/web-xml/parts.pptx | Bin 0 -> 72386 bytes
.../guides/images/runtime/web-xml/ro-only.png | Bin 0 -> 17937 bytes
.../images/runtime/web-xml/wicket-and-ro.png | Bin 0 -> 32723 bytes
.../images/runtime/web-xml/wicket-only.png | Bin 0 -> 16617 bytes
content/guides/rg.html | 3776 +++++++++++++-----
content/guides/ug.html | 2325 +++--------
content/migration-notes.html | 2 +-
content/support.html | 2 +-
11 files changed, 3526 insertions(+), 2633 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis-site/blob/ddab015d/content/editor-templates.html
----------------------------------------------------------------------
diff --git a/content/editor-templates.html b/content/editor-templates.html
index 1132888..181405e 100644
--- a/content/editor-templates.html
+++ b/content/editor-templates.html
@@ -535,10 +535,10 @@ table.CodeRay td.code>pre{padding:0}
<p>ju</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="./resources/templates/junit-templates-idea.xml">Download</a></p>
+<p><a href="./resources/templates/junit4-templates-idea.xml">Download</a></p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="./resources/templates/junit-templates.xml">Download</a></p>
+<p><a href="./resources/templates/junit4-templates.xml">Download</a></p>
</div></div></td>
</tr>
<tr>
@@ -546,13 +546,13 @@ table.CodeRay td.code>pre{padding:0}
<p>JMock tests</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><tt>jm</p>
+<p>jm</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="./resources/templates/jmock-templates-idea.xml">Download</a></p>
+<p><a href="./resources/templates/jmock2-templates-idea.xml">Download</a></p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="./resources/templates/jmock-templates.xml">Download</a></p>
+<p><a href="./resources/templates/jmock2-templates.xml">Download</a></p>
</div></div></td>
</tr>
</tbody>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/ddab015d/content/guides/dg.html
----------------------------------------------------------------------
diff --git a/content/guides/dg.html b/content/guides/dg.html
index 6ae5ced..55d87be 100644
--- a/content/guides/dg.html
+++ b/content/guides/dg.html
@@ -481,30 +481,14 @@ table.CodeRay td.code>pre{padding:0}
<div id="doc-content">
- <div id="preamble">
+ <div class="sect1">
+<h2 id="_developers_guide">Developers' Guide</h2>
<div class="sectionbody">
<div class="paragraph">
-<p><br/><br/></p>
+<p>This developers' guide describes how to set up your development environment to develop your Apache Isis applications either within the <a href="#_dg_intellij">IntelliJ</a> IDE, or within the <a href="#_dg_eclipse">Eclipse</a> IDE, or from the <a href="#_dg_cmd-line">command line</a>.</p>
</div>
<div class="paragraph">
-<p>This guide describes how to build an Isis applications either from the command line (as per your <a href="http://en.wikipedia.org/wiki/Continuous_integration">continuous integration</a> server or within an IDE.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_dg_cmd-line">Developing from the Command Line</h2>
-<div class="sectionbody">
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-TODO
-</td>
-</tr>
-</table>
+<p>The developer' guide is <em>not</em> intended as a reference manual; for that see the <a href="rg.html#">Reference Guide</a>. This guide also does <em>not</em> describe how to actually build an Apache Isis application; for that see the <a href="ug.html#">Users' Guide</a>.</p>
</div>
</div>
</div>
@@ -1418,6 +1402,23 @@ TODO
</div>
</div>
</div>
+<div class="sect1">
+<h2 id="_dg_cmd-line">Developing from the Command Line</h2>
+<div class="sectionbody">
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+TODO
+</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
</div>
<footer>
@@ -1435,7 +1436,7 @@ TODO
<div id="toc" class="toc2">
<div class="fallback-toc">
<ul class="sectlevel1">
-<li><a href="#_dg_cmd-line">Developing from the Command Line</a></li>
+<li><a href="#_developers_guide">Developers' Guide</a></li>
<li><a href="#_dg_intellij">Setting up IntelliJ IDEA</a>
<ul class="sectlevel2">
<li><a href="#_installing_and_setting_up">Installing and Setting up</a>
@@ -1493,6 +1494,7 @@ TODO
<li><a href="#_other_domain_projects">Other domain projects.</a></li>
</ul>
</li>
+<li><a href="#_dg_cmd-line">Developing from the Command Line</a></li>
</ul>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/ddab015d/content/guides/images/runtime/web-xml/key.png
----------------------------------------------------------------------
diff --git a/content/guides/images/runtime/web-xml/key.png b/content/guides/images/runtime/web-xml/key.png
new file mode 100644
index 0000000..b6f6ae9
Binary files /dev/null and b/content/guides/images/runtime/web-xml/key.png differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/ddab015d/content/guides/images/runtime/web-xml/parts.pptx
----------------------------------------------------------------------
diff --git a/content/guides/images/runtime/web-xml/parts.pptx b/content/guides/images/runtime/web-xml/parts.pptx
new file mode 100644
index 0000000..59c1eeb
Binary files /dev/null and b/content/guides/images/runtime/web-xml/parts.pptx differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/ddab015d/content/guides/images/runtime/web-xml/ro-only.png
----------------------------------------------------------------------
diff --git a/content/guides/images/runtime/web-xml/ro-only.png b/content/guides/images/runtime/web-xml/ro-only.png
new file mode 100644
index 0000000..c96135c
Binary files /dev/null and b/content/guides/images/runtime/web-xml/ro-only.png differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/ddab015d/content/guides/images/runtime/web-xml/wicket-and-ro.png
----------------------------------------------------------------------
diff --git a/content/guides/images/runtime/web-xml/wicket-and-ro.png b/content/guides/images/runtime/web-xml/wicket-and-ro.png
new file mode 100644
index 0000000..b8a2d05
Binary files /dev/null and b/content/guides/images/runtime/web-xml/wicket-and-ro.png differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/ddab015d/content/guides/images/runtime/web-xml/wicket-only.png
----------------------------------------------------------------------
diff --git a/content/guides/images/runtime/web-xml/wicket-only.png b/content/guides/images/runtime/web-xml/wicket-only.png
new file mode 100644
index 0000000..46070ce
Binary files /dev/null and b/content/guides/images/runtime/web-xml/wicket-only.png differ