Author: danhaywood
Date: Tue Feb 24 06:29:35 2015
New Revision: 1661847
URL: http://svn.apache.org/r1661847
Log:
fixing references to quickstart
Removed:
isis/site/trunk/content/components/objectstores/sql/configuring-the-sql-os-objectstore-with-the-quickstart-archetype.md
Modified:
isis/site/trunk/content/components/objectstores/jdo/IsisConfigurationForJdoIntegTests.md
isis/site/trunk/content/components/objectstores/jdo/disabling-persistence-by-reachability.md
isis/site/trunk/content/components/objectstores/jdo/enabling-logging.md
isis/site/trunk/content/components/objectstores/jdo/lazy-loading.md
isis/site/trunk/content/components/objectstores/jdo/mapping-blobs.md
isis/site/trunk/content/components/objectstores/jdo/mapping-joda-dates.md
isis/site/trunk/content/components/objectstores/jdo/persistence_xml.md
isis/site/trunk/content/components/objectstores/jdo/using-jndi-datasource.md
isis/site/trunk/content/components/objectstores/sql/about.md
isis/site/trunk/content/components/security/shiro/configuring-shiro.md
isis/site/trunk/content/components/viewers/wicket/bookmarks.md
isis/site/trunk/content/components/viewers/wicket/configuring-the-about-page.md
isis/site/trunk/content/components/viewers/wicket/dynamic-layouts.md
isis/site/trunk/content/components/viewers/wicket/file-upload-download.md
isis/site/trunk/content/components/viewers/wicket/how-to-tweak-the-ui-using-css-classes.md
isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-excel.md
isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-fullcalendar2.md
isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-gmap3.md
isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-wickedcharts.md
isis/site/trunk/content/components/viewers/wicket/static-layouts.md
isis/site/trunk/content/contributors/release-process.md
isis/site/trunk/content/core/integtestsupport.md
isis/site/trunk/content/doap_isis.rdf
isis/site/trunk/content/getting-started/quickstart-archetype.html
isis/site/trunk/content/intro/elevator-pitch/common-use-cases.md
isis/site/trunk/content/intro/getting-started/ide/eclipse.md
isis/site/trunk/content/intro/getting-started/ide/intellij.md
isis/site/trunk/content/intro/tutorials/screencasts.md
isis/site/trunk/content/reference/recognized-annotations/SortedBy-deprecated.md
isis/site/trunk/content/reference/services/bulk-interaction.md
isis/site/trunk/content/reference/services/scratchpad.md
Modified:
isis/site/trunk/content/components/objectstores/jdo/IsisConfigurationForJdoIntegTests.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/IsisConfigurationForJdoIntegTests.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
---
isis/site/trunk/content/components/objectstores/jdo/IsisConfigurationForJdoIntegTests.md
(original)
+++
isis/site/trunk/content/components/objectstores/jdo/IsisConfigurationForJdoIntegTests.md
Tue Feb 24 06:29:35 2015
@@ -4,4 +4,4 @@ When running integration tests with the
To remove a little bit of boilerplate, the `IsisConfigurationForJdoIntegTests`
class (in the `org.apache.isis.objectstore.jdo.datanucleus` package) can be
used to bootstrap the application.
-The (example applications that we reverse engineer into our)
[two](../../../intro/getting-started/simple-archetype.html)
[archetypes](../../../intro/getting-started/quickstart-archetype.html) show
this; see for example the
[`ToDoSystemInitializer`](https://github.com/apache/isis/blob/3dcfb2fcd61636ff2fac66a3c7c54a500fdf2c6a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/ToDoSystemInitializer.java#L70)
class.
\ No newline at end of file
+The simpleapp example application (that we reverse engineer into our)
[simpleapp archetype](../../../intro/getting-started/simple-archetype.html)
shows this; see for example the
[`SystemAppSystemInitializer`](https://github.com/apache/isis/blob/07fe61ef3fb029ae36427f60da2afeeb931e4f88/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/bootstrap/SimpleAppSystemInitializer.java#L49)
class.
\ No newline at end of file
Modified:
isis/site/trunk/content/components/objectstores/jdo/disabling-persistence-by-reachability.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/disabling-persistence-by-reachability.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
---
isis/site/trunk/content/components/objectstores/jdo/disabling-persistence-by-reachability.md
(original)
+++
isis/site/trunk/content/components/objectstores/jdo/disabling-persistence-by-reachability.md
Tue Feb 24 06:29:35 2015
@@ -14,7 +14,7 @@ We therefore **recommend that you disabl
#
isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
-This change has been made to the
[simple](../../../intro/getting-started/simple-archetype.html) and
[quickstart](../../../intro/getting-started/quickstart-archetype.html)
archetypes.
+This change has been made to the
[simple](../../../intro/getting-started/simple-archetype.html) archetype.
If you do disable this feature, then you will (of course) need to ensure that
you explicitly persist all entities using the
`DomainObjectContainer#persist(.)` or
`DomainObjectContainer#persistIfNotAlready(.)` methods.
Modified:
isis/site/trunk/content/components/objectstores/jdo/enabling-logging.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/enabling-logging.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/components/objectstores/jdo/enabling-logging.md
(original)
+++ isis/site/trunk/content/components/objectstores/jdo/enabling-logging.md Tue
Feb 24 06:29:35 2015
@@ -14,7 +14,7 @@ As per the [DN logging page](http://www.
Configure log4jdbc JDBC rather than the vanilla driver (see
`WEB-INF/persistor_datanucleus.properties`) and configure log4j logging (see
`WEB-INF/logging.properties`).
-There are examples of both in the quickstart archetype.
+There are examples of both in the [simpleapp
archetype](../../../intro/getting-started/simpleapp-archetype.html).
### In the Database
Modified: isis/site/trunk/content/components/objectstores/jdo/lazy-loading.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/lazy-loading.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/components/objectstores/jdo/lazy-loading.md
(original)
+++ isis/site/trunk/content/components/objectstores/jdo/lazy-loading.md Tue Feb
24 06:29:35 2015
@@ -2,25 +2,22 @@ Title: Lazy Loading
By default, collections all rendered lazily and are thus also loaded lazily
from the database.
-However, even in the case of collections that have annotated with
`@Render(Type.EAGERLY)`, these should probably still be lazily loaded.
Otherwise, there will always be an unnecessary cost when rendering the object
in a table.
+However, even in the case of collections that have annotated with
`@CollectionLayout(render=RenderType.EAGERLY)` (or equivalently in
`.layout.json` file, or using the now deprecated `@Render(Type.EAGERLY)`, these
should probably still be lazily loaded. Otherwise, there will always be an
unnecessary cost when rendering the object in a table.
-For example, in the `ToDoItem` (in the [quickstart
archetype](../../../intro/getting-started/quickstart-archetype.html)) the
`dependencies` collection is as follows:
+For example, in the `ToDoItem` (in the [todoapp
example](https://github.com/isisaddons/isis-app-todoapp/blob/61b8114a8e01dbb3c380b31cf09eaed456407570/dom/src/main/java/todoapp/dom/module/todoitem/ToDoItem.java)
(non-ASF)) the `dependencies` collection is as follows:
-<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() {
- return dependencies;
- }
- public void setDependencies(final SortedSet<ToDoItem> dependencies) {
- this.dependencies = dependencies;
- }
-</pre>
+ @javax.jdo.annotations.Persistent(table="ToDoItemDependencies")
+ @javax.jdo.annotations.Join(column="dependingId")
+ @javax.jdo.annotations.Element(column="dependentId")
-Even though `@Render(Type.EAGERLY)`, the `@javax.jdo.annotations.Persistent`
annotation leaves the `defaultFetchGroup` as its default, which for collections
is "false".
+ 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;
+ }
+
+Even though the Isis annotations state to render the collection eagerly, the
JDO `@javax.jdo.annotations.Persistent` annotation leaves the
`defaultFetchGroup` 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.
Modified: isis/site/trunk/content/components/objectstores/jdo/mapping-blobs.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/mapping-blobs.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/components/objectstores/jdo/mapping-blobs.md
(original)
+++ isis/site/trunk/content/components/objectstores/jdo/mapping-blobs.md Tue
Feb 24 06:29:35 2015
@@ -8,24 +8,23 @@ As for [Joda dates](mapping-joda-dates.h
### Mapping Blobs
-For example, in the `ToDoItem` class (of the [quickstart
archetype](../../../getting-started/quickstart-archetype.html)) the
`attachment` property (v1.5.0 onwards) is as follows:
+For example, in the `ToDoItem` class (of the [todoapp example
app](https://github.com/isisaddons/isis-app-todoapp/blob/61b8114a8e01dbb3c380b31cf09eaed456407570/dom/src/main/java/todoapp/dom/module/todoitem/ToDoItem.java#L475)
(non-ASF) the `attachment` property is as follows:
-<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() {
- return attachment;
- }
- public void setAttachment(final Blob attachment) {
- this.attachment = attachment;
- }
-</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;
+ @Property(
+ optionality = Optionality.OPTIONAL
+ )
+ public Blob getAttachment() {
+ return attachment;
+ }
+ public void setAttachment(final Blob attachment) {
+ this.attachment = attachment;
+ }
The three `@javax.jdo.annotations.Column` annotations are required because the
mapping classes that Isis provides
([IsisBlobMapping](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)
and
[IsisClobMapping](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))
map to 3 columns. (It is not an error to omit these `@Column` annotations,
but without them the names of the table columns are simply suffixed `_0`, `_1`,
`_2` etc.
Modified:
isis/site/trunk/content/components/objectstores/jdo/mapping-joda-dates.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/mapping-joda-dates.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/components/objectstores/jdo/mapping-joda-dates.md
(original)
+++ isis/site/trunk/content/components/objectstores/jdo/mapping-joda-dates.md
Tue Feb 24 06:29:35 2015
@@ -6,20 +6,16 @@ It is, however, necessary to annotate yo
Moreover, these datatypes are *not* in the default fetch group, meaning that
JDO/DataNucleus will perform an additional `SELECT` query for each attribute.
To avoid this extra query, the annotation should indicate that the property is
in the default fetch group.
-For example, the `ToDoItem` (in the [quickstart
archetype](../../../intro/getting-started/quickstart-archetype.html)) defines
the `dueBy` property as follows:
+For example, the `ToDoItem` (in the [todoapp example
app](https://github.com/isisaddons/isis-app-todoapp) (not ASF)) defines the
`dueBy` property as follows:
<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: isis/site/trunk/content/components/objectstores/jdo/persistence_xml.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/persistence_xml.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/components/objectstores/jdo/persistence_xml.md
(original)
+++ isis/site/trunk/content/components/objectstores/jdo/persistence_xml.md Tue
Feb 24 06:29:35 2015
@@ -1,6 +1,6 @@
Title: Configuring the persistence.xml file
-> See also:
+> See also:
>
> * [how to use JDO/DataNucleus with Maven](./datanucleus-and-maven.html).
> * [how to use JDO/DataNucleus with Eclipse](./datanucleus-and-eclipse.html).
>
@@ -24,7 +24,7 @@ Specify a suitable value for the `<persi
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:
isis/site/trunk/content/components/objectstores/jdo/using-jndi-datasource.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/using-jndi-datasource.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
---
isis/site/trunk/content/components/objectstores/jdo/using-jndi-datasource.md
(original)
+++
isis/site/trunk/content/components/objectstores/jdo/using-jndi-datasource.md
Tue Feb 24 06:29:35 2015
@@ -36,7 +36,7 @@ Secondly, in the `WEB-INF/web.xml`, decl
<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>
@@ -45,7 +45,7 @@ Secondly, in the `WEB-INF/web.xml`, decl
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 `$TOMCAT_HOME/conf/context.xml`:
<pre>
-<Resource name="jdbc/quickstart"
+<Resource name="jdbc/simpleapp"
auth="Container"
type="javax.sql.DataSource"
maxActive="100"
@@ -54,7 +54,7 @@ Finally, declare the datasource as requi
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>
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
`$TOMCAT_HOME/lib`.
Modified: isis/site/trunk/content/components/objectstores/sql/about.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/sql/about.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/components/objectstores/sql/about.md (original)
+++ isis/site/trunk/content/components/objectstores/sql/about.md Tue Feb 24
06:29:35 2015
@@ -1,10 +1,8 @@
Title: SQL object store
-The SQL object store module provides the ability to persist domain objects
into an RDBMS. It has no external dependencies, using simply JDBC.
-
-### Archetypes
-
-You can adapt the [quickstart
archetype](../../../getting-started/quickstart-archetype.html) to run with the
SQL OS by following [these
instructions](configuring-the-sql-os-objectstore-with-the-quickstart-archetype.html).
+{note
+This component has been retired.
+}
### Releases
Modified: isis/site/trunk/content/components/security/shiro/configuring-shiro.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/security/shiro/configuring-shiro.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/components/security/shiro/configuring-shiro.md
(original)
+++ isis/site/trunk/content/components/security/shiro/configuring-shiro.md Tue
Feb 24 06:29:35 2015
@@ -27,7 +27,7 @@ Shiro will then read `WEB-INF/shiro.ini`
## Telling Isis to use Shiro for authentication and authorization
-
+w
Isis itself supports multiple authentication/authorization mechanisms. To
tell it to use shiro, update the `WEB-INF/isis.properties` file:
isis.authentication=shiro
@@ -87,17 +87,17 @@ See [here](./format-of-permissions.html)
## Multiple Realms
-The `shiro.ini` file as configured in the [quickstart
archetype](../../../intro/getting-started/quickstart-archetype.html) is a
little more complex. Here there are two text-based realms defined, `realm1`
and `realm2`. The `resourcePath` for these realms is in the form:
+A more sophisticated approach is to use external realms. For example, to
configure two text-based realms defined, `realm1` and `realm2`, we would define
a `resourcePath` for each, in the form:
realm1.resourcePath=classpath:webapp/realm1.ini
that is, the `src/main/resources/webapp/realm1.ini` file in the webapp project.
-The security manager for the app only references these two realms:
+The security manager for the app would then be told to use these two realms:
securityManager.realms = $realm1,$realm2
-meaning that the `[users]` and `[roles]` sections of `shiro.ini` are unused.
Instead, you'll find these sections in both `realm1.ini` and `realm2.ini`
(because both are coincidentally implementations of the same
`org.apache.shiro.realm.text.IniRealm` class).
+The the `[users]` and `[roles]` sections of `shiro.ini` would then be unused.
Instead, you'll find these sections in both `realm1.ini` and `realm2.ini`
(because both are coincidentally implementations of the same
`org.apache.shiro.realm.text.IniRealm` class).
## What the user/roles translate to
@@ -112,7 +112,7 @@ In your domain objects you can find the
The role `name` property encodes both the realm that provided the role, and
the role identity itself.
-For example, in the quickstart/todo app, if logging in as `dick` with the
following entries for `realm1`:
+For example, in the simpleapp, if logging in as `dick` with the following
entries for `realm1`:
dick = pass, user_role, analysis_role, self-install_role
@@ -141,3 +141,13 @@ Something like the following should do:
ds = com.mysql.jdbc.jdbc2.optional.MysqlDataSource
ds ...etc
securityManager.realms = $jdbcRealm
+
+## Configuring Shiro to use the Security Isis Addons
+
+The Isisaddons [security
module](https://github.com/isisaddons/isis-module-security) (not ASF) provides
a complete
+security subdomain for users, roles, permissions; all persisted as JDO domain
objects. It also includes a Shiro realm
+integration.
+
+See the module's README for details of how to configure an existing app to use
this module. Or, look at the the
+Isisaddons [todoapp example](https://github.com/isisaddons/isis-app-todoapp)
(not ASF), which is preconfigured to use
+the security module.
Modified: isis/site/trunk/content/components/viewers/wicket/bookmarks.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/viewers/wicket/bookmarks.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/components/viewers/wicket/bookmarks.md (original)
+++ isis/site/trunk/content/components/viewers/wicket/bookmarks.md Tue Feb 24
06:29:35 2015
@@ -12,7 +12,7 @@ Bookmarking is automatic; whenever a boo
#### Simple List
-The following screenshot, taken from example todo app (generated by the
[quickstart
archetype](../../../intro/getting-started/quickstart-archetype.html)) shows how
the bookmarks are listed in a sliding panel.
+The following screenshot, taken from [Isisaddons example
todoapp](https://github.com/isisaddons/isis-app-todoapp) (not ASF) shows how
the bookmarks are listed in a sliding panel.
<a href="images/bookmarks/bookmarked-pages-panel.png"><img
src="images/bookmarks/bookmarked-pages-panel-940.png"/></a>
Modified:
isis/site/trunk/content/components/viewers/wicket/configuring-the-about-page.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/viewers/wicket/configuring-the-about-page.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
---
isis/site/trunk/content/components/viewers/wicket/configuring-the-about-page.md
(original)
+++
isis/site/trunk/content/components/viewers/wicket/configuring-the-about-page.md
Tue Feb 24 06:29:35 2015
@@ -17,59 +17,57 @@ If none of these are found, then no vers
## Configuration
-*Note: the configuration described here will also be part of the
quickstart_wicket_restful_jdo archetype (1.0.3+).*
+_This configuration is included within the [simpleapp
archetype](../../../intro/getting-started/simpleapp-archetype.html)._
-#### Adding attributes to the WAR's manifest
+#### Adding attributes to the WAR's manifest
Add the following to the webapp's `pom.xml` (under `<build><plugins>`):
-<pre>
-<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>maven-version</goal>
- </goals>
- </execution>
- </executions>
-</plugin>
-
-<plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Build-Time>${maven.build.timestamp}</Build-Time>
- <Build-Number>${buildNumber}</Build-Number>
- <Build-Host>${agent.name}</Build-Host>
- <Build-User>${user.name}</Build-User>
- <Build-Maven>Maven ${maven.version}</Build-Maven>
- <Build-Java>${java.version}</Build-Java>
- <Build-OS>${os.name}</Build-OS>
- <Build-Label>${project.version}</Build-Label>
- </manifestEntries>
- </archive>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>war</goal>
- </goals>
- <configuration>
- <classifier>${env}</classifier>
- </configuration>
- </execution>
- </executions>
-</plugin>
-</pre>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>maven-version</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Build-Time>${maven.build.timestamp}</Build-Time>
+ <Build-Number>${buildNumber}</Build-Number>
+ <Build-Host>${agent.name}</Build-Host>
+ <Build-User>${user.name}</Build-User>
+ <Build-Maven>Maven ${maven.version}</Build-Maven>
+ <Build-Java>${java.version}</Build-Java>
+ <Build-OS>${os.name}</Build-OS>
+ <Build-Label>${project.version}</Build-Label>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ <configuration>
+ <classifier>${env}</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
If you then build the webapp from the Maven command line (`mvn clean
package`), then the WAR should contain a `META-INF/MANIFEST.MF` with those
various attribute entries.
@@ -84,7 +82,7 @@ In your subclass of `IsisWicketApplicati
...
- final Module quickstartOverrides = new AbstractModule() {
+ final Module simpleappOverrides = new AbstractModule() {
@Override
protected void configure() {
...
Modified: isis/site/trunk/content/components/viewers/wicket/dynamic-layouts.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/viewers/wicket/dynamic-layouts.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/components/viewers/wicket/dynamic-layouts.md
(original)
+++ isis/site/trunk/content/components/viewers/wicket/dynamic-layouts.md Tue
Feb 24 06:29:35 2015
@@ -11,93 +11,97 @@ How to layout properties and collections
## JSON layout file
-The JSON layout file for class `Xxx` takes the name `Xxx.layout.json`, and
resides in the same package as the class. For example, the layout for the
[ToDoItem](https://github.com/apache/isis/blob/f38fdb92941172eabb12e0943509f239e6d5925f/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java)
class is
[ToDoItem.layout.json](https://github.com/apache/isis/blob/f38fdb92941172eabb12e0943509f239e6d5925f/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.layout.json)
-
-The format of the `.layout.json` file is:
+The JSON layout file for class `Xxx` takes the name `Xxx.layout.json`, and
resides in the same package as the class.
+The format of the file is:
{
- 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"
+ }
}
}
}
}
-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.
+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.
-Note also that the layout file may contain entries for [contributed
associations and
actions](../../../more-advanced-topics/how-to-01-062-How-to-decouple-dependencies-using-contributions.html);
this allows each contributee classes to define their own layout for their
contributions, possibly overriding any static metadata on the original domain
service contributor.
+Note also that the layout file may contain entries for
+[contributed associations and
actions](../../../more-advanced-topics/how-to-01-062-How-to-decouple-dependencies-using-contributions.html);
+this allows each contributee classes to define their own layout for their
contributions, possibly overriding any
+static metadata on the original domain service contributor.
## Downloading an initial layout file
Modified:
isis/site/trunk/content/components/viewers/wicket/file-upload-download.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/viewers/wicket/file-upload-download.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/components/viewers/wicket/file-upload-download.md
(original)
+++ isis/site/trunk/content/components/viewers/wicket/file-upload-download.md
Tue Feb 24 06:29:35 2015
@@ -21,7 +21,7 @@ The `Blob` and `Clob` types can also be
##Screenshots
-The following screenshots are taken from the todo app generated by the
[quickstart archetype](../../../intro/getting-started/quickstart-archetype.html)
+The following screenshots are taken from the Isis addons example
[todoapp](https://github.com/isisaddons/isis-app-todoapp) (not ASF):
#### View mode, empty
Modified:
isis/site/trunk/content/components/viewers/wicket/how-to-tweak-the-ui-using-css-classes.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/viewers/wicket/how-to-tweak-the-ui-using-css-classes.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
---
isis/site/trunk/content/components/viewers/wicket/how-to-tweak-the-ui-using-css-classes.md
(original)
+++
isis/site/trunk/content/components/viewers/wicket/how-to-tweak-the-ui-using-css-classes.md
Tue Feb 24 06:29:35 2015
@@ -21,7 +21,7 @@ These customizations should generally be
## Targetting individual members
-For example, the `ToDoItem` object of the [ToDo
app](../../../intro/getting-started/quickstart-archetype.html) has a `notes`
property. The HTML for this will be something like:
+For example, the `ToDoItem` object of the Isis addons [ToDo
app](../../../intro/getting-started/quickstart-archetype.html) has a `notes`
property. The HTML for this will be something like:
<div>
<div class="property ToDoItem-notes">
@@ -82,13 +82,13 @@ This can then be targeted, for example u
Note also that instead of using `@CssClass` annotation, you can also specify
the CSS style using a [dynamic layout](./dynamic-layouts.html) JSON file:
...
- dueBy: {
- cssClass: { value: "x-key" }
+ "dueBy": {
+ "propertyLayout": {
+ "cssClass": "x-key"
+ }
},
...
-This is in fact how the `ToDoItem` class has been refactored to, as shown
[here](https://github.com/apache/isis/blob/5e5b07c4691cbd651023c6ed8b7b756bc8370e09/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.layout.json#L94).
-
### Application-specific 'theme' class
Modified:
isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-excel.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-excel.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
---
isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-excel.md
(original)
+++
isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-excel.md
Tue Feb 24 06:29:35 2015
@@ -4,7 +4,7 @@ This [Wicket extension](https://github.c
## Screenshots
-The following screenshots are taken from the [demo
app](https://github.com/isisaddons/isis-wicket-excel/tree/master/zzzdemo)
(adapted from Isis' quickstart archetype).
+The following screenshots are taken from [demo
app](https://github.com/isisaddons/isis-wicket-excel/tree/master/zzzdemo) for
this module.
The extension renders a new tab (highlighted):
Modified:
isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-fullcalendar2.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-fullcalendar2.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
---
isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-fullcalendar2.md
(original)
+++
isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-fullcalendar2.md
Tue Feb 24 06:29:35 2015
@@ -4,7 +4,7 @@ This [Wicket extension](https://github.c
## Screenshots
-The following screenshots are taken from the [demo
app](https://github.com/isisaddons/isis-wicket-fullcalendar2/tree/master/zzzdemo)
(adapted from Isis' quickstart archetype).
+The following screenshots are taken from the [demo
app](https://github.com/isisaddons/isis-wicket-fullcalendar2/tree/master/zzzdemo)
for this module.
Standalone collection:
Modified:
isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-gmap3.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-gmap3.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
---
isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-gmap3.md
(original)
+++
isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-gmap3.md
Tue Feb 24 06:29:35 2015
@@ -4,7 +4,7 @@ This [Wicket extension](https://github.c
## Screenshots
-The following screenshots are taken from the [demo
app](https://github.com/isisaddons/isis-wicket-gmap3/tree/master/zzzdemo)
(adapted from Isis' quickstart archetype). Each `ToDoItem` has been made
`Locatable`.
+The following screenshots are taken from the [demo
app](https://github.com/isisaddons/isis-wicket-gmap3/tree/master/zzzdemo) for
this module. Each `ToDoItem` has been made `Locatable`.
<img
src="https://raw.githubusercontent.com/isisaddons/isis-wicket-gmap3/master/images/screenshot-1.png";
style="width: 900px;"/>
@@ -17,7 +17,7 @@ This screencast shows how to customize t
<iframe width="630" height="472"
src="http://www.youtube.com/embed/9o5zAME8LrM"; frameborder="0"
allowfullscreen></iframe>
-Note: this screencast is out of date; it shows how to edit the app generated
by the [quickstart
archetype](../../../../intro/getting-started/quickstart-archetype.html), 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 [demo
app](https://github.com/isisaddons/isis-wicket-gmap3/tree/master/zzzdemo) that
comes with the github project.
+Note: this screencast is out of date. See instead the [demo
app](https://github.com/isisaddons/isis-wicket-gmap3/tree/master/zzzdemo) that
comes with the Isis addons project.
## Download
Modified:
isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-wickedcharts.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-wickedcharts.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
---
isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-wickedcharts.md
(original)
+++
isis/site/trunk/content/components/viewers/wicket/isisaddons/isis-wicket-wickedcharts.md
Tue Feb 24 06:29:35 2015
@@ -13,7 +13,7 @@ The library provides two separate compon
## Screenshots
-The following screenshots are taken from the [demo
app](https://github.com/isisaddons/isis-wicket-wickedcharts/tree/master/zzzdemo)
(adapted from Isis' quickstart archetype).
+The following screenshots are taken from the [demo
app](https://github.com/isisaddons/isis-wicket-wickedcharts/tree/master/zzzdemo)
for this module.
#### Summary Charts
Modified: isis/site/trunk/content/components/viewers/wicket/static-layouts.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/viewers/wicket/static-layouts.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/components/viewers/wicket/static-layouts.md
(original)
+++ isis/site/trunk/content/components/viewers/wicket/static-layouts.md Tue Feb
24 06:29:35 2015
@@ -115,7 +115,7 @@ If the sum of all the columns exceeds 12
## <a name="example-layouts">Example Layouts</a>
-Below are sketches for the layout of the
[ToDoItem](https://github.com/apache/isis/blob/f38fdb92941172eabb12e0943509f239e6d5925f/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java)
class of the [quickstart
archetype](../../../intro/getting-started/quickstart-archetype.html).
+Below are sketches for the layout of the
[ToDoItem](https://github.com/apache/isis/blob/f38fdb92941172eabb12e0943509f239e6d5925f/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java)
class of the Isis addons example
[todoapp](https://github.com/isisaddons/isis-app-todoapp/) (not ASF):
####
Modified: isis/site/trunk/content/contributors/release-process.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/release-process.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/contributors/release-process.md (original)
+++ isis/site/trunk/content/contributors/release-process.md Tue Feb 24 06:29:35
2015
@@ -441,20 +441,6 @@ You should end up with artifacts in your
This file should be in the root of the extracted ZIP. In particular, check
that there are no category-x dependencies.
-<!--
-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.
--->
-
If you find problems and the release was performed on a branch, then just
delete the branch and start over.
## Upload Release for Voting
Modified: isis/site/trunk/content/core/integtestsupport.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/core/integtestsupport.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/core/integtestsupport.md (original)
+++ isis/site/trunk/content/core/integtestsupport.md Tue Feb 24 06:29:35 2015
@@ -17,12 +17,15 @@ To use, update the `pom.xml`:
<artifactId>isis-core-wrapper</artifactId>
</dependency>
-A full example is provided in the [quickstart
archetype](../intro/getting-started/quickstart-archetype.html). 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:
+A full example is provided in the [simpleapp
archetype](../intro/getting-started/simpleapp-archetype.html). 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
[todoapp](https://github.com/isisaddons/isis-app-todoapp/) (not ASF):
public abstract class AbstractIntegTest {
-
+
+ @Inject
protected ToDoItems toDoItems;
+ @Inject
protected WrapperFactory wrapperFactory;
+ @Inject
protected DomainObjectContainer container;
@Rule
@@ -44,13 +47,6 @@ A full example is provided in the [quick
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);
}
@@ -121,4 +117,4 @@ Each of the integration tests then inher
Note that when the `ToDoItem` is wrapped, it is not possible to call
`setComplete()` directly on the object; but when it is unwrapped then this call
can be made as per normal.
-The full source code, plus other example tests, can be found
[here](https://github.com/apache/isis/tree/master/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java).
+The full source code, plus other example tests, can be found
[here](https://github.com/apache/isis/tree/3dcfb2fcd61636ff2fac66a3c7c54a500fdf2c6a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests).
Modified: isis/site/trunk/content/doap_isis.rdf
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/doap_isis.rdf?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/doap_isis.rdf (original)
+++ isis/site/trunk/content/doap_isis.rdf Tue Feb 24 06:29:35 2015
@@ -36,6 +36,23 @@
<category rdf:resource="http://projects.apache.org/category/web-framework";
/>
+ <!-- 2015-02-23 releases -->
+ <release>
+ <Version>
+ <name>isis</name>
+ <created>2015-02-23</created>
+ <revision>1.8.0</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>simpleapp-archetype</name>
+ <created>2015-02-23</created>
+ <revision>1.8.0</revision>
+ </Version>
+ </release>
+
+
<!-- 2014-10-18 releases -->
<release>
<Version>
@@ -65,8 +82,8 @@
<revision>1.7.0</revision>
</Version>
</release>
-
-
+
+
<!-- 2014-07-25 releases -->
<release>
<Version>
Modified: isis/site/trunk/content/getting-started/quickstart-archetype.html
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/getting-started/quickstart-archetype.html?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/getting-started/quickstart-archetype.html (original)
+++ isis/site/trunk/content/getting-started/quickstart-archetype.html Tue Feb
24 06:29:35 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: isis/site/trunk/content/intro/elevator-pitch/common-use-cases.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/intro/elevator-pitch/common-use-cases.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/intro/elevator-pitch/common-use-cases.md (original)
+++ isis/site/trunk/content/intro/elevator-pitch/common-use-cases.md Tue Feb 24
06:29:35 2015
@@ -26,7 +26,7 @@ Isis' own runtime injects an (implementa
One of the original motivations for Isis itself was to be able automatically
generate a user interface for a domain object model.
-Isis' has a pluggable architecture allowing different user interface
technologies. The principal implementation (as configured by the
[simple](../getting-started/simple-archetype.html) or
[quickstart](../getting-started/quickstart-archetype.html) archetypes) is the
[Wicket viewer](../../components/viewers/wicket/about.html). This provides an
appealing default user interface, with the ability to customize the user
interface by writing new [Apache Wicket](http://wicket.apache.org) components.
Some third-party components can be found on github, integrating the Wicket
viewer with [google maps](https://github.com/isisaddons/isis-wicket-gmap3), [a
full calendar](https://github.com/isisaddons/isis-wicket-fullcalendar2), [a
charting library](https://github.com/isisaddons/isis-wicket-wickedcharts) and a
[export to Excel](https://github.com/isisaddons/isis-wicket-excel) component.
+Isis' has a pluggable architecture allowing different user interface
technologies. The principal implementation (as configured by the
[simple](../getting-started/simple-archetype.html) archetype) is the [Wicket
viewer](../../components/viewers/wicket/about.html). This provides an
appealing default user interface, with the ability to customize the user
interface by writing new [Apache Wicket](http://wicket.apache.org) components.
Some third-party components can be found in the Isis addons project,
integrating the Wicket viewer with [google
maps](https://github.com/isisaddons/isis-wicket-gmap3), [a full
calendar](https://github.com/isisaddons/isis-wicket-fullcalendar2) and a
[export to Excel](https://github.com/isisaddons/isis-wicket-excel) component.
It is also possible to write your own viewers:
Modified: isis/site/trunk/content/intro/getting-started/ide/eclipse.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/intro/getting-started/ide/eclipse.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/intro/getting-started/ide/eclipse.md (original)
+++ isis/site/trunk/content/intro/getting-started/ide/eclipse.md Tue Feb 24
06:29:35 2015
@@ -9,7 +9,7 @@ Title: Setting up Eclipse (with JDO/Data
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 [Eclipse](http://www.eclipse.org), which can be downloaded
in various configurations, all of which are free for use. We recommend you
download the "Eclipse JEE package".
-If using the [JDO
Objectstore](../../../components/objectstores/jdo/about.html) (the default if
using the [simple](../simple-archetype.html) or
[quickstart](../quickstart-archetype.html) archetypes), then the development
environment must be configured such that the Java bytecode can be enhanced by a
[JDO enhancer](http://db.apache.org/jdo/enhancement.html). If working in
Eclipse, then JDO enhancement is most easily done by installing the
[DataNucleus'
plugin](http://www.datanucleus.org/products/datanucleus/jdo/guides/eclipse.html).
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).
+If using the [JDO
Objectstore](../../../components/objectstores/jdo/about.html) (the default if
using the [simple](../simple-archetype.html) archetype), then the development
environment must be configured such that the Java bytecode can be enhanced by a
[JDO enhancer](http://db.apache.org/jdo/enhancement.html). If working in
Eclipse, then JDO enhancement is most easily done by installing the
[DataNucleus'
plugin](http://www.datanucleus.org/products/datanucleus/jdo/guides/eclipse.html).
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).
The steps are therefore:
@@ -126,7 +126,7 @@ Not ideal, we know. Please feel free to
## Running the App
-The simple and quickstart archetypes automatically generate `.launch`
configurations in the `webapp` module. You can therefore very simply run the
application by right-clicking on one of these files, and choosing "Run As..."
or "Debug As...".
+The simpleapp archetype automatically provides a `.launch` configurations in
the `webapp` module. You can therefore very simply run the application by
right-clicking on one of these files, and choosing "Run As..." or "Debug As...".
> the screencast shows this in action.
Modified: isis/site/trunk/content/intro/getting-started/ide/intellij.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/intro/getting-started/ide/intellij.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/intro/getting-started/ide/intellij.md (original)
+++ isis/site/trunk/content/intro/getting-started/ide/intellij.md Tue Feb 24
06:29:35 2015
@@ -9,7 +9,7 @@ Title: Setting up the IntelliJ IDE
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 [IntelliJ IDEA](http://www.jetbrains.com/idea/), offering
either a paid-for "Ultimate" edition or a free-to-use Community edition.
Either will do for Isis development.
-If using the [JDO
Objectstore](../../../components/objectstores/jdo/about.html) (the default if
using the [simple](../simple-archetype.html) or
[quickstart](../quickstart-archetype.html) archetypes), then the development
environment must be configured such that the Java bytecode can be enhanced by a
[JDO enhancer](http://db.apache.org/jdo/enhancement.html). When working in
IntelliJ, then JDO enhancement is most easily done by leveraging the Maven
configuration. We do this by executing the `mvn compile` goal in the dom
project, prior to running the application.
+If using the [JDO
Objectstore](../../../components/objectstores/jdo/about.html) (the default if
using the [simpleapp](../simple-archetype.html) archetype), then the
development environment must be configured such that the Java bytecode can be
enhanced by a [JDO enhancer](http://db.apache.org/jdo/enhancement.html). When
working in IntelliJ, then JDO enhancement is most easily done by leveraging the
Maven configuration. We do this by executing the `mvn compile` goal in the dom
project, prior to running the application.
The steps are therefore:
Modified: isis/site/trunk/content/intro/tutorials/screencasts.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/intro/tutorials/screencasts.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/intro/tutorials/screencasts.md (original)
+++ isis/site/trunk/content/intro/tutorials/screencasts.md Tue Feb 24 06:29:35
2015
@@ -33,13 +33,9 @@ We've prepared some screencasts to help
</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:
isis/site/trunk/content/reference/recognized-annotations/SortedBy-deprecated.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/reference/recognized-annotations/SortedBy-deprecated.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
---
isis/site/trunk/content/reference/recognized-annotations/SortedBy-deprecated.md
(original)
+++
isis/site/trunk/content/reference/recognized-annotations/SortedBy-deprecated.md
Tue Feb 24 06:29:35 2015
@@ -5,7 +5,7 @@ Title: @SortedBy
The `@SortedBy` annotation is an instruction hint for (`SortedSet`)
collections to use the specified comparator rather than the natural ordering of
the entity
(as would usually be the case).
-For example, this is taken from the [quickstart
archetype](../../../getting-started/quickstart-archetype.html):
+For example, this is taken from the Isis addons example
[todoapp](https://github.com/isisaddons/isis-app-todoapp/) (not ASF):
public class ToDoItem implements Comparable<ToDoItem> {
Modified: isis/site/trunk/content/reference/services/bulk-interaction.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/reference/services/bulk-interaction.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/reference/services/bulk-interaction.md (original)
+++ isis/site/trunk/content/reference/services/bulk-interaction.md Tue Feb 24
06:29:35 2015
@@ -41,7 +41,7 @@ render a graph etc).
More prosaically, the `Bulk.InteractionContext` 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 [quickstart app](../../intro/getting-started/quickstart-archetype.html):
+the Isis addon example
[todoapp](https://github.com/isisaddons/isis-app-todoapp/) (not ASF):
@Bulk
public ToDoItem completed() {
Modified: isis/site/trunk/content/reference/services/scratchpad.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/reference/services/scratchpad.md?rev=1661847&r1=1661846&r2=1661847&view=diff
==============================================================================
--- isis/site/trunk/content/reference/services/scratchpad.md (original)
+++ isis/site/trunk/content/reference/services/scratchpad.md Tue Feb 24
06:29:35 2015
@@ -23,7 +23,7 @@ In fact, this is a concrete class:
The most common use-case is for [Bulk](../recognized-annotations/Bulk.html)
actions that [act upon multiple objects in a
list](../../more-advanced-topics/how-to-01-065-How-to-add-an-action-to-be-called-on-every-object-in-a-list.html).
The (same) `Scratchpad` service is injected into each of these objects, and
they can use pass information.
-For example, the [ToDo
app](../../intro/getting-started/quickstart-archetype.html) demonstrates how
the `Scratchpad` service can be used to calculate the total cost of the
selected `ToDoItem`s:
+For example, the Isis addons example
[todoapp](https://github.com/isisaddons/isis-app-todoapp/) (not ASF)
demonstrates how the `Scratchpad` service can be used to calculate the total
cost of the selected `ToDoItem`s:
@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}