You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/07/14 10:43:34 UTC
[01/38] isis git commit: ISIS-1467: deprecates AbstractFixture and
related classes; use FixtureScript instead.
Repository: isis
Updated Branches:
refs/heads/master 977265461 -> ad559121c
ISIS-1467: deprecates AbstractFixture and related classes; use FixtureScript instead.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fb5496bd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fb5496bd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fb5496bd
Branch: refs/heads/master
Commit: fb5496bd44cd46596de1a38909392883b126de5d
Parents: 9772654
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:15:05 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:15:05 2016 +0100
----------------------------------------------------------------------
.../isis/applib/fixtures/AbstractFixture.java | 34 +++++++++++++-----
.../applib/fixtures/AbstractFixtureSusa.java | 17 +++++----
.../isis/applib/fixtures/BaseFixture.java | 32 ++++++++++++-----
.../isis/applib/fixtures/CompositeFixture.java | 10 ++++++
.../isis/applib/fixtures/DateFixture.java | 37 ++++++++++++++++++++
.../isis/applib/fixtures/LogonFixture.java | 32 +++++++++++++++++
.../isis/applib/fixtures/SwitchUserFixture.java | 30 +++++++++++++++-
7 files changed, 168 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fb5496bd/core/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixture.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixture.java b/core/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixture.java
index 4db715b..8230349 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixture.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixture.java
@@ -19,7 +19,6 @@
package org.apache.isis.applib.fixtures;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -27,6 +26,7 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.fixturescripts.FixtureScript;
/**
* Convenience class for creating fixtures.
@@ -51,14 +51,14 @@ import org.apache.isis.applib.annotation.Programmatic;
*
* <p>
* To automatically logon for the demo/test, use {@link LogonFixture}.
+ *
+ * @deprecated - use {@link FixtureScript} instead.
*/
+@Deprecated
public abstract class AbstractFixture extends BaseFixture implements CompositeFixture {
private final List<Object> fixtures = Lists.newArrayList();
- // ///////////////////////////////////////////////////////////////
- // Constructor
- // ///////////////////////////////////////////////////////////////
/**
* Assumed to be {@link FixtureType#DOMAIN_OBJECTS data} fixture.
@@ -90,13 +90,16 @@ public abstract class AbstractFixture extends BaseFixture implements CompositeFi
public void install() {
}
- // ///////////////////////////////////////////////////////////////
+
+
// CompositeFixture impl
- // ///////////////////////////////////////////////////////////////
/**
* Allows the fixture to act as a composite (call within constructor).
+ *
+ * @deprecated - use {@link FixtureScript} instead.
*/
+ @Deprecated
protected void addFixture(final Object fixture) {
fixtures.add(fixture);
}
@@ -104,21 +107,27 @@ public abstract class AbstractFixture extends BaseFixture implements CompositeFi
/**
* Returns an array of any fixtures that have been
* {@link #addFixture(Object) added}.
+ *
+ * @deprecated - use {@link FixtureScript} instead.
*/
+ @Deprecated
@Programmatic // to allow this class to be used as a domain object
@Override
public List<Object> getFixtures() {
return Collections.unmodifiableList(fixtures);
}
- // ///////////////////////////////////////////////////////////////
+
+
// Date and time
- // ///////////////////////////////////////////////////////////////
/**
* Will print warning message and do nothing if {@link FixtureClock} could
* not be {@link FixtureClock#initialize() initialized}.
+ *
+ * @deprecated - use {@link FixtureScript} instead.
*/
+ @Deprecated
@Programmatic // to allow this class to be used as a domain object
public void earlierDate(final int years, final int months, final int days) {
if (shouldIgnoreCallBecauseNoClockSetup("earlierDate()")) {
@@ -130,7 +139,10 @@ public abstract class AbstractFixture extends BaseFixture implements CompositeFi
/**
* Will print warning message and do nothing if {@link FixtureClock} could
* not be {@link FixtureClock#initialize() initialized}.
+ *
+ * @deprecated - use {@link FixtureScript} instead.
*/
+ @Deprecated
@Programmatic // to allow this class to be used as a domain object
public void earlierTime(final int hours, final int minutes) {
if (shouldIgnoreCallBecauseNoClockSetup("earlierTime()")) {
@@ -142,7 +154,10 @@ public abstract class AbstractFixture extends BaseFixture implements CompositeFi
/**
* Will print warning message and do nothing if {@link FixtureClock} could
* not be {@link FixtureClock#initialize() initialized}.
+ *
+ * @deprecated - use {@link FixtureScript} instead.
*/
+ @Deprecated
@Programmatic // to allow this class to be used as a domain object
public void laterDate(final int years, final int months, final int days) {
if (shouldIgnoreCallBecauseNoClockSetup("laterDate()")) {
@@ -154,7 +169,10 @@ public abstract class AbstractFixture extends BaseFixture implements CompositeFi
/**
* Will print warning message and do nothing if {@link FixtureClock} could
* not be {@link FixtureClock#initialize() initialized}.
+ *
+ * @deprecated - use {@link FixtureScript} instead.
*/
+ @Deprecated
@Programmatic // to allow this class to be used as a domain object
public void laterTime(final int hours, final int minutes) {
if (shouldIgnoreCallBecauseNoClockSetup("laterTime()")) {
http://git-wip-us.apache.org/repos/asf/isis/blob/fb5496bd/core/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixtureSusa.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixtureSusa.java b/core/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixtureSusa.java
index 79048c9..292bad6 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixtureSusa.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixtureSusa.java
@@ -21,6 +21,7 @@ package org.apache.isis.applib.fixtures;
import org.apache.isis.applib.fixtures.switchuser.SwitchUserService;
import org.apache.isis.applib.fixtures.switchuser.SwitchUserServiceAware;
+import org.apache.isis.applib.fixturescripts.FixtureScript;
/**
* Convenience class for creating fixtures, with support to allow
@@ -30,7 +31,10 @@ import org.apache.isis.applib.fixtures.switchuser.SwitchUserServiceAware;
* Note that unlike {@link AbstractFixture}, fixtures inheriting from
* this class <i>cannot</i> be used as domain objects (the {@link SwitchUserService} does
* not conform to the domain object programming conventions).
+ *
+ * @deprecated - use {@link FixtureScript} instead.
*/
+@Deprecated
public abstract class AbstractFixtureSusa extends AbstractFixture implements SwitchUserServiceAware {
public AbstractFixtureSusa() {
@@ -41,21 +45,20 @@ public abstract class AbstractFixtureSusa extends AbstractFixture implements Swi
super(fixtureType);
}
-
- // {{ User
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
protected void switchUser(final String username, final String... roles) {
switchUserService.switchUser(username, roles);
}
- // }}
- // {{ Injected: SwitchUserService
private SwitchUserService switchUserService;
@Override
- public void setService(final SwitchUserService fixtureService) {
- this.switchUserService = fixtureService;
+ public void setService(final SwitchUserService switchUserService) {
+ this.switchUserService = switchUserService;
}
- // }}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/fb5496bd/core/applib/src/main/java/org/apache/isis/applib/fixtures/BaseFixture.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/BaseFixture.java b/core/applib/src/main/java/org/apache/isis/applib/fixtures/BaseFixture.java
index 03edfe6..64c764f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixtures/BaseFixture.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixtures/BaseFixture.java
@@ -21,12 +21,21 @@ package org.apache.isis.applib.fixtures;
import org.apache.isis.applib.AbstractContainedObject;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.clock.Clock;
+import org.apache.isis.applib.fixturescripts.FixtureScript;
+/**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+@Deprecated
abstract class BaseFixture extends AbstractContainedObject implements InstallableFixture {
private final FixtureType fixtureType;
FixtureClock clock = null;
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public BaseFixture(final FixtureType fixtureType) {
this.fixtureType = fixtureType;
try {
@@ -38,26 +47,25 @@ abstract class BaseFixture extends AbstractContainedObject implements Installabl
}
}
- // /////////////////////////////////////////////////
- // FixtureType
- // /////////////////////////////////////////////////
-
/**
* As specified in constructor.
+ *
+ * @deprecated - use {@link FixtureScript} instead.
*/
+ @Deprecated
@Override
public final FixtureType getType() {
return fixtureType;
}
- // /////////////////////////////////////////////////
- // FixtureClock
- // /////////////////////////////////////////////////
/**
* Will print warning message and do nothing if {@link FixtureClock} could
* not be {@link FixtureClock#initialize() initialized}.
+ *
+ * @deprecated - use {@link FixtureScript} instead.
*/
+ @Deprecated
public void setDate(final int year, final int month, final int day) {
if (shouldIgnoreCallBecauseNoClockSetup("setDate()")) {
return;
@@ -68,7 +76,10 @@ abstract class BaseFixture extends AbstractContainedObject implements Installabl
/**
* Will print warning message and do nothing if {@link FixtureClock} could
* not be {@link FixtureClock#initialize() initialized}.
+ *
+ * @deprecated - use {@link FixtureScript} instead.
*/
+ @Deprecated
public void setTime(final int hour, final int minute) {
if (shouldIgnoreCallBecauseNoClockSetup("setTime()")) {
return;
@@ -82,7 +93,10 @@ abstract class BaseFixture extends AbstractContainedObject implements Installabl
* <p>
* Will return <tt>null</tt> if {@link FixtureClock} could not be
* {@link FixtureClock#initialize() initialized}.
+ *
+ * @deprecated - use {@link FixtureScript} instead.
*/
+ @Deprecated
public FixtureClock getFixtureClock() {
return clock;
}
@@ -90,7 +104,10 @@ abstract class BaseFixture extends AbstractContainedObject implements Installabl
/**
* Will print warning message and do nothing if {@link FixtureClock} could
* not be {@link FixtureClock#initialize() initialized}.
+ *
+ * @deprecated - use {@link FixtureScript} instead.
*/
+ @Deprecated
public void resetClock() {
if (shouldIgnoreCallBecauseNoClockSetup("resetClock()")) {
return;
@@ -105,6 +122,5 @@ abstract class BaseFixture extends AbstractContainedObject implements Installabl
}
return false;
}
- // }}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/fb5496bd/core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java b/core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java
index 024e1d2..d6f3f97 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java
@@ -21,7 +21,17 @@ package org.apache.isis.applib.fixtures;
import java.util.List;
+import org.apache.isis.applib.fixturescripts.FixtureScript;
+
+/**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+@Deprecated
public interface CompositeFixture {
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public List<Object> getFixtures();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/fb5496bd/core/applib/src/main/java/org/apache/isis/applib/fixtures/DateFixture.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/DateFixture.java b/core/applib/src/main/java/org/apache/isis/applib/fixtures/DateFixture.java
index a039ef9..9980670 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixtures/DateFixture.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixtures/DateFixture.java
@@ -19,6 +19,8 @@
package org.apache.isis.applib.fixtures;
+import org.apache.isis.applib.fixturescripts.FixtureScript;
+
/**
* Sole purpose is to set the date/time while object fixtures are being
* installed.
@@ -34,9 +36,16 @@ package org.apache.isis.applib.fixtures;
* {@link #resetClock()}.
*
* @see SwitchUserFixture
+ *
+ * @deprecated - use {@link FixtureScript} instead.
*/
+@Deprecated
public class DateFixture extends BaseFixture {
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public DateFixture(final int year, final int month, final int day, final int hour, final int minutes) {
super(FixtureType.OTHER);
this.year = year;
@@ -46,40 +55,68 @@ public class DateFixture extends BaseFixture {
this.minute = minutes;
}
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public DateFixture(final int year, final int month, final int day) {
this(year, month, day, 0, 0);
}
private final int year;
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public int getYear() {
return year;
}
private final int month;
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public int getMonth() {
return month;
}
private final int day;
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public int getDay() {
return day;
}
private final int hour;
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public int getHour() {
return hour;
}
private final int minute;
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public int getMinute() {
return minute;
}
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
@Override
public void install() {
setDate(year, month, day);
http://git-wip-us.apache.org/repos/asf/isis/blob/fb5496bd/core/applib/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java b/core/applib/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java
index 5862303..a200c00 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java
@@ -24,6 +24,8 @@ import java.util.List;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
+import org.apache.isis.applib.fixturescripts.FixtureScript;
+
/**
* Indicates that the demo or test should be run as the specified user, with the
* specified roles.
@@ -39,39 +41,69 @@ import com.google.common.collect.Lists;
* {@link SwitchUserFixture}.
*
* @see SwitchUserFixture
+ * @deprecated - use {@link FixtureScript} instead.
*/
+@Deprecated
public class LogonFixture implements InstallableFixture {
private final String username;
private final List<String> roles;
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public LogonFixture(final String username, final String... roles) {
this(username, Lists.newArrayList(roles));
}
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public LogonFixture(final String username, final List<String> roles) {
this.username = username;
this.roles = ImmutableList.copyOf(roles);
}
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public String getUsername() {
return username;
}
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public List<String> getRoles() {
return roles;
}
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
@Override
public final void install() {
// does nothing; see comments above.
}
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
@Override
public FixtureType getType() {
return FixtureType.OTHER;
}
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
@Override
public String toString() {
return "LogonFixture [user: " + getUsername() + ", roles: " + getRoles() + "]";
http://git-wip-us.apache.org/repos/asf/isis/blob/fb5496bd/core/applib/src/main/java/org/apache/isis/applib/fixtures/SwitchUserFixture.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/SwitchUserFixture.java b/core/applib/src/main/java/org/apache/isis/applib/fixtures/SwitchUserFixture.java
index 854eeb6..1b814b4 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixtures/SwitchUserFixture.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixtures/SwitchUserFixture.java
@@ -26,6 +26,7 @@ import com.google.common.collect.Lists;
import org.apache.isis.applib.fixtures.switchuser.SwitchUserService;
import org.apache.isis.applib.fixtures.switchuser.SwitchUserServiceAware;
+import org.apache.isis.applib.fixturescripts.FixtureScript;
/**
* Sole purpose is to switch the current user while object fixtures are being
@@ -33,7 +34,7 @@ import org.apache.isis.applib.fixtures.switchuser.SwitchUserServiceAware;
*
* <p>
* An alternative is to switch user using the
- * {@link AbstractFixture#switchUser(String, String...) switchUser} method.
+ * {@link AbstractFixtureSusa#switchUser(String, String...) switchUser} method.
*
* <p>
* Note that (unlike the otherwise similar {@link DateFixture}) the last user
@@ -42,36 +43,63 @@ import org.apache.isis.applib.fixtures.switchuser.SwitchUserServiceAware;
*
* @see DateFixture
* @see LogonFixture
+ *
+ * @deprecated - use {@link FixtureScript} instead.
*/
+@Deprecated
public class SwitchUserFixture extends BaseFixture implements SwitchUserServiceAware {
private final String username;
private final List<String> roles;
private SwitchUserService switchUserService;
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public SwitchUserFixture(final String username, final String... roles) {
this(username, Lists.newArrayList(roles));
}
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public SwitchUserFixture(final String username, final List<String> roles) {
super(FixtureType.OTHER);
this.username = username;
this.roles = ImmutableList.copyOf(roles);
}
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public String getUsername() {
return username;
}
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
public List<String> getRoles() {
return roles;
}
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
@Override
public void install() {
switchUserService.switchUser(username, roles.toArray(new String[] {}));
}
+ /**
+ * @deprecated - use {@link FixtureScript} instead.
+ */
+ @Deprecated
@Override
public void setService(final SwitchUserService switchUserService) {
this.switchUserService = switchUserService;
[08/38] isis git commit: ISIS-1465: fixes text of exception thrown by
BackgroundServiceDefault#asActionInvocationMemento (an unsupported API)
Posted by da...@apache.org.
ISIS-1465: fixes text of exception thrown by BackgroundServiceDefault#asActionInvocationMemento (an unsupported API)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4f32b7d6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4f32b7d6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4f32b7d6
Branch: refs/heads/master
Commit: 4f32b7d616f52193c2e3277ab3193db381625816
Parents: 90df10e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:24:25 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:24:25 2016 +0100
----------------------------------------------------------------------
.../core/runtime/services/background/BackgroundServiceDefault.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4f32b7d6/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
index 0269ed3..e4b6ecf 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
@@ -273,7 +273,7 @@ public class BackgroundServiceDefault implements BackgroundService2 {
@Programmatic
@Override
public ActionInvocationMemento asActionInvocationMemento(Method method, Object domainObject, Object[] args) {
- throw new RuntimeException("Replaced by CommandMementoService");
+ throw new RuntimeException("Replaced by InteractionDtoServiceInternal");
}
[32/38] isis git commit: ISIS-1353: updates wicket-bootstrap from
0.9.15 to 0.9.16
Posted by da...@apache.org.
ISIS-1353: updates wicket-bootstrap from 0.9.15 to 0.9.16
<dependency>
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-core</artifactId>
<version>${wicket-bootstrap.version}</version>
...
</dependency>
<dependency>
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-extensions</artifactId>
<version>${wicket-bootstrap.version}</version>
...
</dependency>
<dependency>
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-themes</artifactId>
<version>${wicket-bootstrap.version}</version>
...
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/208408e6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/208408e6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/208408e6
Branch: refs/heads/master
Commit: 208408e6ea864bd2dc520828af392223d79876fc
Parents: f5906f1
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 07:16:28 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 17:22:32 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/208408e6/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 2aead94..2a51e34 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -142,7 +142,7 @@
<wicket.version>6.23.0</wicket.version>
<wicket-webjars.version>0.4.9</wicket-webjars.version>
- <wicket-bootstrap.version>0.9.15</wicket-bootstrap.version>
+ <wicket-bootstrap.version>0.9.16</wicket-bootstrap.version>
<wicket-source.version>6.0.0.8</wicket-source.version>
<wicket-select2.version>6.23.0</wicket-select2.version>
[03/38] isis git commit: ISIS-1465: fixes incorrect javadoc comment
for Command (in applib).
Posted by da...@apache.org.
ISIS-1465: fixes incorrect javadoc comment for Command (in applib).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0347eb13
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0347eb13
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0347eb13
Branch: refs/heads/master
Commit: 0347eb13ed8c3e9bdb8af2fe07d45b52ad71a9a1
Parents: f3d46cb
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:18:16 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:18:16 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/isis/applib/services/command/Command.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0347eb13/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java b/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
index 7f311ef..d966898 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
@@ -39,8 +39,8 @@ import org.apache.isis.schema.cmd.v1.CommandDto;
/**
* Represents the <i>intention to</i> invoke either an action or modify a property. This intention is reified as a
- * {@link Command#getMemento() memento} by way of the (internal) <tt>CommandMementoService</tt>; typically corresponding
- * to the XML equivalent of a {@link CommandDto}.
+ * {@link Command#getMemento() memento} by way of the (internal) <tt>CommandDtoServiceInternal</tt> domain service;
+ * typically corresponding to the XML equivalent of a {@link CommandDto}.
*
* <p>
* The {@link Command} interface also captures details of the corresponding action invocation (or property edit),
[12/38] isis git commit: ISIS-1353: updates gson from 2.5 to 2.7
Posted by da...@apache.org.
ISIS-1353: updates gson from 2.5 to 2.7
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e66a26b7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e66a26b7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e66a26b7
Branch: refs/heads/master
Commit: e66a26b7a0f8ec5d89f902e5b4892cc8e4c392f8
Parents: 4a4db07
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:34:32 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:34:32 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e66a26b7/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 434989c..382416b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -126,7 +126,7 @@
<axon-core.version>2.4</axon-core.version>
<jackson.version>2.8.0</jackson.version>
- <gson.version>2.5</gson.version>
+ <gson.version>2.7</gson.version>
<swagger-core.version>1.5.5</swagger-core.version>
<swagger-ui.version>2.1.3</swagger-ui.version>
<webjars-servlet-2.x.version>1.4</webjars-servlet-2.x.version>
[25/38] isis git commit: ISIS-1353: updates jetty-all from 9.3.6 to
9.3.10
Posted by da...@apache.org.
ISIS-1353: updates jetty-all from 9.3.6 to 9.3.10
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
<configuration>
<webAppConfig>
<contextPath>webapp</contextPath>
</webAppConfig>
</configuration>
</plugin>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<version>${jetty.version}</version>
<classifier>uber</classifier>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId>
</exclusion>
</exclusions>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0dce459b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0dce459b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0dce459b
Branch: refs/heads/master
Commit: 0dce459bf9ab29170b66e1173149bc6a3bf16aea
Parents: c4d42cd
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 17:17:36 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 17:17:36 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0dce459b/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index e956383..64adc6f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -137,7 +137,7 @@
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
<resteasy-jaxrs.version>3.0.17.Final</resteasy-jaxrs.version>
- <jetty.version>9.3.6.v20151106</jetty.version>
+ <jetty.version>9.3.10.v20160621</jetty.version>
<wicket.version>6.23.0</wicket.version>
[04/38] isis git commit: ISIS-1465: fixes/improves javadoc comments
for IsisSessionFactory
Posted by da...@apache.org.
ISIS-1465: fixes/improves javadoc comments for IsisSessionFactory
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0510263b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0510263b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0510263b
Branch: refs/heads/master
Commit: 0510263b581d473137e0c65394a94170beca8a25
Parents: 0347eb1
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:18:55 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:18:55 2016 +0100
----------------------------------------------------------------------
.../system/session/IsisSessionFactory.java | 25 ++++++++++----------
1 file changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0510263b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
index 80bc088..6573acf 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
@@ -22,6 +22,8 @@ package org.apache.isis.core.runtime.system.session;
import java.util.List;
import java.util.concurrent.Callable;
+import javax.inject.Inject;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,24 +50,21 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManagerException;
-import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProviderUsingInstallers;
/**
- * Analogous (and in essence a wrapper for) a JDO <code>PersistenceManagerFactory</code>
- *
- * Creates an implementation of
- * {@link IsisSessionFactory#openSession(AuthenticationSession)} to create an
- * {@link IsisSession}, but delegates to subclasses to actually obtain the
- * components that make up that {@link IsisSession}.
+ * Is the factory of {@link IsisSession}s, also holding a reference to the current session using
+ * a thread-local.
+ *
+ * <p>
+ * The class can in considered as analogous to (and is in many ways a wrapper for) a JDO
+ * <code>PersistenceManagerFactory</code>.
+ * </p>
*
* <p>
- * The idea is that one subclass can use the {@link IsisComponentProviderUsingInstallers.InstallerLookup} design to
- * lookup installers for components (and hence create the components
- * themselves), whereas another subclass might simply use Spring (or another DI
- * container) to inject in the components according to some Spring-configured
- * application context.
+ * The class is only instantiated once; it is also registered with {@link ServicesInjector}, meaning that
+ * it can be {@link Inject}'d into other domain services.
+ * </p>
*/
-
public class IsisSessionFactory implements ApplicationScopedComponent {
@SuppressWarnings("unused")
[27/38] isis git commit: ISIS-1353: updates objenesis from 2.2 to 2.4
Posted by da...@apache.org.
ISIS-1353: updates objenesis from 2.2 to 2.4
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>${objenesis.version}</version>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ebd29359
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ebd29359
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ebd29359
Branch: refs/heads/master
Commit: ebd2935967eb8841daea741df70e0fb270bd902d
Parents: a5b2b3a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 17:20:06 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 17:20:06 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ebd29359/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 639d61f..0b5dd8f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -112,7 +112,7 @@
<hamcrest.version>1.3</hamcrest.version>
- <objenesis.version>2.2</objenesis.version>
+ <objenesis.version>2.4</objenesis.version>
<javassist.version>3.20.0-GA</javassist.version>
<reflections.version>0.9.10</reflections.version>
[06/38] isis git commit: ISIS-1391: adds TODO to capture this ticket
on MessageBrokerServiceInternal
Posted by da...@apache.org.
ISIS-1391: adds TODO to capture this ticket on MessageBrokerServiceInternal
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fd220817
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fd220817
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fd220817
Branch: refs/heads/master
Commit: fd2208178c4016e83b0af05dd7b41cb95a7a11c0
Parents: a760e22
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:23:00 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:23:00 2016 +0100
----------------------------------------------------------------------
.../services/msgbroker/MessageBrokerServiceInternal.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fd220817/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/msgbroker/MessageBrokerServiceInternal.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/msgbroker/MessageBrokerServiceInternal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/msgbroker/MessageBrokerServiceInternal.java
index ab04107..6d96010 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/msgbroker/MessageBrokerServiceInternal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/msgbroker/MessageBrokerServiceInternal.java
@@ -18,6 +18,9 @@ package org.apache.isis.core.metamodel.services.msgbroker;
import org.apache.isis.applib.annotation.Programmatic;
+/**
+ * TODO: combine with MessageService
+ */
public interface MessageBrokerServiceInternal {
/**
[34/38] isis git commit: ISIS-1353: fixes dependency convergence
issues in maven-plugin pom
Posted by da...@apache.org.
ISIS-1353: fixes dependency convergence issues in maven-plugin pom
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/de5a3f36
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/de5a3f36
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/de5a3f36
Branch: refs/heads/master
Commit: de5a3f36518376a545492bbb6080c09d83dfcbe1
Parents: 19cf085
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 07:40:08 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 17:23:05 2016 +0100
----------------------------------------------------------------------
core/maven-plugin/pom.xml | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/de5a3f36/core/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index b90f396..75fc5fe 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -44,8 +44,6 @@
<maven-core.version>3.3.9</maven-core.version>
<maven-project.version>3.0-alpha-2</maven-project.version>
<maven-plugin-annotations.version>3.4</maven-plugin-annotations.version>
- <plexus-sec-dispatcher.version>1.4</plexus-sec-dispatcher.version>
- <plexus-utils.version>2.1</plexus-utils.version>
<plexus-container-default.version>1.7</plexus-container-default.version>
</properties>
@@ -124,12 +122,12 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${maven-core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>${plexus-utils.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -153,6 +151,14 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>:plexus-sec-dispatcher</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -270,18 +276,6 @@
</dependency>
<dependency>
- <groupId>org.sonatype.plexus</groupId>
- <artifactId>plexus-sec-dispatcher</artifactId>
- <version>${plexus-sec-dispatcher.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-toolchain</artifactId>
<version>${maven-project.version}</version>
[17/38] isis git commit: ISIS-1353: updates joda-time from 2.9.1 to
2.9.4
Posted by da...@apache.org.
ISIS-1353: updates joda-time from 2.9.1 to 2.9.4
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda-time.version}</version>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a74c0450
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a74c0450
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a74c0450
Branch: refs/heads/master
Commit: a74c0450947f7e91e2fc7cc94ea86233d03cbafd
Parents: 7d2367b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:44:49 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:44:49 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a74c0450/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index b8e5e49..4960952 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -107,7 +107,7 @@
<slf4j.version>1.7.13</slf4j.version>
<log4j.version>1.2.17</log4j.version>
- <joda-time.version>2.9.1</joda-time.version>
+ <joda-time.version>2.9.4</joda-time.version>
<guava.version>19.0</guava.version>
<hamcrest.version>1.3</hamcrest.version>
[20/38] isis git commit: ISIS-1353: updates wicket-select2 from
6.20.0 to 6.23.0 and select2 from 3.5.2 to 3.5.4
Posted by da...@apache.org.
ISIS-1353: updates wicket-select2 from 6.20.0 to 6.23.0 and select2 from 3.5.2 to 3.5.4
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-select2</artifactId>
<version>${wicket-select2.version}</version>
<exclusions>
<exclusion>
<!-- for dependency convergence -->
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>select2</artifactId>
<version>${select2.version}</version>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e7380fb1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e7380fb1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e7380fb1
Branch: refs/heads/master
Commit: e7380fb16b8572db97f7603167ebd8ddf191182f
Parents: 9ac7662
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:51:00 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:51:00 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e7380fb1/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index dbe8205..5a9df04 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -145,8 +145,8 @@
<wicket-bootstrap.version>0.9.15</wicket-bootstrap.version>
<wicket-source.version>6.0.0.8</wicket-source.version>
- <wicket-select2.version>6.20.0</wicket-select2.version>
- <select2.version>3.5.2</select2.version>
+ <wicket-select2.version>6.23.0</wicket-select2.version>
+ <select2.version>3.5.4</select2.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
<guice.version>4.1.0</guice.version>
[37/38] isis git commit: ISIS-1353: updates website with 1.13.0
version of the archetype
Posted by da...@apache.org.
ISIS-1353: updates website with 1.13.0 version of the archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/80369fdc
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/80369fdc
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/80369fdc
Branch: refs/heads/master
Commit: 80369fdca68d10b009317f827a140b195c871a5d
Parents: 0bda746
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jul 14 11:34:02 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jul 14 11:34:02 2016 +0100
----------------------------------------------------------------------
adocs/documentation/src/main/asciidoc/guides/_tg_pet-clinic.adoc | 2 +-
.../main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc | 2 +-
.../guides/_ugfun_getting-started_simpleapp-archetype.adoc | 2 +-
adocs/documentation/src/main/asciidoc/index.html | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/80369fdc/adocs/documentation/src/main/asciidoc/guides/_tg_pet-clinic.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_tg_pet-clinic.adoc b/adocs/documentation/src/main/asciidoc/guides/_tg_pet-clinic.adoc
index f5cbb53..fdc517b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_tg_pet-clinic.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_tg_pet-clinic.adoc
@@ -62,7 +62,7 @@ Run the simpleapp archetype to build an empty Isis application:
mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.12.2 \
+ -D archetypeVersion=1.13.0 \
-D groupId=com.mycompany \
-D artifactId=petclinic \
-D version=1.0-SNAPSHOT \
http://git-wip-us.apache.org/repos/asf/isis/blob/80369fdc/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc b/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
index 0046b76..2f352d7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
@@ -30,7 +30,7 @@ Run the simpleapp archetype to build an empty Isis application:
mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.12.2 \
+ -D archetypeVersion=1.13.0 \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
http://git-wip-us.apache.org/repos/asf/isis/blob/80369fdc/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_simpleapp-archetype.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_simpleapp-archetype.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_simpleapp-archetype.adoc
index cf507a6..d912a9c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_simpleapp-archetype.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_simpleapp-archetype.adoc
@@ -24,7 +24,7 @@ To build the app from the latest stable release, then run the following command:
mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.12.2 \
+ -D archetypeVersion=1.13.0 \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
http://git-wip-us.apache.org/repos/asf/isis/blob/80369fdc/adocs/documentation/src/main/asciidoc/index.html
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/index.html b/adocs/documentation/src/main/asciidoc/index.html
index 62fe96d..6eb7828 100644
--- a/adocs/documentation/src/main/asciidoc/index.html
+++ b/adocs/documentation/src/main/asciidoc/index.html
@@ -708,7 +708,7 @@ And I must say this: "Great Support from the development team"</p>
mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.12.2 \
+ -D archetypeVersion=1.13.0 \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
[13/38] isis git commit: ISIS-1353: updates guice from 4.0 to 4.1.00
Posted by da...@apache.org.
ISIS-1353: updates guice from 4.0 to 4.1.00
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice-parent</artifactId>
<version>${guice.version}</version>
<type>pom</type>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e9f1c19c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e9f1c19c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e9f1c19c
Branch: refs/heads/master
Commit: e9f1c19cc96bd7d7cc28df74a2db3d9641c64021
Parents: e66a26b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:36:53 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:36:53 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e9f1c19c/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 382416b..d387746 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -150,7 +150,7 @@
<select2.version>3.5.2</select2.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
- <guice.version>4.0</guice.version>
+ <guice.version>4.1.0</guice.version>
<picocontainer.version>2.15</picocontainer.version>
<dom4j.version>1.6.1</dom4j.version>
[33/38] isis git commit: ISIS-1353: updates hsqldb from 2.3.1 to 2.3.4
Posted by da...@apache.org.
ISIS-1353: updates hsqldb from 2.3.1 to 2.3.4
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/19cf0857
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/19cf0857
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/19cf0857
Branch: refs/heads/master
Commit: 19cf0857419d336218684e27ed65aec7d3d8a2d9
Parents: 208408e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 07:17:21 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 17:22:48 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/19cf0857/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 2a51e34..ec91458 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -133,7 +133,7 @@
<!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver -->
<!-- using 2.3.3 throws SQL exception in simpleapp integtests -->
- <hsqldb.version>2.3.1</hsqldb.version>
+ <hsqldb.version>2.3.4</hsqldb.version>
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
<resteasy-jaxrs.version>3.0.17.Final</resteasy-jaxrs.version>
[02/38] isis git commit: ISIS-1465: fixes incorrect Javadoc comment
for BackgroundService (in applib).
Posted by da...@apache.org.
ISIS-1465: fixes incorrect Javadoc comment for BackgroundService (in applib).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f3d46cbe
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f3d46cbe
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f3d46cbe
Branch: refs/heads/master
Commit: f3d46cbee2c9c1752197ab8368010e236e67e7d3
Parents: fb5496b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:17:32 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:17:32 2016 +0100
----------------------------------------------------------------------
.../apache/isis/applib/services/background/BackgroundService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f3d46cbe/core/applib/src/main/java/org/apache/isis/applib/services/background/BackgroundService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/background/BackgroundService.java b/core/applib/src/main/java/org/apache/isis/applib/services/background/BackgroundService.java
index 23b8f28..9a5a486 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/background/BackgroundService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/background/BackgroundService.java
@@ -52,7 +52,7 @@ public interface BackgroundService {
/**
* Not API: for framework use only.
*
- * @deprecated - no longer called by the framework (moved to <tt>CommandMementoService</tt>, an internal SPI service).
+ * @deprecated - no longer called by the framework (moved to <tt>InteractionDtoServiceInternal</tt>, an internal SPI service).
*/
@Deprecated
@Programmatic
[31/38] isis git commit: ISIS-1353: updates wicket-webjars from 1.4.8
to 1.4.9
Posted by da...@apache.org.
ISIS-1353: updates wicket-webjars from 1.4.8 to 1.4.9
<dependency>
<groupId>de.agilecoders.wicket.webjars</groupId>
<artifactId>wicket-webjars</artifactId>
<version>${wicket-webjars.version}</version>
<exclusions>
<exclusion>
<!-- for dependency convergence -->
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
</exclusion>
</exclusions>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f5906f1d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f5906f1d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f5906f1d
Branch: refs/heads/master
Commit: f5906f1d800f4cf4fbc8eb7d739595f5cb14c844
Parents: da82734
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 07:14:36 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 17:22:17 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f5906f1d/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index dd3b04e..2aead94 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -141,7 +141,7 @@
<wicket.version>6.23.0</wicket.version>
- <wicket-webjars.version>0.4.8</wicket-webjars.version>
+ <wicket-webjars.version>0.4.9</wicket-webjars.version>
<wicket-bootstrap.version>0.9.15</wicket-bootstrap.version>
<wicket-source.version>6.0.0.8</wicket-source.version>
[28/38] isis git commit: ISIS-1353: updates slf4j from 1.7.13 to
1.7.21
Posted by da...@apache.org.
ISIS-1353: updates slf4j from 1.7.13 to 1.7.21
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/069b820c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/069b820c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/069b820c
Branch: refs/heads/master
Commit: 069b820cddc86b222893b9c878158e12315a7df1
Parents: ebd2935
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 07:10:00 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 17:21:08 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/069b820c/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 0b5dd8f..2a0515a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -104,7 +104,7 @@
<shiro.version>1.2.6</shiro.version>
- <slf4j.version>1.7.13</slf4j.version>
+ <slf4j.version>1.7.21</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<joda-time.version>2.9.4</joda-time.version>
[18/38] isis git commit: ISIS-1353: updates wicket from 6.20.0 to
6.23.0
Posted by da...@apache.org.
ISIS-1353: updates wicket from 6.20.0 to 6.23.0
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
<version>${wicket.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
<version>${wicket.version}</version>
<exclusions>
<exclusion>
<!-- for dependency convergence -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
<version>${wicket.version}</version>
<exclusions>
<exclusion>
<!-- for dependency convergence -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
<version>${wicket.version}</version>
<exclusions>
<exclusion>
<!-- for dependency convergence -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
<version>${wicket.version}</version>
<exclusions>
<exclusion>
<!-- for dependency convergence -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-datetime</artifactId>
<version>${wicket.version}</version>
<exclusions>
<exclusion>
<!-- for dependency convergence -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
<version>${wicket.version}</version>
<exclusions>
<exclusion>
<!-- for dependency convergence -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-guice</artifactId>
<version>${wicket.version}</version>
<exclusions>
<exclusion>
<!-- for dependency convergence -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<!-- for Java7 compatibility (we don't use the proxying capability of this component) -->
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</exclusion>
</exclusions>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b4f031ac
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b4f031ac
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b4f031ac
Branch: refs/heads/master
Commit: b4f031acd4fd9579351a428810688cfa4b07d7a5
Parents: a74c045
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:47:06 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:47:06 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b4f031ac/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 4960952..c37c560 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -139,7 +139,7 @@
<jetty.version>9.3.6.v20151106</jetty.version>
- <wicket.version>6.20.0</wicket.version>
+ <wicket.version>6.23.0</wicket.version>
<wicketstuff.version>6.20.0</wicketstuff.version>
<wicket-webjars.version>0.4.8</wicket-webjars.version>
[36/38] isis git commit: ISIS-1353: updates website with screenshots
of swagger-ui
Posted by da...@apache.org.
ISIS-1353: updates website with screenshots of swagger-ui
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0bda7461
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0bda7461
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0bda7461
Branch: refs/heads/master
Commit: 0bda7461fa7c23e3d277e7558cf8fac01d99b43b
Parents: c2f335d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jul 14 11:33:27 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jul 14 11:33:27 2016 +0100
----------------------------------------------------------------------
.../images/isis-in-pictures/205-swagger-ui.png | Bin 0 -> 138809 bytes
.../main/asciidoc/images/todoapp/swagger-ui.png | Bin 0 -> 105485 bytes
.../documentation/src/main/asciidoc/index.html | 20 ++++++++++++++++---
.../src/main/asciidoc/isis-in-pictures.adoc | 11 ++++++++--
4 files changed, 26 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0bda7461/adocs/documentation/src/main/asciidoc/images/isis-in-pictures/205-swagger-ui.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/images/isis-in-pictures/205-swagger-ui.png b/adocs/documentation/src/main/asciidoc/images/isis-in-pictures/205-swagger-ui.png
new file mode 100644
index 0000000..e940d13
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/images/isis-in-pictures/205-swagger-ui.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/0bda7461/adocs/documentation/src/main/asciidoc/images/todoapp/swagger-ui.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/images/todoapp/swagger-ui.png b/adocs/documentation/src/main/asciidoc/images/todoapp/swagger-ui.png
new file mode 100644
index 0000000..32239ae
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/images/todoapp/swagger-ui.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/0bda7461/adocs/documentation/src/main/asciidoc/index.html
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/index.html b/adocs/documentation/src/main/asciidoc/index.html
index c471e75..62fe96d 100644
--- a/adocs/documentation/src/main/asciidoc/index.html
+++ b/adocs/documentation/src/main/asciidoc/index.html
@@ -612,7 +612,7 @@ And I must say this: "Great Support from the development team"</p>
<div class="large-12 medium-12 columns">
<div class="description">
<h3 class="legend">Domain Driven Applications, Quickly</h3>
- <p>Apache Isis™ is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services or view models, and the framework dynamically generates a representation of that domain model as a webapp or a RESTful API.</p>
+ <p>Apache Isis™ is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services or view models, and the framework dynamically generates a representation of that domain model as a webapp or a rich hypermedia REST API.</p>
<p><a class="button btn btn-primary btn-lg learn-more" href="./documentation.html" role="button">Learn more �</a></p>
</div>
@@ -625,8 +625,8 @@ And I must say this: "Great Support from the development team"</p>
<div class="container">
<div class="row">
<div class="large-4 medium-4 columns">
- <h2>UI "for free"</h2>
- <p>Apache Isis dynamically builds a generic UI directly from the underlying domain objects.
+ <h2>UI & REST "for free"</h2>
+ <p>Apache Isis dynamically builds both a generic UI and also a rich hypermedia REST API directly from the underlying domain objects.
This makes for extremely rapid prototyping and a short feedback cycle, perfect for agile development.
The UI can also be extended for specific use cases, and can be themed using <a href="http://getbootstrap.com">Bootstrap</a>.</p>
<p><a class="button small info radius" href="./isis-in-pictures.html" role="button">See Apache Isis in action �</a></p>
@@ -682,6 +682,20 @@ And I must say this: "Great Support from the development team"</p>
<div class="row">
<div class="large-12 medium-12 columns">
+ <br/>
+ <br/>
+ <p>Apache Isis also provides a rich REST API with a full set of hypermedia controls. The framework provides two default representations, pluggable for other representations. The framework also automatically generates a Swagger spec to allow REST clients to be code-generated, and (for developers) exposes the REST API through the Swagger UI:</p>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="large-offset-1 large-10 medium-offset-1 medium-10 columns">
+ <a href="./images/todoapp/swagger-ui.png"><img src="./images/todoapp/swagger-ui.png" style="padding: 2px;border: 1px solid #021a40;" /></a>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="large-12 medium-12 columns">
<h4>Getting started</h4>
<br/>
<p>Start developing your own Apache Isis application using our <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">simpleapp archetype</a>:</p>
http://git-wip-us.apache.org/repos/asf/isis/blob/0bda7461/adocs/documentation/src/main/asciidoc/isis-in-pictures.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/isis-in-pictures.adoc b/adocs/documentation/src/main/asciidoc/isis-in-pictures.adoc
index c219286..e76c418 100644
--- a/adocs/documentation/src/main/asciidoc/isis-in-pictures.adoc
+++ b/adocs/documentation/src/main/asciidoc/isis-in-pictures.adoc
@@ -223,13 +223,20 @@ image::{_imagesdir}/isis-in-pictures/190-switch-theme.png[width="800px",link="{_
== REST API
-In addition to Apache Isis' Wicket viewer, it also provides a fully fledged REST API, as an implementation of the http://restfulobjects.org[Restful Objects] specification. The screenshot below shows accessing this REST API using a Chrome plugin:
+In addition to Apache Isis' Wicket viewer, it also provides a rich REST API with a full set of hypermedia controls, generated automatically from the domain objects (entities and view models). The framework provides two default representations, one an implementation of the http://restfulobjects.org[Restful Objects] spec, the other a simplified representation suitable for custom Javascript apps. Other representations can be plugged in.
+
+The screenshot below shows accessing the Restful Objects representation API accessed through a Chrome plugin:
image::{_imagesdir}/isis-in-pictures/200-rest-api.png[width="800px",link="{_imagesdir}/isis-in-pictures/200-rest-api.png"]
+The framework also automatically integrates with Swagger, generating a Swagger spec from the underlying domain object model. From this spec REST clients can be code-generated; it also allows developers to play with the REST API through the Swagger UI:
+
+
+image::{_imagesdir}/isis-in-pictures/205-swagger-ui.png[width="800px",link="{_imagesdir}/isis-in-pictures/205-swagger-ui.png"]
+
+
-Like the Wicket viewer, the REST API is generated automatically from the domain objects (entities and view models).
[10/38] isis git commit: ISIS-1353: updates
org.jboss.resteasy:resteasy-jaxrs and
org.jboss.resteasy:resteasy-jaxb-provider (to 3.0.17.Final, from 3.0.14.Final)
Posted by da...@apache.org.
ISIS-1353: updates org.jboss.resteasy:resteasy-jaxrs and org.jboss.resteasy:resteasy-jaxb-provider (to 3.0.17.Final, from 3.0.14.Final)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2f80d1bd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2f80d1bd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2f80d1bd
Branch: refs/heads/master
Commit: 2f80d1bdc8e22b4c285d8200e09386bd74f486d6
Parents: 17c5556
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:31:29 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:31:29 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2f80d1bd/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c3b0595..962f289 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -135,7 +135,7 @@
<!-- using 2.3.3 throws SQL exception in simpleapp integtests -->
<hsqldb.version>2.3.1</hsqldb.version>
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
- <resteasy-jaxrs.version>3.0.14.Final</resteasy-jaxrs.version>
+ <resteasy-jaxrs.version>3.0.17.Final</resteasy-jaxrs.version>
<jetty.version>9.3.6.v20151106</jetty.version>
[19/38] isis git commit: ISIS-1365: removes wicketstuff.version
property from core/pom.xml, seemingly unused.
Posted by da...@apache.org.
ISIS-1365: removes wicketstuff.version property from core/pom.xml, seemingly unused.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9ac76628
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9ac76628
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9ac76628
Branch: refs/heads/master
Commit: 9ac7662837fc81d37beb8093925936b3eb6fd1f3
Parents: b4f031a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:48:46 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:48:46 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9ac76628/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c37c560..dbe8205 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -140,7 +140,6 @@
<jetty.version>9.3.6.v20151106</jetty.version>
<wicket.version>6.23.0</wicket.version>
- <wicketstuff.version>6.20.0</wicketstuff.version>
<wicket-webjars.version>0.4.8</wicket-webjars.version>
<wicket-bootstrap.version>0.9.15</wicket-bootstrap.version>
[29/38] isis git commit: ISIS-1353: updates
org.sonatype.plexus:plexus-sec-dispatcher from 1.3 to 1.4
Posted by da...@apache.org.
ISIS-1353: updates org.sonatype.plexus:plexus-sec-dispatcher from 1.3 to 1.4
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
<version>${plexus-sec-dispatcher.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/064834c7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/064834c7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/064834c7
Branch: refs/heads/master
Commit: 064834c753f362314974d4e9af08534bf625932f
Parents: 069b820
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 07:11:40 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 17:21:33 2016 +0100
----------------------------------------------------------------------
core/maven-plugin/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/064834c7/core/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index ffb605b..b90f396 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -44,7 +44,7 @@
<maven-core.version>3.3.9</maven-core.version>
<maven-project.version>3.0-alpha-2</maven-project.version>
<maven-plugin-annotations.version>3.4</maven-plugin-annotations.version>
- <plexus-sec-dispatcher.version>1.3</plexus-sec-dispatcher.version>
+ <plexus-sec-dispatcher.version>1.4</plexus-sec-dispatcher.version>
<plexus-utils.version>2.1</plexus-utils.version>
<plexus-container-default.version>1.7</plexus-container-default.version>
</properties>
[22/38] isis git commit: ISIS-1335: updates maven-core from 3.0.5 to
3.3.9
Posted by da...@apache.org.
ISIS-1335: updates maven-core from 3.0.5 to 3.3.9
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${maven-core.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model-builder</artifactId>
<version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
<version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2e2448aa
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2e2448aa
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2e2448aa
Branch: refs/heads/master
Commit: 2e2448aa73b6258d94dc68ecc053e25d6f12171d
Parents: 94cb2b0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 17:05:19 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 17:05:19 2016 +0100
----------------------------------------------------------------------
core/maven-plugin/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2e2448aa/core/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index ede9f33..002016b 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -41,7 +41,7 @@
</prerequisites>
<properties>
- <maven-core.version>3.0.5</maven-core.version>
+ <maven-core.version>3.3.9</maven-core.version>
<maven-project.version>3.0-alpha-2</maven-project.version>
<maven-plugin-annotations.version>3.4</maven-plugin-annotations.version>
<plexus-sec-dispatcher.version>1.3</plexus-sec-dispatcher.version>
[24/38] isis git commit: SIS-1353: updates
org.codehaus.plexus:plexus-container-default from 1.5.5 to 1.7
Posted by da...@apache.org.
SIS-1353: updates org.codehaus.plexus:plexus-container-default from 1.5.5 to 1.7
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>${plexus-container-default.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
</exclusion>
</exclusions>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c4d42cdc
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c4d42cdc
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c4d42cdc
Branch: refs/heads/master
Commit: c4d42cdc086ba6eb864a289dfd6187157731f68f
Parents: 03b185d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 17:16:27 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 17:16:27 2016 +0100
----------------------------------------------------------------------
core/maven-plugin/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c4d42cdc/core/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 002016b..ffb605b 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -46,6 +46,7 @@
<maven-plugin-annotations.version>3.4</maven-plugin-annotations.version>
<plexus-sec-dispatcher.version>1.3</plexus-sec-dispatcher.version>
<plexus-utils.version>2.1</plexus-utils.version>
+ <plexus-container-default.version>1.7</plexus-container-default.version>
</properties>
<build>
@@ -251,7 +252,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.5.5</version>
+ <version>${plexus-container-default.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
[09/38] isis git commit: ISIS-1353: updates version of
org.apache:apache parent in core/pom.xml (per release management)
Posted by da...@apache.org.
ISIS-1353: updates version of org.apache:apache parent in core/pom.xml (per release management)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/17c5556b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/17c5556b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/17c5556b
Branch: refs/heads/master
Commit: 17c5556b5ad76ce3aa0b36a45f34bd87083679fd
Parents: 4f32b7d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:25:09 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:25:09 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/17c5556b/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 3f45024..c3b0595 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>17</version>
+ <version>18</version>
<relativePath />
</parent>
[14/38] isis git commit: ISIS-1353: updating xstream from 1.4.8 to
1.4.9
Posted by da...@apache.org.
ISIS-1353: updating xstream from 1.4.8 to 1.4.9
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>${xstream.version}</version>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7a84dfc1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7a84dfc1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7a84dfc1
Branch: refs/heads/master
Commit: 7a84dfc1a579bbb8ba9292053db7f9fce5330cfe
Parents: e9f1c19
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:38:43 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:38:43 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7a84dfc1/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index d387746..626a28e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -155,7 +155,7 @@
<dom4j.version>1.6.1</dom4j.version>
<jdom.version>2.0.2</jdom.version>
- <xstream.version>1.4.8</xstream.version>
+ <xstream.version>1.4.9</xstream.version>
<htmlparser.version>2.1</htmlparser.version>
<junit.version>4.12</junit.version>
[35/38] isis git commit: ISIS-1465: fixes unit test for
SimpleObjectTest (simpleapp)
Posted by da...@apache.org.
ISIS-1465: fixes unit test for SimpleObjectTest (simpleapp)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c2f335db
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c2f335db
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c2f335db
Branch: refs/heads/master
Commit: c2f335dbd895c51411ea1ca44daaad827ae6fb54
Parents: de5a3f3
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 16:59:23 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 17:23:23 2016 +0100
----------------------------------------------------------------------
.../src/test/java/domainapp/dom/simple/SimpleObjectTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c2f335db/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java b/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
index b9dbcb4..371bc8d 100644
--- a/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
+++ b/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
@@ -27,7 +27,7 @@ public class SimpleObjectTest {
@Before
public void setUp() throws Exception {
- simpleObject = new SimpleObject();
+ simpleObject = new SimpleObject("Foobar");
}
public static class Name extends SimpleObjectTest {
@@ -35,10 +35,10 @@ public class SimpleObjectTest {
@Test
public void happyCase() throws Exception {
// given
- String name = "Foobar";
- assertThat(simpleObject.getName()).isNull();
+ assertThat(simpleObject.getName()).isEqualTo("Foobar");
// when
+ String name = "Foobar - updated";
simpleObject.setName(name);
// then
[16/38] isis git commit: ISIS-1353: updates swagger-ui from 2.1.3 to
2.1.4
Posted by da...@apache.org.
ISIS-1353: updates swagger-ui from 2.1.3 to 2.1.4
<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
<version>${swagger-ui.version}</version>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7d2367ba
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7d2367ba
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7d2367ba
Branch: refs/heads/master
Commit: 7d2367bae77f2fc5a70a266f3fc8d393d1d1d629
Parents: 839bd77
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:43:30 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:43:30 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7d2367ba/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 92437eb..b8e5e49 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -128,7 +128,7 @@
<jackson.version>2.8.0</jackson.version>
<gson.version>2.7</gson.version>
<swagger-core.version>1.5.9</swagger-core.version>
- <swagger-ui.version>2.1.3</swagger-ui.version>
+ <swagger-ui.version>2.1.4</swagger-ui.version>
<webjars-servlet-2.x.version>1.4</webjars-servlet-2.x.version>
<!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver -->
[30/38] isis git commit: ISIS-1353: updates webjars-servlet-2.x from
1.4 to 1.5
Posted by da...@apache.org.
ISIS-1353: updates webjars-servlet-2.x from 1.4 to 1.5
<dependency>
<groupId>org.webjars</groupId>
<artifactId>webjars-servlet-2.x</artifactId>
<version>${webjars-servlet-2.x.version}</version>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/da827340
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/da827340
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/da827340
Branch: refs/heads/master
Commit: da827340eb6f226cfbbb19238701f95918893ba7
Parents: 064834c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 07:12:49 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 17:21:57 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/da827340/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 2a0515a..dd3b04e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -129,7 +129,7 @@
<gson.version>2.7</gson.version>
<swagger-core.version>1.5.9</swagger-core.version>
<swagger-ui.version>2.1.4</swagger-ui.version>
- <webjars-servlet-2.x.version>1.4</webjars-servlet-2.x.version>
+ <webjars-servlet-2.x.version>1.5</webjars-servlet-2.x.version>
<!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver -->
<!-- using 2.3.3 throws SQL exception in simpleapp integtests -->
[21/38] isis git commit: ISIS-1353: updates
org.apache.maven.plugin-tools:maven-plugin from 3.2 to 3.4
Posted by da...@apache.org.
ISIS-1353: updates org.apache.maven.plugin-tools:maven-plugin from 3.2 to 3.4
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>${maven-plugin-annotations.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</exclusion>
</exclusions>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/94cb2b08
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/94cb2b08
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/94cb2b08
Branch: refs/heads/master
Commit: 94cb2b08e3e2996364707ed14548d5b39945ed7d
Parents: e7380fb
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 17:03:35 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 17:03:35 2016 +0100
----------------------------------------------------------------------
core/maven-plugin/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/94cb2b08/core/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 99ff1a2..ede9f33 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -43,7 +43,7 @@
<properties>
<maven-core.version>3.0.5</maven-core.version>
<maven-project.version>3.0-alpha-2</maven-project.version>
- <maven-plugin-annotations.version>3.2</maven-plugin-annotations.version>
+ <maven-plugin-annotations.version>3.4</maven-plugin-annotations.version>
<plexus-sec-dispatcher.version>1.3</plexus-sec-dispatcher.version>
<plexus-utils.version>2.1</plexus-utils.version>
</properties>
[07/38] isis git commit: ISIS-1465: minor fix to logging.properties
of simpleapp (for the archetype)
Posted by da...@apache.org.
ISIS-1465: minor fix to logging.properties of simpleapp (for the archetype)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/90df10e4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/90df10e4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/90df10e4
Branch: refs/heads/master
Commit: 90df10e42fc693f0036b7c2eeefab6e5578bfee5
Parents: fd22081
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:23:26 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:23:26 2016 +0100
----------------------------------------------------------------------
.../simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/90df10e4/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
index 1efa120..af35a94 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
@@ -214,7 +214,7 @@ log4j.additivity.org.apache.isis.core.runtime.threadpool.ThreadPoolSupport=false
# quieten Shiro
log4j.logger.org.apache.shiro.realm.AuthorizingRealm=WARN,Console
-log4j.additivity.log4j.logger.org.apache.shiro.realm.AuthorizingRealm=false
+log4j.additivity.org.apache.shiro.realm.AuthorizingRealm=false
# Application-specific logging
[11/38] isis git commit: ISIS-1353: updates
com.fasterxml.jackson.core from 2.6.4 to 2.8.0
Posted by da...@apache.org.
ISIS-1353: updates com.fasterxml.jackson.core from 2.6.4 to 2.8.0
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4a4db073
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4a4db073
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4a4db073
Branch: refs/heads/master
Commit: 4a4db073a71bf10f609a272d74cfa3933b872c59
Parents: 2f80d1b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:33:35 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:33:35 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4a4db073/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 962f289..434989c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -125,7 +125,7 @@
<axon-core.version>2.4</axon-core.version>
- <jackson.version>2.6.4</jackson.version>
+ <jackson.version>2.8.0</jackson.version>
<gson.version>2.5</gson.version>
<swagger-core.version>1.5.5</swagger-core.version>
<swagger-ui.version>2.1.3</swagger-ui.version>
[05/38] isis git commit: ISIS-1468: adds TODO to capture this ticket
on TransactionStateProviderInternal.
Posted by da...@apache.org.
ISIS-1468: adds TODO to capture this ticket on TransactionStateProviderInternal.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a760e224
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a760e224
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a760e224
Branch: refs/heads/master
Commit: a760e224a7fb80eaa2c65206cbf5e17d16b67c25
Parents: 0510263
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:20:36 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:20:36 2016 +0100
----------------------------------------------------------------------
.../services/transtate/TransactionStateProviderInternal.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a760e224/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/transtate/TransactionStateProviderInternal.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/transtate/TransactionStateProviderInternal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/transtate/TransactionStateProviderInternal.java
index 9c6a4a9..b2b1004 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/transtate/TransactionStateProviderInternal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/transtate/TransactionStateProviderInternal.java
@@ -20,10 +20,15 @@
package org.apache.isis.core.metamodel.services.transtate;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.metamodel.transactions.TransactionState;
+/**
+ * TODO: would make sense to combine with {@link TransactionService}.
+ */
public interface TransactionStateProviderInternal {
- @Programmatic TransactionState getTransactionState();
+ @Programmatic
+ TransactionState getTransactionState();
}
[38/38] isis git commit: ISIS-1353: updates doc re: AppManifest.Util
Posted by da...@apache.org.
ISIS-1353: updates doc re: AppManifest.Util
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ad559121
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ad559121
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ad559121
Branch: refs/heads/master
Commit: ad559121c2a863ebdd1963dbf0f8d5932ee67154
Parents: 80369fd
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jul 14 11:34:25 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jul 14 11:42:49 2016 +0100
----------------------------------------------------------------------
...rgcms_classes_AppManifest-bootstrapping.adoc | 56 ++++++++++++++++----
1 file changed, 45 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ad559121/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes_AppManifest-bootstrapping.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes_AppManifest-bootstrapping.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes_AppManifest-bootstrapping.adoc
index 71ba5da..84d9c5a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes_AppManifest-bootstrapping.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes_AppManifest-bootstrapping.adoc
@@ -51,7 +51,7 @@ public final class MyAppDomainModule {
}
----
-This tells the framework that the package and subpackages under `com.mycompany.myapp.dom` should be searched for domain services and entities.
+This tells the framework that the package and subpackages under `com.mycompany.myapp.dom` should be searched for domain services (annotated with `@DomainService`), mixins (`@Mixin`) and entities (`@PersistenceCapabable`).
As is perhaps apparent, the `getModules()` method replaces and overrides both the `isis.services.ServicesInstallerFromAnnotation.packagePrefix` key (usually found in the `isis.properties` file) and also the`isis.persistor.datanucleus.RegisterEntities.packagePrefix` key (usually found in the `persistor_datanucleus.properties` file). The value of the `isis.services-installer` configuration property is also ignored.
@@ -179,11 +179,36 @@ We also strongly recommend that any application-layer domain services and view m
What then remains is to update the bootstrapping code itself.
+
+
=== Integration Tests
-Bootstrapping integration tests is still performed using the `IsisSystemForTest.Builder`, but very often the bootstrapping code can be substantially simplified (compared to not using an `AppManifest`, that is).
+A `AppManifest.Util` helper class provides a number of static methods that can be used to set up configuration
+properties appropriate for integration testing (eg run using an in-memory database). This allows the responsibility
+of returning the configuration properties to belong exlusively to the `AppManifest`.
-For example, this is the bootstrapping code for the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] looks something like:
+There are three such static methods:
+
+[source,java]
+----
+public interface AppManifest {
+ ...
+ public static class Util {
+ public static Map<String,String>
+ withJavaxJdoRunInMemoryProperties(Map<String, String> map) { ... } // <1>
+ public static Map<String,String>
+ withDataNucleusProperties(Map<String, String> map) { ... } // <2>
+ public static Map<String,String>
+ withIsisIntegTestProperties(Map<String, String> map) { ... } // <3>
+ }
+}
+----
+<1> sets up the `javax.jdo.option.Connection*` properties so as to run against an in-memory instance of HSQLDB
+<2> sets up DataNucleus to automatically create the databse schema, as well as a number of other standard properties
+(disable persistence by reachability, support mixed case identifiers, disable level 2 cache)
+<3> sets up standard properties for the Apache Isis framework, most specifically to enable fixtures to be installed.
+
+For example, the bootstrapping code for the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] looks something like:
[source,java]
----
@@ -193,10 +218,18 @@ public class DomainAppSystemInitializer {
if(isft == null) {
isft = new IsisSystemForTest.Builder()
.withLoggingAt(org.apache.log4j.Level.INFO)
- .with(new MyAppAppManifest())
- .with(new IsisConfigurationForJdoIntegTests())
- .build()
- .setUpSystem();
+ .with(new DomainAppAppManifest() {
+ @Override
+ public Map<String, String> getConfigurationProperties() {
+ final Map<String, String> map = Maps.newHashMap();
+ Util.withJavaxJdoRunInMemoryProperties(map);
+ Util.withDataNucleusProperties(map);
+ Util.withIsisIntegTestProperties(map);
+ return map;
+ }
+ })
+ .build();
+ isft.setUpSystem();
IsisSystemForTest.set(isft);
}
}
@@ -204,6 +237,9 @@ public class DomainAppSystemInitializer {
----
+Previously the `IsisConfigurationJdoIntegTests` (subclass of `IsisConfiguration`) was provided to set up these
+configuration properties. This class is still supported, but is deprecated.
+
=== Webapps
@@ -260,13 +296,11 @@ java org.apache.isis.WebServer -m com.mycompany.myapp.MyAppAppManifestWithFixtur
== Subsidiary Goals
-There are a number of subsidiary goals of the `AppManifest` class (though as of v1.9.0 these have not yet implemented):
+There are a number of subsidiary goals of the `AppManifest` class (though as of v1.13.0 these have not yet implemented):
* Allow different integration tests to run with different manifests.
-** Normally the running application is shared (on a thread-local) between integration tests. What the framework could do is to be intelligent enough to keep track of the manifest in use for each integration test and tear down the shared state if the "next" test uses a different manifest
-
-* Speed up bootstrapping by only scanning for classes annotated by `@DomainService` and `@PersistenceCapable` once.
+** Normally the running application is shared (on a thread-local) between integration tests. What the framework could perhaps do is to be intelligent enough to keep track of the manifest in use for each integration test and tear down the shared state if the "next" test uses a different manifest
* Provide a programmatic way to contribute elements of `web.xml`.
[15/38] isis git commit: ISIS-1353: updates swagger-core from 1.5.5
to 1.5.9
Posted by da...@apache.org.
ISIS-1353: updates swagger-core from 1.5.5 to 1.5.9
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
<version>${swagger-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/839bd775
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/839bd775
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/839bd775
Branch: refs/heads/master
Commit: 839bd775cdae862d8aa11d4ce6b39cbd4fc77e7a
Parents: 7a84dfc
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 06:41:51 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 06:41:51 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/839bd775/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 626a28e..92437eb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -127,7 +127,7 @@
<jackson.version>2.8.0</jackson.version>
<gson.version>2.7</gson.version>
- <swagger-core.version>1.5.5</swagger-core.version>
+ <swagger-core.version>1.5.9</swagger-core.version>
<swagger-ui.version>2.1.3</swagger-ui.version>
<webjars-servlet-2.x.version>1.4</webjars-servlet-2.x.version>
[23/38] isis git commit: ISIS-1353: updates shiro from 1.2.3 to 1.2.6
Posted by da...@apache.org.
ISIS-1353: updates shiro from 1.2.3 to 1.2.6
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<version>${shiro.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
<version>${shiro.version}</version>
</dependency>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/03b185dc
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/03b185dc
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/03b185dc
Branch: refs/heads/master
Commit: 03b185dc727ef9c494c0214cc0446ae8ade6123a
Parents: 2e2448a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 17:10:31 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 17:10:31 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/03b185dc/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 5a9df04..e956383 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -102,7 +102,7 @@
-->
<datanucleus-maven-plugin.version>4.0.2</datanucleus-maven-plugin.version>
- <shiro.version>1.2.3</shiro.version>
+ <shiro.version>1.2.6</shiro.version>
<slf4j.version>1.7.13</slf4j.version>
<log4j.version>1.2.17</log4j.version>
[26/38] isis git commit: ISIS-1353: updates axon from 2.4 to 2.4.4
Posted by da...@apache.org.
ISIS-1353: updates axon from 2.4 to 2.4.4
<dependencies>
<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-core</artifactId>
<version>${axon-core.version}</version>
</dependency>
</dependencies>
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a5b2b3a1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a5b2b3a1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a5b2b3a1
Branch: refs/heads/master
Commit: a5b2b3a1ce19fbb5332474138edb992d9d1422ba
Parents: 0dce459
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 13 17:18:49 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 13 17:18:49 2016 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a5b2b3a1/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 64adc6f..639d61f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -123,7 +123,7 @@
<commons-email.version>1.4</commons-email.version>
<com-sun-mail.version>1.5.2</com-sun-mail.version>
- <axon-core.version>2.4</axon-core.version>
+ <axon-core.version>2.4.4</axon-core.version>
<jackson.version>2.8.0</jackson.version>
<gson.version>2.7</gson.version>