Author: buildbot
Date: Tue Feb 24 06:29:51 2015
New Revision: 941272
Log:
Staging update by buildbot for isis
Removed:
websites/staging/isis/trunk/content/components/objectstores/sql/configuring-the-sql-os-objectstore-with-the-quickstart-archetype.html
Modified:
websites/staging/isis/trunk/cgi-bin/ (props changed)
websites/staging/isis/trunk/content/ (props changed)
websites/staging/isis/trunk/content/components/objectstores/jdo/IsisConfigurationForJdoIntegTests.html
websites/staging/isis/trunk/content/components/objectstores/jdo/disabling-persistence-by-reachability.html
websites/staging/isis/trunk/content/components/objectstores/jdo/enabling-logging.html
websites/staging/isis/trunk/content/components/objectstores/jdo/lazy-loading.html
websites/staging/isis/trunk/content/components/objectstores/jdo/mapping-blobs.html
websites/staging/isis/trunk/content/components/objectstores/jdo/mapping-joda-dates.html
websites/staging/isis/trunk/content/components/objectstores/jdo/persistence_xml.html
websites/staging/isis/trunk/content/components/objectstores/jdo/using-jndi-datasource.html
websites/staging/isis/trunk/content/components/objectstores/sql/about.html
websites/staging/isis/trunk/content/components/security/shiro/configuring-shiro.html
websites/staging/isis/trunk/content/components/viewers/wicket/bookmarks.html
websites/staging/isis/trunk/content/components/viewers/wicket/configuring-the-about-page.html
websites/staging/isis/trunk/content/components/viewers/wicket/dynamic-layouts.html
websites/staging/isis/trunk/content/components/viewers/wicket/file-upload-download.html
websites/staging/isis/trunk/content/components/viewers/wicket/how-to-tweak-the-ui-using-css-classes.html
websites/staging/isis/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-excel.html
websites/staging/isis/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-fullcalendar2.html
websites/staging/isis/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-gmap3.html
websites/staging/isis/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-wickedcharts.html
websites/staging/isis/trunk/content/components/viewers/wicket/static-layouts.html
websites/staging/isis/trunk/content/contributors/release-process.html
websites/staging/isis/trunk/content/core/integtestsupport.html
websites/staging/isis/trunk/content/doap_isis.rdf
websites/staging/isis/trunk/content/getting-started/quickstart-archetype.html
websites/staging/isis/trunk/content/intro/elevator-pitch/common-use-cases.html
websites/staging/isis/trunk/content/intro/getting-started/ide/eclipse.html
websites/staging/isis/trunk/content/intro/getting-started/ide/intellij.html
websites/staging/isis/trunk/content/intro/tutorials/screencasts.html
websites/staging/isis/trunk/content/reference/recognized-annotations/SortedBy-deprecated.html
websites/staging/isis/trunk/content/reference/services/bulk-interaction.html
websites/staging/isis/trunk/content/reference/services/scratchpad.html
Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Feb 24 06:29:51 2015
@@ -1 +1 @@
-1661809
+1661847
Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Feb 24 06:29:51 2015
@@ -1 +1 @@
-1661809
+1661847
Modified:
websites/staging/isis/trunk/content/components/objectstores/jdo/IsisConfigurationForJdoIntegTests.html
==============================================================================
---
websites/staging/isis/trunk/content/components/objectstores/jdo/IsisConfigurationForJdoIntegTests.html
(original)
+++
websites/staging/isis/trunk/content/components/objectstores/jdo/IsisConfigurationForJdoIntegTests.html
Tue Feb 24 06:29:51 2015
@@ -426,7 +426,7 @@
<p>To remove a little bit of boilerplate, the
<code>IsisConfigurationForJdoIntegTests</code> class (in the
<code>org.apache.isis.objectstore.jdo.datanucleus</code> package) can be used
to bootstrap the application.</p>
-<p>The (example applications that we reverse engineer into our) <a
href="../../../intro/getting-started/simple-archetype.html">two</a> <a
href="../../../intro/getting-started/quickstart-archetype.html">archetypes</a>
show this; see for example the <a
href="https://github.com/apache/isis/blob/3dcfb2fcd61636ff2fac66a3c7c54a500fdf2c6a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/ToDoSystemInitializer.java#L70";><code>ToDoSystemInitializer</code></a>
class.</p>
+<p>The simpleapp example application (that we reverse engineer into our) <a
href="../../../intro/getting-started/simple-archetype.html">simpleapp
archetype</a> shows this; see for example the <a
href="https://github.com/apache/isis/blob/07fe61ef3fb029ae36427f60da2afeeb931e4f88/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/bootstrap/SimpleAppSystemInitializer.java#L49";><code>SystemAppSystemInitializer</code></a>
class.</p>
Modified:
websites/staging/isis/trunk/content/components/objectstores/jdo/disabling-persistence-by-reachability.html
==============================================================================
---
websites/staging/isis/trunk/content/components/objectstores/jdo/disabling-persistence-by-reachability.html
(original)
+++
websites/staging/isis/trunk/content/components/objectstores/jdo/disabling-persistence-by-reachability.html
Tue Feb 24 06:29:51 2015
@@ -437,7 +437,7 @@ a non-persistent entity is associated wi
isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
</code></pre>
-<p>This change has been made to the <a
href="../../../intro/getting-started/simple-archetype.html">simple</a> and <a
href="../../../intro/getting-started/quickstart-archetype.html">quickstart</a>
archetypes.</p>
+<p>This change has been made to the <a
href="../../../intro/getting-started/simple-archetype.html">simple</a>
archetype.</p>
<p>If you do disable this feature, then you will (of course) need to ensure
that you explicitly persist all entities using the
<code>DomainObjectContainer#persist(.)</code> or
<code>DomainObjectContainer#persistIfNotAlready(.)</code> methods.</p>
Modified:
websites/staging/isis/trunk/content/components/objectstores/jdo/enabling-logging.html
==============================================================================
---
websites/staging/isis/trunk/content/components/objectstores/jdo/enabling-logging.html
(original)
+++
websites/staging/isis/trunk/content/components/objectstores/jdo/enabling-logging.html
Tue Feb 24 06:29:51 2015
@@ -436,7 +436,7 @@
<p>Configure log4jdbc JDBC rather than the vanilla driver (see
<code>WEB-INF/persistor_datanucleus.properties</code>) and configure log4j
logging (see <code>WEB-INF/logging.properties</code>).</p>
-<p>There are examples of both in the quickstart archetype.</p>
+<p>There are examples of both in the <a
href="../../../intro/getting-started/simpleapp-archetype.html">simpleapp
archetype</a>.</p>
<h3>In the Database</h3>
Modified:
websites/staging/isis/trunk/content/components/objectstores/jdo/lazy-loading.html
==============================================================================
---
websites/staging/isis/trunk/content/components/objectstores/jdo/lazy-loading.html
(original)
+++
websites/staging/isis/trunk/content/components/objectstores/jdo/lazy-loading.html
Tue Feb 24 06:29:51 2015
@@ -424,28 +424,26 @@
<p>By default, collections all rendered lazily and are thus also loaded lazily
from the database.</p>
-<p>However, even in the case of collections that have annotated with
<code>@Render(Type.EAGERLY)</code>, these should probably still be lazily
loaded. Otherwise, there will always be an unnecessary cost when rendering the
object in a table.</p>
+<p>However, even in the case of collections that have annotated with
<code>@CollectionLayout(render=RenderType.EAGERLY)</code> (or equivalently in
<code>.layout.json</code> file, or using the now deprecated
<code>@Render(Type.EAGERLY)</code>, these should probably still be lazily
loaded. Otherwise, there will always be an unnecessary cost when rendering the
object in a table.</p>
-<p>For example, in the <code>ToDoItem</code> (in the <a
href="../../../intro/getting-started/quickstart-archetype.html">quickstart
archetype</a>) the <code>dependencies</code> collection is as follows:</p>
+<p>For example, in the <code>ToDoItem</code> (in the <a
href="https://github.com/isisaddons/isis-app-todoapp/blob/61b8114a8e01dbb3c380b31cf09eaed456407570/dom/src/main/java/todoapp/dom/module/todoitem/ToDoItem.java";>todoapp
example</a> (non-ASF)) the <code>dependencies</code> collection is as
follows:</p>
-<pre>
- @javax.jdo.annotations.Persistent(table="TODO_DEPENDENCIES")
- @javax.jdo.annotations.Join(column="DEPENDING_TODO_ID")
- @javax.jdo.annotations.Element(column="DEPENDENT_TODO_ID")
- private SortedSet<ToDoItem> dependencies = new TreeSet<ToDoItem>();
-
- @Disabled
- @MemberOrder(sequence = "1")
- @Render(Type.EAGERLY)
- public SortedSet<ToDoItem> getDependencies() {
+<pre><code>@javax.jdo.annotations.Persistent(table="ToDoItemDependencies")
[email protected](column="dependingId")
[email protected](column="dependentId")
+
+private Set<ToDoItem> dependencies = new TreeSet<>();
+
+@Collection()
+@CollectionLayout(
+ render = RenderType.EAGERLY // actually, is declared in
ToDoItem.layout.json file
+)
+public Set<ToDoItem> getDependencies() {
return dependencies;
- }
- public void setDependencies(final SortedSet<ToDoItem> dependencies) {
- this.dependencies = dependencies;
- }
-</pre>
+}
+</code></pre>
-<p>Even though <code>@Render(Type.EAGERLY)</code>, the
<code>@javax.jdo.annotations.Persistent</code> annotation leaves the
<code>defaultFetchGroup</code> as its default, which for collections is
"false".</p>
+<p>Even though the Isis annotations state to render the collection eagerly,
the JDO <code>@javax.jdo.annotations.Persistent</code> annotation leaves the
<code>defaultFetchGroup</code> as its default, which for collections is
"false". The net result is that when Isis does request the collection to be
resolved when rendering the collection, JDO will need to perform an additional
query to obtain the contents.</p>
Modified:
websites/staging/isis/trunk/content/components/objectstores/jdo/mapping-blobs.html
==============================================================================
---
websites/staging/isis/trunk/content/components/objectstores/jdo/mapping-blobs.html
(original)
+++
websites/staging/isis/trunk/content/components/objectstores/jdo/mapping-blobs.html
Tue Feb 24 06:29:51 2015
@@ -432,24 +432,24 @@
<h3>Mapping Blobs</h3>
-<p>For example, in the <code>ToDoItem</code> class (of the <a
href="../../../getting-started/quickstart-archetype.html">quickstart
archetype</a>) the <code>attachment</code> property (v1.5.0 onwards) is as
follows:</p>
+<p>For example, in the <code>ToDoItem</code> class (of the <a
href="https://github.com/isisaddons/isis-app-todoapp/blob/61b8114a8e01dbb3c380b31cf09eaed456407570/dom/src/main/java/todoapp/dom/module/todoitem/ToDoItem.java#L475";>todoapp
example app</a> (non-ASF) the <code>attachment</code> property is as
follows:</p>
-<pre>
- @javax.jdo.annotations.Persistent(defaultFetchGroup="false", columns = {
- @javax.jdo.annotations.Column(name = "attachment_name"),
- @javax.jdo.annotations.Column(name = "attachment_mimetype"),
- @javax.jdo.annotations.Column(name = "attachment_bytes",
jdbcType="BLOB", sqlType = "BLOB")
- })
- private Blob attachment;
-
- @Optional
- public Blob getAttachment() {
+<pre><code>@javax.jdo.annotations.Persistent(defaultFetchGroup="false",
columns = {
+ @javax.jdo.annotations.Column(name = "attachment_name"),
+ @javax.jdo.annotations.Column(name = "attachment_mimetype"),
+ @javax.jdo.annotations.Column(name = "attachment_bytes", jdbcType="BLOB",
sqlType = "BLOB")
+})
+private Blob attachment;
+@Property(
+ optionality = Optionality.OPTIONAL
+)
+public Blob getAttachment() {
return attachment;
- }
- public void setAttachment(final Blob attachment) {
+}
+public void setAttachment(final Blob attachment) {
this.attachment = attachment;
- }
-</pre>
+}
+</code></pre>
<p>The three <code>@javax.jdo.annotations.Column</code> annotations are
required because the mapping classes that Isis provides (<a
href="https://github.com/apache/isis/blob/isis-1.4.0/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java#L59";>IsisBlobMapping</a>
and <a
href="https://github.com/apache/isis/blob/isis-1.4.0/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisClobMapping.java#L59";>IsisClobMapping</a>)
map to 3 columns. (It is not an error to omit these <code>@Column</code>
annotations, but without them the names of the table columns are simply
suffixed <code>_0</code>, <code>_1</code>, <code>_2</code> etc.</p>
Modified:
websites/staging/isis/trunk/content/components/objectstores/jdo/mapping-joda-dates.html
==============================================================================
---
websites/staging/isis/trunk/content/components/objectstores/jdo/mapping-joda-dates.html
(original)
+++
websites/staging/isis/trunk/content/components/objectstores/jdo/mapping-joda-dates.html
Tue Feb 24 06:29:51 2015
@@ -428,20 +428,16 @@
<p>Moreover, these datatypes are <em>not</em> in the default fetch group,
meaning that JDO/DataNucleus will perform an additional <code>SELECT</code>
query for each attribute. To avoid this extra query, the annotation should
indicate that the property is in the default fetch group.</p>
-<p>For example, the <code>ToDoItem</code> (in the <a
href="../../../intro/getting-started/quickstart-archetype.html">quickstart
archetype</a>) defines the <code>dueBy</code> property as follows:</p>
+<p>For example, the <code>ToDoItem</code> (in the <a
href="https://github.com/isisaddons/isis-app-todoapp";>todoapp example app</a>
(not ASF)) defines the <code>dueBy</code> property as follows:</p>
<pre>
- @javax.jdo.annotations.Persistent
- private LocalDate dueBy;
+ @javax.jdo.annotations.Persistent(defaultFetchGroup="true")
+ private LocalDate dueBy;
- @MemberOrder(name="Detail", sequence = "3")
- @Optional
- public LocalDate getDueBy() {
- return dueBy;
- }
- public void setDueBy(final LocalDate dueBy) {
- this.dueBy = dueBy;
- }
+ @javax.jdo.annotations.Column(allowsNull="true")
+ public LocalDate getDueBy() {
+ return dueBy;
+ }
</pre>
Modified:
websites/staging/isis/trunk/content/components/objectstores/jdo/persistence_xml.html
==============================================================================
---
websites/staging/isis/trunk/content/components/objectstores/jdo/persistence_xml.html
(original)
+++
websites/staging/isis/trunk/content/components/objectstores/jdo/persistence_xml.html
Tue Feb 24 06:29:51 2015
@@ -449,7 +449,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
version="1.0">
- <persistence-unit name="quickstart">
+ <persistence-unit name="simpleapp">
</persistence-unit>
</persistence>
</pre>
Modified:
websites/staging/isis/trunk/content/components/objectstores/jdo/using-jndi-datasource.html
==============================================================================
---
websites/staging/isis/trunk/content/components/objectstores/jdo/using-jndi-datasource.html
(original)
+++
websites/staging/isis/trunk/content/components/objectstores/jdo/using-jndi-datasource.html
Tue Feb 24 06:29:51 2015
@@ -458,7 +458,7 @@ isis.persistor.datanucleus.impl.datanucl
<pre>
<resource-ref>
<description>db</description>
- <res-ref-name>jdbc/quickstart</res-ref-name>
+ <res-ref-name>jdbc/simpleapp</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
@@ -467,7 +467,7 @@ isis.persistor.datanucleus.impl.datanucl
<p>Finally, declare the datasource as required by the servlet container. For
example, if using Tomcat 7, the datasource can be specified by adding the
following to <code>$TOMCAT_HOME/conf/context.xml</code>:</p>
<pre>
-<Resource name="jdbc/quickstart"
+<Resource name="jdbc/simpleapp"
auth="Container"
type="javax.sql.DataSource"
maxActive="100"
@@ -476,7 +476,7 @@ isis.persistor.datanucleus.impl.datanucl
username="sa"
password="p4ssword"
driverClassName="com.microsoft.sqlserver.jdbc.SQLServerDriver"
- url="jdbc:sqlserver://127.0.0.1:1433;instance=.;databaseName=quickstart"/>
+ url="jdbc:sqlserver://127.0.0.1:1433;instance=.;databaseName=simpleapp"/>
</pre>
<p>You will also need to make sure that the JDBC driver is on the servlet
container's classpath. For Tomcat, this means copying the driver to
<code>$TOMCAT_HOME/lib</code>.
Modified:
websites/staging/isis/trunk/content/components/objectstores/sql/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/objectstores/sql/about.html
(original)
+++ websites/staging/isis/trunk/content/components/objectstores/sql/about.html
Tue Feb 24 06:29:51 2015
@@ -422,11 +422,9 @@
</h1>
</div>
-<p>The SQL object store module provides the ability to persist domain objects
into an RDBMS. It has no external dependencies, using simply JDBC.</p>
-
-<h3>Archetypes</h3>
-
-<p>You can adapt the <a
href="../../../getting-started/quickstart-archetype.html">quickstart
archetype</a> to run with the SQL OS by following <a
href="configuring-the-sql-os-objectstore-with-the-quickstart-archetype.html">these
instructions</a>.</p>
+<p><div class="note">
+This component has been retired.
+</div></p>
<h3>Releases</h3>
Modified:
websites/staging/isis/trunk/content/components/security/shiro/configuring-shiro.html
==============================================================================
---
websites/staging/isis/trunk/content/components/security/shiro/configuring-shiro.html
(original)
+++
websites/staging/isis/trunk/content/components/security/shiro/configuring-shiro.html
Tue Feb 24 06:29:51 2015
@@ -449,7 +449,8 @@
<h2>Telling Isis to use Shiro for authentication and authorization</h2>
-<p>Isis itself supports multiple authentication/authorization mechanisms. To
tell it to use shiro, update the <code>WEB-INF/isis.properties</code> file:</p>
+<p>w
+Isis itself supports multiple authentication/authorization mechanisms. To
tell it to use shiro, update the <code>WEB-INF/isis.properties</code> file:</p>
<pre><code>isis.authentication=shiro
isis.authorization=shiro
@@ -511,19 +512,19 @@ admin_role = *
<h2>Multiple Realms</h2>
-<p>The <code>shiro.ini</code> file as configured in the <a
href="../../../intro/getting-started/quickstart-archetype.html">quickstart
archetype</a> is a little more complex. Here there are two text-based realms
defined, <code>realm1</code> and <code>realm2</code>. The
<code>resourcePath</code> for these realms is in the form:</p>
+<p>A more sophisticated approach is to use external realms. For example, to
configure two text-based realms defined, <code>realm1</code> and
<code>realm2</code>, we would define a <code>resourcePath</code> for each, in
the form:</p>
<pre><code>realm1.resourcePath=classpath:webapp/realm1.ini
</code></pre>
<p>that is, the <code>src/main/resources/webapp/realm1.ini</code> file in the
webapp project.</p>
-<p>The security manager for the app only references these two realms:</p>
+<p>The security manager for the app would then be told to use these two
realms:</p>
<pre><code>securityManager.realms = $realm1,$realm2
</code></pre>
-<p>meaning that the <code>[users]</code> and <code>[roles]</code> sections of
<code>shiro.ini</code> are unused. Instead, you'll find these sections in both
<code>realm1.ini</code> and <code>realm2.ini</code> (because both are
coincidentally implementations of the same
<code>org.apache.shiro.realm.text.IniRealm</code> class).</p>
+<p>The the <code>[users]</code> and <code>[roles]</code> sections of
<code>shiro.ini</code> would then be unused. Instead, you'll find these
sections in both <code>realm1.ini</code> and <code>realm2.ini</code> (because
both are coincidentally implementations of the same
<code>org.apache.shiro.realm.text.IniRealm</code> class).</p>
<h2>What the user/roles translate to</h2>
@@ -539,7 +540,7 @@ for (RoleMemento role : roles) {
<p>The role <code>name</code> property encodes both the realm that provided
the role, and the role identity itself.</p>
-<p>For example, in the quickstart/todo app, if logging in as <code>dick</code>
with the following entries for <code>realm1</code>:</p>
+<p>For example, in the simpleapp, if logging in as <code>dick</code> with the
following entries for <code>realm1</code>:</p>
<pre><code>dick = pass, user_role, analysis_role, self-install_role
</code></pre>
@@ -571,6 +572,16 @@ ds ...etc
securityManager.realms = $jdbcRealm
</code></pre>
+<h2>Configuring Shiro to use the Security Isis Addons</h2>
+
+<p>The Isisaddons <a
href="https://github.com/isisaddons/isis-module-security";>security module</a>
(not ASF) provides a complete
+security subdomain for users, roles, permissions; all persisted as JDO domain
objects. It also includes a Shiro realm
+integration.</p>
+
+<p>See the module's README for details of how to configure an existing app to
use this module. Or, look at the the
+Isisaddons <a href="https://github.com/isisaddons/isis-app-todoapp";>todoapp
example</a> (not ASF), which is preconfigured to use
+the security module.</p>
+
</div>
Modified:
websites/staging/isis/trunk/content/components/viewers/wicket/bookmarks.html
==============================================================================
---
websites/staging/isis/trunk/content/components/viewers/wicket/bookmarks.html
(original)
+++
websites/staging/isis/trunk/content/components/viewers/wicket/bookmarks.html
Tue Feb 24 06:29:51 2015
@@ -436,7 +436,7 @@
<h4>Simple List</h4>
-<p>The following screenshot, taken from example todo app (generated by the <a
href="../../../intro/getting-started/quickstart-archetype.html">quickstart
archetype</a>) shows how the bookmarks are listed in a sliding panel.</p>
+<p>The following screenshot, taken from <a
href="https://github.com/isisaddons/isis-app-todoapp";>Isisaddons example
todoapp</a> (not ASF) shows how the bookmarks are listed in a sliding panel.</p>
<p><a href="images/bookmarks/bookmarked-pages-panel.png"><img
src="images/bookmarks/bookmarked-pages-panel-940.png"/></a></p>
Modified:
websites/staging/isis/trunk/content/components/viewers/wicket/configuring-the-about-page.html
==============================================================================
---
websites/staging/isis/trunk/content/components/viewers/wicket/configuring-the-about-page.html
(original)
+++
websites/staging/isis/trunk/content/components/viewers/wicket/configuring-the-about-page.html
Tue Feb 24 06:29:51 2015
@@ -441,14 +441,13 @@
<h2>Configuration</h2>
-<p><em>Note: the configuration described here will also be part of the
quickstart_wicket_restful_jdo archetype (1.0.3+).</em></p>
+<p><em>This configuration is included within the <a
href="../../../intro/getting-started/simpleapp-archetype.html">simpleapp
archetype</a>.</em></p>
<h4>Adding attributes to the WAR's manifest</h4>
<p>Add the following to the webapp's <code>pom.xml</code> (under
<code><build><plugins></code>):</p>
-<pre>
-<plugin>
+<pre><code><plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.5</version>
@@ -493,7 +492,7 @@
</execution>
</executions>
</plugin>
-</pre>
+</code></pre>
<p>If you then build the webapp from the Maven command line (<code>mvn clean
package</code>), then the WAR should contain a
<code>META-INF/MANIFEST.MF</code> with those various attribute entries.</p>
@@ -508,7 +507,7 @@ protected Module newIsisWicketModule() {
...
- final Module quickstartOverrides = new AbstractModule() {
+ final Module simpleappOverrides = new AbstractModule() {
@Override
protected void configure() {
...
Modified:
websites/staging/isis/trunk/content/components/viewers/wicket/dynamic-layouts.html
==============================================================================
---
websites/staging/isis/trunk/content/components/viewers/wicket/dynamic-layouts.html
(original)
+++
websites/staging/isis/trunk/content/components/viewers/wicket/dynamic-layouts.html
Tue Feb 24 06:29:51 2015
@@ -432,94 +432,98 @@
<h2>JSON layout file</h2>
-<p>The JSON layout file for class <code>Xxx</code> takes the name
<code>Xxx.layout.json</code>, and resides in the same package as the class.
For example, the layout for the <a
href="https://github.com/apache/isis/blob/f38fdb92941172eabb12e0943509f239e6d5925f/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java";>ToDoItem</a>
class is <a
href="https://github.com/apache/isis/blob/f38fdb92941172eabb12e0943509f239e6d5925f/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.layout.json";>ToDoItem.layout.json</a>
</p>
-
-<p>The format of the <code>.layout.json</code> file is:</p>
+<p>The JSON layout file for class <code>Xxx</code> takes the name
<code>Xxx.layout.json</code>, and resides in the same package as the class.
+The format of the file is:</p>
<pre><code>{
- columns: [ // list of columns
+ "columns": [ // list of columns
{
- span: 6, // span of the left-hand
property column
- memberGroups: { // ordered map of member
(property) groups
- General: { // member group name
- members: {
- description: { // property, no associated
actions, but with UI hint
- typicalLength: { // UI hint for size of field
- value: 50
+ "span": 6, // span of the left-hand
property column
+ "memberGroups": { // ordered map of member
(property) groups
+ "General": { // member group name
+ "members": {
+ "description": { // property, no associated
actions, but with UI hint
+ "propertyLayout": {
+ "typicalLength": 50 // UI hint for size of field (no
longer used in ISIS 1.8.0)
}
- },
- category: {},
- complete: { // property, with associated
actions
- actions: {
- completed: {
- named: { // naming UI hint
- value: "Done"
- }
- cssClass: { // CSS UI hint
- value: "x-highlight"
- },
- },
- notYetCompleted: {
- named: { value: "Not done" }
+ },
+ "category": {},
+ "complete": { // property, with associated
actions
+ "propertyLayout": {
+ "describedAs": "Whether this todo item has been completed"
},
- describedAs: {
- value: "Whether this todo item has been completed"
+ "actions": {
+ "completed": {
+ "actionLayout": {
+ "named": "Done", // naming UI hint
+ "cssClass": "x-highlight" // CSS UI hint
+ }
+ },
+ "notYetCompleted": {
+ "actionLayout": {
+ "named": "Not done"
+ }
+ }
}
}
- }
- },
- Misc: {
- members: {
- notes: {
- multiLine: { // UI hint for text area
- numberOfLines: 5
- }
- },
- versionSequence: {}
+ },
+ "Misc": {
+ "members": {
+ "notes": {
+ "propertyLayout": {
+ "multiLine": 5 // UI hint for text area
+ }
+ },
+ "versionSequence": {}
+ }
}
}
}
},
{
- span: 6, // span of the middle property
column
- memberGroups: { ... }
+ "span": 6, // span of the middle property
column
+ "memberGroups": { ... }
},
{
- span: 0 // span of the right property
column (if any)
+ "span": 0 // span of the right property
column (if any)
},
{
- span: 6,
- collections: { // ordered map of collections
- dependencies: { // collection, with associated
actions
- actions: {
- add:{},
- delete: {}
+ "span": 6,
+ "collections": { // ordered map of collections
+ "dependencies": { // collection, with associated
actions
+ "collectionLayout": {
+ "paged": 10, // pagination UI hint
+ "render": "EAGERLY" // lazy-loading UI hint
},
- paged: { // pagination UI hint
- value: 10 // 10 items to a page
+ "actions": {
+ "add":{},
+ "delete": {}
},
- render: { // lazy-loading UI hint
- value: EAGERLY
- }
},
- similarItems: {} // collection, no associated
actions
+ "similarItems": {} // collection, no associated
actions
}
}
],
- actions: { // actions not associated with
any member
- delete: {},
- duplicate: {
- named: {
- value: "Clone"
+ "actions": { // actions not associated with
any member
+ "delete": {},
+ "duplicate": {
+ "actionLayout": {
+ "named": {
+ "value": "Clone"
+ }
}
}
}
}
</code></pre>
-<p>Although advisable, it is not necessary to list all class members in this
file. Any members not listed with be ordered according either to annotations
(if present) or fallback/default values.</p>
+<p>Although advisable, it is not necessary to list all class members in this
file. Any members not listed with be
+ordered according either to annotations (if present) or fallback/default
values.</p>
-<p>Note also that the layout file may contain entries for <a
href="../../../more-advanced-topics/how-to-01-062-How-to-decouple-dependencies-using-contributions.html">contributed
associations and actions</a>; this allows each contributee classes to define
their own layout for their contributions, possibly overriding any static
metadata on the original domain service contributor.</p>
+<p>Note also that the layout file may contain entries for
+<a
href="../../../more-advanced-topics/how-to-01-062-How-to-decouple-dependencies-using-contributions.html">contributed
associations and actions</a>;
+this allows each contributee classes to define their own layout for their
contributions, possibly overriding any
+static metadata on the original domain service contributor.</p>
<h2>Downloading an initial layout file</h2>
Modified:
websites/staging/isis/trunk/content/components/viewers/wicket/file-upload-download.html
==============================================================================
---
websites/staging/isis/trunk/content/components/viewers/wicket/file-upload-download.html
(original)
+++
websites/staging/isis/trunk/content/components/viewers/wicket/file-upload-download.html
Tue Feb 24 06:29:51 2015
@@ -444,7 +444,7 @@ public void setAttachment(final Blob att
<h2>Screenshots</h2>
-<p>The following screenshots are taken from the todo app generated by the <a
href="../../../intro/getting-started/quickstart-archetype.html">quickstart
archetype</a></p>
+<p>The following screenshots are taken from the Isis addons example <a
href="https://github.com/isisaddons/isis-app-todoapp";>todoapp</a> (not ASF):</p>
<h4>View mode, empty</h4>
Modified:
websites/staging/isis/trunk/content/components/viewers/wicket/how-to-tweak-the-ui-using-css-classes.html
==============================================================================
---
websites/staging/isis/trunk/content/components/viewers/wicket/how-to-tweak-the-ui-using-css-classes.html
(original)
+++
websites/staging/isis/trunk/content/components/viewers/wicket/how-to-tweak-the-ui-using-css-classes.html
Tue Feb 24 06:29:51 2015
@@ -446,7 +446,7 @@
<h2>Targetting individual members</h2>
-<p>For example, the <code>ToDoItem</code> object of the <a
href="../../../intro/getting-started/quickstart-archetype.html">ToDo app</a>
has a <code>notes</code> property. The HTML for this will be something
like:</p>
+<p>For example, the <code>ToDoItem</code> object of the Isis addons <a
href="../../../intro/getting-started/quickstart-archetype.html">ToDo app</a>
has a <code>notes</code> property. The HTML for this will be something
like:</p>
<pre><code><div>
<div class="property ToDoItem-notes">
@@ -509,14 +509,14 @@ public LocalDate getDueBy() {
<p>Note also that instead of using <code>@CssClass</code> annotation, you can
also specify the CSS style using a <a href="./dynamic-layouts.html">dynamic
layout</a> JSON file:</p>
<pre><code>...
-dueBy: {
- cssClass: { value: "x-key" }
+"dueBy": {
+ "propertyLayout": {
+ "cssClass": "x-key"
+ }
},
...
</code></pre>
-<p>This is in fact how the <code>ToDoItem</code> class has been refactored to,
as shown <a
href="https://github.com/apache/isis/blob/5e5b07c4691cbd651023c6ed8b7b756bc8370e09/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.layout.json#L94";>here</a>.</p>
-
<h3>Application-specific 'theme' class</h3>
<p>The application name (as defined in the <code>IsisWicketApplication</code>
subclass) is also used (in sanitized form) as the CSS class in a
<code><div></code> that wraps all the rendered content of every page.</p>
Modified:
websites/staging/isis/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-excel.html
==============================================================================
---
websites/staging/isis/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-excel.html
(original)
+++
websites/staging/isis/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-excel.html
Tue Feb 24 06:29:51 2015
@@ -426,7 +426,7 @@
<h2>Screenshots</h2>
-<p>The following screenshots are taken from the <a
href="https://github.com/isisaddons/isis-wicket-excel/tree/master/zzzdemo";>demo
app</a> (adapted from Isis' quickstart archetype).</p>
+<p>The following screenshots are taken from <a
href="https://github.com/isisaddons/isis-wicket-excel/tree/master/zzzdemo";>demo
app</a> for this module.</p>
<p>The extension renders a new tab (highlighted): </p>
Modified:
websites/staging/isis/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-fullcalendar2.html
==============================================================================
---
websites/staging/isis/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-fullcalendar2.html
(original)
+++
websites/staging/isis/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-fullcalendar2.html
Tue Feb 24 06:29:51 2015
@@ -426,7 +426,7 @@
<h2>Screenshots</h2>
-<p>The following screenshots are taken from the <a
href="https://github.com/isisaddons/isis-wicket-fullcalendar2/tree/master/zzzdemo";>demo
app</a> (adapted from Isis' quickstart archetype).</p>
+<p>The following screenshots are taken from the <a
href="https://github.com/isisaddons/isis-wicket-fullcalendar2/tree/master/zzzdemo";>demo
app</a> for this module.</p>
<p>Standalone collection:</p>
Modified:
websites/staging/isis/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-gmap3.html
==============================================================================
---
websites/staging/isis/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-gmap3.html
(original)
+++
websites/staging/isis/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-gmap3.html
Tue Feb 24 06:29:51 2015
@@ -426,7 +426,7 @@
<h2>Screenshots</h2>
-<p>The following screenshots are taken from the <a
href="https://github.com/isisaddons/isis-wicket-gmap3/tree/master/zzzdemo";>demo
app</a> (adapted from Isis' quickstart archetype). Each <code>ToDoItem</code>
has been made <code>Locatable</code>.</p>
+<p>The following screenshots are taken from the <a
href="https://github.com/isisaddons/isis-wicket-gmap3/tree/master/zzzdemo";>demo
app</a> for this module. Each <code>ToDoItem</code> has been made
<code>Locatable</code>.</p>
<p><img
src="https://raw.githubusercontent.com/isisaddons/isis-wicket-gmap3/master/images/screenshot-1.png";
style="width: 900px;"/></p>
@@ -438,7 +438,7 @@
<p><iframe width="630" height="472"
src="http://www.youtube.com/embed/9o5zAME8LrM"; frameborder="0"
allowfullscreen></iframe></p>
-<p>Note: this screencast is out of date; it shows how to edit the app
generated by the <a
href="../../../../intro/getting-started/quickstart-archetype.html">quickstart
archetype</a>, by uncommenting various hints. However, as of v1.4.0, the
comments/hints have been removed from the Isis archetype. Instead, you can
just use the <a
href="https://github.com/isisaddons/isis-wicket-gmap3/tree/master/zzzdemo";>demo
app</a> that comes with the github project.</p>
+<p>Note: this screencast is out of date. See instead the <a
href="https://github.com/isisaddons/isis-wicket-gmap3/tree/master/zzzdemo";>demo
app</a> that comes with the Isis addons project.</p>
<h2>Download</h2>
Modified:
websites/staging/isis/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-wickedcharts.html
==============================================================================
---
websites/staging/isis/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-wickedcharts.html
(original)
+++
websites/staging/isis/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-wickedcharts.html
Tue Feb 24 06:29:51 2015
@@ -435,7 +435,7 @@
<h2>Screenshots</h2>
-<p>The following screenshots are taken from the <a
href="https://github.com/isisaddons/isis-wicket-wickedcharts/tree/master/zzzdemo";>demo
app</a> (adapted from Isis' quickstart archetype).</p>
+<p>The following screenshots are taken from the <a
href="https://github.com/isisaddons/isis-wicket-wickedcharts/tree/master/zzzdemo";>demo
app</a> for this module.</p>
<h4>Summary Charts</h4>
Modified:
websites/staging/isis/trunk/content/components/viewers/wicket/static-layouts.html
==============================================================================
---
websites/staging/isis/trunk/content/components/viewers/wicket/static-layouts.html
(original)
+++
websites/staging/isis/trunk/content/components/viewers/wicket/static-layouts.html
Tue Feb 24 06:29:51 2015
@@ -553,7 +553,7 @@ public class ToDoItem {
<h2><a name="example-layouts">Example Layouts</a></h2>
-<p>Below are sketches for the layout of the <a
href="https://github.com/apache/isis/blob/f38fdb92941172eabb12e0943509f239e6d5925f/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java";>ToDoItem</a>
class of the <a
href="../../../intro/getting-started/quickstart-archetype.html">quickstart
archetype</a>.</p>
+<p>Below are sketches for the layout of the <a
href="https://github.com/apache/isis/blob/f38fdb92941172eabb12e0943509f239e6d5925f/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java";>ToDoItem</a>
class of the Isis addons example <a
href="https://github.com/isisaddons/isis-app-todoapp/";>todoapp</a> (not
ASF):</p>
<h4> </h4>
Modified: websites/staging/isis/trunk/content/contributors/release-process.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/release-process.html
(original)
+++ websites/staging/isis/trunk/content/contributors/release-process.html Tue
Feb 24 06:29:51 2015
@@ -908,20 +908,6 @@ What is the release version for "Apache
<p>This file should be in the root of the extracted ZIP. In particular, check
that there are no category-x dependencies.</li>
</ul>
-<!--
-TODO: for archetype projects
-* Use the locally built quickstart archetype to generate the application, and
make sure that the generated application runs ok.
-
-mvn archetype:generate \
- -D groupId=com.mycompany \
- -D artifactId=myapp \
- -D archetypeCatalog=local \
- -D archetypeGroupId=org.apache.isis \
- -D archetypeArtifactId=quickstart-archetype \
- -D archetypeVersion=0.x.x-incubating
-Check that the generated app's artifacts point to the correct version of Isis
(specifically: without a -SNAPSHOT suffix), and runs as expected.
--->
-
<p>If you find problems and the release was performed on a branch, then just
delete the branch and start over.</p>
<h2>Upload Release for Voting</h2>
Modified: websites/staging/isis/trunk/content/core/integtestsupport.html
==============================================================================
--- websites/staging/isis/trunk/content/core/integtestsupport.html (original)
+++ websites/staging/isis/trunk/content/core/integtestsupport.html Tue Feb 24
06:29:51 2015
@@ -442,12 +442,15 @@
</dependency>
</code></pre>
-<p>A full example is provided in the <a
href="../intro/getting-started/quickstart-archetype.html">quickstart
archetype</a>. But to briefly explain; the recommended approach is to create
an abstract class for all your integration tests. Here is the one from the
quickstart archetype:</p>
+<p>A full example is provided in the <a
href="../intro/getting-started/simpleapp-archetype.html">simpleapp
archetype</a>. But to briefly explain; the recommended approach is to create
an abstract class for all your integration tests. Here's an example derived
from the Isis addons example <a
href="https://github.com/isisaddons/isis-app-todoapp/";>todoapp</a> (not
ASF):</p>
<pre><code>public abstract class AbstractIntegTest {
+ @Inject
protected ToDoItems toDoItems;
+ @Inject
protected WrapperFactory wrapperFactory;
+ @Inject
protected DomainObjectContainer container;
@Rule
@@ -469,13 +472,6 @@
return bootstrapIsis.getIsisSystemForTest();
}
- @Before
- public void init() {
- toDoItems = getIsft().getService(ToDoItemsJdo.class);
- wrapperFactory = getIsft().getService(WrapperFactoryDefault.class);
- container = getIsft().container;
- }
-
protected <T> T wrap(T obj) {
return wrapperFactory.wrap(obj);
}
@@ -548,7 +544,7 @@
<p>Note that when the <code>ToDoItem</code> is wrapped, it is not possible to
call <code>setComplete()</code> directly on the object; but when it is
unwrapped then this call can be made as per normal.</p>
-<p>The full source code, plus other example tests, can be found <a
href="https://github.com/apache/isis/tree/master/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java";>here</a>.</p>
+<p>The full source code, plus other example tests, can be found <a
href="https://github.com/apache/isis/tree/3dcfb2fcd61636ff2fac66a3c7c54a500fdf2c6a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests";>here</a>.</p>
Modified: websites/staging/isis/trunk/content/doap_isis.rdf
==============================================================================
Binary files - no diff available.
Modified:
websites/staging/isis/trunk/content/getting-started/quickstart-archetype.html
==============================================================================
---
websites/staging/isis/trunk/content/getting-started/quickstart-archetype.html
(original)
+++
websites/staging/isis/trunk/content/getting-started/quickstart-archetype.html
Tue Feb 24 06:29:51 2015
@@ -2,13 +2,13 @@
<html lang="en-US">
<head>
<meta charset="UTF-8">
- <meta http-equiv="refresh"
content="1;url=http://isis.apache.org/intro/getting-started/quickstart-archetype.html";>
+ <meta http-equiv="refresh"
content="1;url=http://isis.apache.org/intro/getting-started/todoapp-archetype.html";>
<script type="text/javascript">
- window.location.href =
"http://isis.apache.org/intro/getting-started/quickstart-archetype.html";
+ window.location.href =
"http://isis.apache.org/intro/getting-started/todoapp-archetype.html";
</script>
<title>Page Redirection</title>
</head>
<body>
- The quickstart archetype page has moved to <a
href='http://isis.apache.org/intro/getting-started/quickstart-archetype.html'>this
page</a>.
+ The quickstart archetype page has moved to <a
href='http://isis.apache.org/intro/getting-started/todoapp-archetype.html'>this
page</a>.
</body>
</html>
\ No newline at end of file
Modified:
websites/staging/isis/trunk/content/intro/elevator-pitch/common-use-cases.html
==============================================================================
---
websites/staging/isis/trunk/content/intro/elevator-pitch/common-use-cases.html
(original)
+++
websites/staging/isis/trunk/content/intro/elevator-pitch/common-use-cases.html
Tue Feb 24 06:29:51 2015
@@ -448,7 +448,7 @@
<p>One of the original motivations for Isis itself was to be able
automatically generate a user interface for a domain object model.</p>
-<p>Isis' has a pluggable architecture allowing different user interface
technologies. The principal implementation (as configured by the <a
href="../getting-started/simple-archetype.html">simple</a> or <a
href="../getting-started/quickstart-archetype.html">quickstart</a> archetypes)
is the <a href="../../components/viewers/wicket/about.html">Wicket viewer</a>.
This provides an appealing default user interface, with the ability to
customize the user interface by writing new <a
href="http://wicket.apache.org";>Apache Wicket</a> components. Some third-party
components can be found on github, integrating the Wicket viewer with <a
href="https://github.com/isisaddons/isis-wicket-gmap3";>google maps</a>, <a
href="https://github.com/isisaddons/isis-wicket-fullcalendar2";>a full
calendar</a>, <a
href="https://github.com/isisaddons/isis-wicket-wickedcharts";>a charting
library</a> and a <a
href="https://github.com/isisaddons/isis-wicket-excel";>export to Excel</a>
component.</p>
+<p>Isis' has a pluggable architecture allowing different user interface
technologies. The principal implementation (as configured by the <a
href="../getting-started/simple-archetype.html">simple</a> archetype) is the <a
href="../../components/viewers/wicket/about.html">Wicket viewer</a>. This
provides an appealing default user interface, with the ability to customize the
user interface by writing new <a href="http://wicket.apache.org";>Apache
Wicket</a> components. Some third-party components can be found in the Isis
addons project, integrating the Wicket viewer with <a
href="https://github.com/isisaddons/isis-wicket-gmap3";>google maps</a>, <a
href="https://github.com/isisaddons/isis-wicket-fullcalendar2";>a full
calendar</a> and a <a
href="https://github.com/isisaddons/isis-wicket-excel";>export to Excel</a>
component.</p>
<p>It is also possible to write your own viewers:</p>
Modified:
websites/staging/isis/trunk/content/intro/getting-started/ide/eclipse.html
==============================================================================
--- websites/staging/isis/trunk/content/intro/getting-started/ide/eclipse.html
(original)
+++ websites/staging/isis/trunk/content/intro/getting-started/ide/eclipse.html
Tue Feb 24 06:29:51 2015
@@ -434,7 +434,7 @@
<p>We highly recommend that you develop your Isis application using an IDE.
Isis is built with Maven, and all modern IDEs can import Maven projects. The
most commonly used IDE is <a href="http://www.eclipse.org";>Eclipse</a>, which
can be downloaded in various configurations, all of which are free for use. We
recommend you download the "Eclipse JEE package".</p>
-<p>If using the <a href="../../../components/objectstores/jdo/about.html">JDO
Objectstore</a> (the default if using the <a
href="../simple-archetype.html">simple</a> or <a
href="../quickstart-archetype.html">quickstart</a> archetypes), then the
development environment must be configured such that the Java bytecode can be
enhanced by a <a href="http://db.apache.org/jdo/enhancement.html";>JDO
enhancer</a>. If working in Eclipse, then JDO enhancement is most easily done
by installing the <a
href="http://www.datanucleus.org/products/datanucleus/jdo/guides/eclipse.html";>DataNucleus'
plugin</a>. This hooks the bytecode enhancement of your domain objects into
Eclipse's normal incremental compilation. This plugin needs to be configured
for each of your domain modules (usually just one in any given app).</p>
+<p>If using the <a href="../../../components/objectstores/jdo/about.html">JDO
Objectstore</a> (the default if using the <a
href="../simple-archetype.html">simple</a> archetype), then the development
environment must be configured such that the Java bytecode can be enhanced by a
<a href="http://db.apache.org/jdo/enhancement.html";>JDO enhancer</a>. If
working in Eclipse, then JDO enhancement is most easily done by installing the
<a
href="http://www.datanucleus.org/products/datanucleus/jdo/guides/eclipse.html";>DataNucleus'
plugin</a>. This hooks the bytecode enhancement of your domain objects into
Eclipse's normal incremental compilation. This plugin needs to be configured
for each of your domain modules (usually just one in any given app).</p>
<p>The steps are therefore:</p>
@@ -549,7 +549,7 @@
<h2>Running the App</h2>
-<p>The simple and quickstart archetypes automatically generate
<code>.launch</code> configurations in the <code>webapp</code> module. You can
therefore very simply run the application by right-clicking on one of these
files, and choosing "Run As..." or "Debug As...".</p>
+<p>The simpleapp archetype automatically provides a <code>.launch</code>
configurations in the <code>webapp</code> module. You can therefore very
simply run the application by right-clicking on one of these files, and
choosing "Run As..." or "Debug As...".</p>
<blockquote>
<p>the screencast shows this in action.</p>
Modified:
websites/staging/isis/trunk/content/intro/getting-started/ide/intellij.html
==============================================================================
--- websites/staging/isis/trunk/content/intro/getting-started/ide/intellij.html
(original)
+++ websites/staging/isis/trunk/content/intro/getting-started/ide/intellij.html
Tue Feb 24 06:29:51 2015
@@ -434,7 +434,7 @@
<p>We highly recommend that you develop your Isis application using an IDE.
Isis is built with Maven, and all modern IDEs can import Maven projects. One
of the most popular IDEs is <a href="http://www.jetbrains.com/idea/";>IntelliJ
IDEA</a>, offering either a paid-for "Ultimate" edition or a free-to-use
Community edition. Either will do for Isis development.</p>
-<p>If using the <a href="../../../components/objectstores/jdo/about.html">JDO
Objectstore</a> (the default if using the <a
href="../simple-archetype.html">simple</a> or <a
href="../quickstart-archetype.html">quickstart</a> archetypes), then the
development environment must be configured such that the Java bytecode can be
enhanced by a <a href="http://db.apache.org/jdo/enhancement.html";>JDO
enhancer</a>. When working in IntelliJ, then JDO enhancement is most easily
done by leveraging the Maven configuration. We do this by executing the
<code>mvn compile</code> goal in the dom project, prior to running the
application.</p>
+<p>If using the <a href="../../../components/objectstores/jdo/about.html">JDO
Objectstore</a> (the default if using the <a
href="../simple-archetype.html">simpleapp</a> archetype), then the development
environment must be configured such that the Java bytecode can be enhanced by a
<a href="http://db.apache.org/jdo/enhancement.html";>JDO enhancer</a>. When
working in IntelliJ, then JDO enhancement is most easily done by leveraging the
Maven configuration. We do this by executing the <code>mvn compile</code> goal
in the dom project, prior to running the application.</p>
<p>The steps are therefore:</p>
Modified: websites/staging/isis/trunk/content/intro/tutorials/screencasts.html
==============================================================================
--- websites/staging/isis/trunk/content/intro/tutorials/screencasts.html
(original)
+++ websites/staging/isis/trunk/content/intro/tutorials/screencasts.html Tue
Feb 24 06:29:51 2015
@@ -455,13 +455,9 @@
</td>
</tr>
<tr>
- <td>Todoapp (quickstart) Archetype<br/><br/><i>How to use the Apache Isis
quickstart archetype to generate your first Apache Isis application</i>
+ <td>Todoapp Archetype<br/><br/><i>How to use the Apache Isis quickstart
archetype to generate your first Apache Isis application</i>
<br/><br/>
- Learn how to use the <a
href="../getting-started/todoapp-archetype.html#screencast">quickstart
archetype</a> here
- <br/><br/>
- <i>nb: the todoapp has (in 1.8.0) moved to <a
href="https://github.com/isisaddons/isis-app-todoapp";>Isis addons</a> (not
ASF).</i>
- <br/><br/>
- <i>nb: the todoapp was previously called the 'quickstart' app</i>
+ <i>nb: the todoapp has (in 1.8.0) moved to <a
href="https://github.com/isisaddons/isis-app-todoapp";>Isis addons</a> (not
ASF); simply fork.</i>
</td>
<td>
<iframe width="420" height="315"
src="http://www.youtube.com/embed/RH6J4gx8OoA"; frameborder="0"
allowfullscreen></iframe>
Modified:
websites/staging/isis/trunk/content/reference/recognized-annotations/SortedBy-deprecated.html
==============================================================================
---
websites/staging/isis/trunk/content/reference/recognized-annotations/SortedBy-deprecated.html
(original)
+++
websites/staging/isis/trunk/content/reference/recognized-annotations/SortedBy-deprecated.html
Tue Feb 24 06:29:51 2015
@@ -429,7 +429,7 @@
<p>The <code>@SortedBy</code> annotation is an instruction hint for
(<code>SortedSet</code>) collections to use the specified comparator rather
than the natural ordering of the entity
(as would usually be the case).</p>
-<p>For example, this is taken from the <a
href="../../../getting-started/quickstart-archetype.html">quickstart
archetype</a>:</p>
+<p>For example, this is taken from the Isis addons example <a
href="https://github.com/isisaddons/isis-app-todoapp/";>todoapp</a> (not
ASF):</p>
<pre><code>public class ToDoItem implements Comparable<ToDoItem> {
Modified:
websites/staging/isis/trunk/content/reference/services/bulk-interaction.html
==============================================================================
---
websites/staging/isis/trunk/content/reference/services/bulk-interaction.html
(original)
+++
websites/staging/isis/trunk/content/reference/services/bulk-interaction.html
Tue Feb 24 06:29:51 2015
@@ -466,7 +466,7 @@ render a graph etc).</p>
<p>More prosaically, the <code>Bulk.InteractionContext</code> can be used to
ensure that the bulk action behaves appropriately
depending on whether it is called in bulk mode or regular mode. Here's a
snippet of code from the bulk action in
-the <a href="../../intro/getting-started/quickstart-archetype.html">quickstart
app</a>:</p>
+the Isis addon example <a
href="https://github.com/isisaddons/isis-app-todoapp/";>todoapp</a> (not
ASF):</p>
<pre><code>@Bulk
public ToDoItem completed() {
Modified: websites/staging/isis/trunk/content/reference/services/scratchpad.html
==============================================================================
--- websites/staging/isis/trunk/content/reference/services/scratchpad.html
(original)
+++ websites/staging/isis/trunk/content/reference/services/scratchpad.html Tue
Feb 24 06:29:51 2015
@@ -448,7 +448,7 @@ public class Scratchpad {
<p>The most common use-case is for <a
href="../recognized-annotations/Bulk.html">Bulk</a> actions that <a
href="../../more-advanced-topics/how-to-01-065-How-to-add-an-action-to-be-called-on-every-object-in-a-list.html">act
upon multiple objects in a list</a>. The (same) <code>Scratchpad</code>
service is injected into each of these objects, and they can use pass
information.</p>
-<p>For example, the <a
href="../../intro/getting-started/quickstart-archetype.html">ToDo app</a>
demonstrates how the <code>Scratchpad</code> service can be used to calculate
the total cost of the selected <code>ToDoItem</code>s:</p>
+<p>For example, the Isis addons example <a
href="https://github.com/isisaddons/isis-app-todoapp/";>todoapp</a> (not ASF)
demonstrates how the <code>Scratchpad</code> service can be used to calculate
the total cost of the selected <code>ToDoItem</code>s:</p>
<pre><code>@ActionSemantics(Of.SAFE)
@Bulk(AppliesTo.BULK_ONLY)
![https://raw.githubusercontent.com/isisaddons/isis-wicket-gmap3/master/images/screenshot-1.png"](https://raw.githubusercontent.com/isisaddons/isis-wicket-gmap3/master/images/screenshot-1.png"){kind=link}