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 2014/12/02 00:59:02 UTC
[01/13] isis git commit: Update Jackson to 2.4.3
Repository: isis
Updated Branches:
refs/heads/master 434ab61bb -> 67409b154
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/homepage/root/Get_whenQueryArg_xRoFollowLinks_ok.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/homepage/root/Get_whenQueryArg_xRoFollowLinks_ok.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/homepage/root/Get_whenQueryArg_xRoFollowLinks_ok.java
index bb5d46b..8f099c4 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/homepage/root/Get_whenQueryArg_xRoFollowLinks_ok.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/homepage/root/Get_whenQueryArg_xRoFollowLinks_ok.java
@@ -18,15 +18,10 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.homepage.root;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isArray;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isMap;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
@@ -36,11 +31,13 @@ import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.Reques
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.homepage.HomePageRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isArray;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isMap;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
public class Get_whenQueryArg_xRoFollowLinks_ok {
@@ -159,7 +156,7 @@ public class Get_whenQueryArg_xRoFollowLinks_ok {
assertThat(service.getRepresentation("value"), is(nullValue()));
}
- private HomePageRepresentation whenExecuteAndFollowLinksUsing(final String uriTemplate, final String followLinks) throws JsonParseException, JsonMappingException, IOException {
+ private HomePageRepresentation whenExecuteAndFollowLinksUsing(final String uriTemplate, final String followLinks) throws IOException {
request = client.createRequest(RestfulHttpMethod.GET, uriTemplate).withArg(RequestParameter.FOLLOW_LINKS, followLinks);
restfulResponse = request.executeT();
return restfulResponse.getEntity();
[09/13] isis git commit: ISIS-537: CollectionContentsAsSummary icon
now uses fa- icon.
Posted by da...@apache.org.
ISIS-537: CollectionContentsAsSummary icon now uses fa- icon.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c05621aa
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c05621aa
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c05621aa
Branch: refs/heads/master
Commit: c05621aa6e29deffa3608f8b2ac6983ee7aa1270
Parents: e2f15a5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Dec 1 21:08:07 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Dec 1 21:08:07 2014 +0000
----------------------------------------------------------------------
.../summary/CollectionContentsAsSummaryFactory.java | 15 ++++++++++++++-
.../collectioncontents/summary/icon_summary_off.png | Bin 240 -> 0 bytes
.../collectioncontents/summary/icon_summary_on.png | Bin 299 -> 0 bytes
.../viewer/wicket/ui/pages/bootstrap-overrides.css | 6 ++++--
4 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c05621aa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
index f8e657c..1c75d2a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.isis.applib.filter.Filter;
@@ -31,6 +32,7 @@ import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.facets.value.bigdecimal.BigDecimalValueFacet;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
+import org.apache.isis.viewer.wicket.ui.CollectionContentsAsFactory;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.isis.viewer.wicket.ui.ComponentType;
@@ -38,7 +40,7 @@ import org.apache.isis.viewer.wicket.ui.ComponentType;
/**
* {@link ComponentFactory} for {@link CollectionContentsAsSummary}.
*/
-public class CollectionContentsAsSummaryFactory extends ComponentFactoryAbstract {
+public class CollectionContentsAsSummaryFactory extends ComponentFactoryAbstract implements CollectionContentsAsFactory {
private static final long serialVersionUID = 1L;
@@ -78,4 +80,15 @@ public class CollectionContentsAsSummaryFactory extends ComponentFactoryAbstract
// do not bundle, because of relative CSS images...
return null;
}
+
+ @Override
+ public IModel<String> getTitleLabel() {
+ return Model.of("Summary");
+ }
+
+ @Override
+ public IModel<String> getCssClass() {
+ return Model.of("fa fa-fw fa-usd");
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/c05621aa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/icon_summary_off.png
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/icon_summary_off.png b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/icon_summary_off.png
deleted file mode 100644
index da74793..0000000
Binary files a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/icon_summary_off.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/c05621aa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/icon_summary_on.png
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/icon_summary_on.png b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/icon_summary_on.png
deleted file mode 100644
index d653bea..0000000
Binary files a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/icon_summary_on.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/c05621aa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index c441d4f..b486641 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -328,17 +328,19 @@ body {
min-width: 720px;
}
+/*
a span.ViewLinkItem.summary {
- background-image:url("icon_summary_on.png");
+ background-image:url("./icon_summary_on.png");
background-position: center center;
background-repeat:no-repeat;
}
span.ViewLinkItem.summary {
- background-image:url("icon_summary_off.png");
+ background-image:url("./icon_summary_off.png");
background-position: center center;
background-repeat:no-repeat;
}
+*/
/* from EntityHeaderPanel.css */
[11/13] isis git commit: ISIS-961: removing duplication between
ActionLinkFactoryAbstract and ActionPanel (functionality moved to
ActionModel)
Posted by da...@apache.org.
ISIS-961: removing duplication between ActionLinkFactoryAbstract and ActionPanel (functionality moved to ActionModel)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e5a2aded
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e5a2aded
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e5a2aded
Branch: refs/heads/master
Commit: e5a2adedc4c5c00a4e3882ff04d3b197377997bc
Parents: d231d20
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Dec 1 23:25:41 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Dec 1 23:25:41 2014 +0000
----------------------------------------------------------------------
.../viewer/wicket/model/models/ActionModel.java | 41 ++++++++++++++++-
.../ui/components/actions/ActionPanel.java | 46 +-------------------
.../cssmenu/ActionLinkFactoryAbstract.java | 33 +-------------
3 files changed, 43 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e5a2aded/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index 3243340..05fb26c 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -521,7 +521,46 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
return bookmarkPolicy.value() == BookmarkPolicy.AS_ROOT && safeSemantics;
}
-
+ // //////////////////////////////////////
+
+ /**
+ * Executes the action, handling any {@link RecoverableException}s that
+ * might be encountered.
+ *
+ * <p>
+ * If an {@link RecoverableException} is encountered, then the application error will be
+ * {@link org.apache.isis.core.commons.authentication.MessageBroker#setApplicationError(String) set} so that a suitable message can be
+ * rendered higher up the call stack.
+ *
+ * <p>
+ * Any other types of exception will be ignored (to be picked up higher up in the callstack)
+ */
+ public ObjectAdapter executeHandlingApplicationExceptions() {
+ try {
+ final ObjectAdapter resultAdapter = this.getObject();
+ return resultAdapter;
+
+ } catch (RuntimeException ex) {
+
+ // see if is an application-defined exception
+ // if so, is converted to an application error,
+ // equivalent to calling DomainObjectContainer#raiseError(...)
+ final RecoverableException appEx = getApplicationExceptionIfAny(ex);
+ if (appEx != null) {
+ IsisContext.getMessageBroker().setApplicationError(appEx.getMessage());
+
+ // there's no need to set the abort cause on the transaction, it will have already been done
+ // (in IsisTransactionManager#executeWithinTransaction(...)).
+
+ return null;
+ }
+
+ // not handled, so propagate
+ throw ex;
+ }
+ }
+
+
// //////////////////////////////////////
public static RecoverableException getApplicationExceptionIfAny(Exception ex) {
http://git-wip-us.apache.org/repos/asf/isis/blob/e5a2aded/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
index 238840e..ad157b8 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
@@ -26,7 +26,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.Model;
-import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.Command.Executor;
import org.apache.isis.applib.services.command.CommandContext;
@@ -243,7 +242,7 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements ActionExe
// so we handle it here.
try {
// could be programmatic flushing, so must include in the try... finally
- final ObjectAdapter resultAdapter = executeActionHandlingApplicationExceptions();
+ final ObjectAdapter resultAdapter = getActionModel().executeHandlingApplicationExceptions();
// flush any queued changes, so concurrency or violation exceptions (if any)
// will be thrown here
@@ -322,49 +321,6 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements ActionExe
}
}
- /**
- * Executes the action, handling any {@link RecoverableException}s that
- * might be encountered.
- *
- * <p>
- * If an {@link RecoverableException} is encountered, then the application error will be
- * {@link MessageBroker#setApplicationError(String) set} so that a suitable message can be
- * rendered higher up the call stack.
- *
- * <p>
- * Any other types of exception will be ignored (to be picked up higher up in the callstack)
- */
- private ObjectAdapter executeActionHandlingApplicationExceptions() {
- final ActionModel actionModel = getActionModel();
- try {
- ObjectAdapter resultAdapter = actionModel.getObject();
- return resultAdapter;
-
- } catch (RuntimeException ex) {
-
- // TODO: some duplication between this code and ActionLinkFactoryAbstract
-
- // see if is an application-defined exception
- // if so, is converted to an application error,
- // equivalent to calling DomainObjectContainer#raiseError(...)
- final RecoverableException appEx = ActionModel.getApplicationExceptionIfAny(ex);
- if (appEx != null) {
- getMessageBroker().setApplicationError(appEx.getMessage());
-
- // there's no need to set the abort cause on the transaction, it will have already been done
- // (in IsisTransactionManager#executeWithinTransaction(...)).
- return null;
- }
-
- // the ExceptionRecognizers stuff is done in the calling method (because may be triggered
- // by a flush to the object store (which in most cases won't have happened in the execute of
- // the action body)
-
- // not handled, so propagate
- throw ex;
- }
- }
-
///////////////////////////////////////////////////////
// Dependencies (from context)
http://git-wip-us.apache.org/repos/asf/isis/blob/e5a2aded/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
index d5ab010..1142d14 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
@@ -32,11 +32,9 @@ import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.ActionPrompt;
@@ -164,7 +162,7 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
@Override
protected IRequestHandler getRequestHandler() {
- ObjectAdapter resultAdapter = executeActionHandlingApplicationExceptions(actionModel);
+ ObjectAdapter resultAdapter = actionModel.executeHandlingApplicationExceptions();
final Object value = resultAdapter.getObject();
return ActionModel.redirectHandler(value);
}
@@ -182,7 +180,7 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
@Override
protected IRequestHandler getRequestHandler() {
- ObjectAdapter resultAdapter = executeActionHandlingApplicationExceptions(actionModel);
+ final ObjectAdapter resultAdapter = actionModel.executeHandlingApplicationExceptions();
final Object value = resultAdapter.getObject();
return ActionModel.downloadHandler(value);
}
@@ -204,33 +202,6 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
(action.getReturnType().getCorrespondingClass() == org.apache.isis.applib.value.Blob.class ||
action.getReturnType().getCorrespondingClass() == org.apache.isis.applib.value.Clob.class);
}
-
- // adapted from similar code in ActionPanel :-(
- private static ObjectAdapter executeActionHandlingApplicationExceptions(final ActionModel actionModel) {
- try {
- return actionModel.getObject();
-
- } catch (RuntimeException ex) {
-
- // TODO: some duplication between this code and ActionPanel
-
- // see if is an application-defined exception
- // if so, is converted to an application error,
- // equivalent to calling DomainObjectContainer#raiseError(...)
- final RecoverableException appEx = ActionModel.getApplicationExceptionIfAny(ex);
- if (appEx != null) {
- IsisContext.getMessageBroker().setApplicationError(appEx.getMessage());
-
- // there's no need to set the abort cause on the transaction, it will have already been done
- // (in IsisTransactionManager#executeWithinTransaction(...)).
-
- return null;
- }
-
- // not handled, so propagate
- throw ex;
- }
- }
protected LinkAndLabel newLinkAndLabel(final ObjectAction objectAction, final AbstractLink link, final String disabledReasonIfAny) {
[08/13] isis git commit: ISIS-537: deleting unused panel CSS;
moving all CSS in PageAbstract instead into bootstrap-overrides.css.
Posted by da...@apache.org.
ISIS-537: deleting unused panel CSS; moving all CSS in PageAbstract instead into bootstrap-overrides.css.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e2f15a5d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e2f15a5d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e2f15a5d
Branch: refs/heads/master
Commit: e2f15a5d8cfb0c740ed7978eb7348ab81a63c10a
Parents: e5d59b0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Dec 1 20:46:53 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Dec 1 20:46:53 2014 +0000
----------------------------------------------------------------------
.../wicket/ui/components/about/AboutPanel.css | 32 --
.../components/actionlink/ActionLinkPanel.css | 19 -
.../ui/components/actions/ActionInfoPanel.css | 18 -
.../ui/components/actions/ActionPanel.css | 42 --
.../actions/ActionParametersFormPanel.css | 19 -
.../components/collection/CollectionPanel.css | 18 -
.../icons/CollectionContentsAsIconsPanel.css | 21 -
.../CollectionContentsAsUnresolvedPanel.css | 18 -
.../components/empty/EmptyCollectionPanel.css | 18 -
.../collections/EntityCollectionsPanel.css | 37 --
.../entity/combined/EntityCombinedPanel.css | 27 --
.../icontitle/EntityIconAndTitlePanel.css | 37 --
.../scalars/image/JavaAwtImagePanel.css | 18 -
.../scalars/isisapplib/IsisBlobPanel.css | 82 ----
.../scalars/isisapplib/IsisClobPanel.css | 19 -
.../scalars/isisapplib/IsisColorPanel.css | 18 -
.../scalars/isisapplib/IsisDatePanel.css | 18 -
.../scalars/isisapplib/IsisDateTimePanel.css | 18 -
.../scalars/isisapplib/IsisMoneyPanel.css | 18 -
.../scalars/isisapplib/IsisPasswordPanel.css | 27 --
.../scalars/isisapplib/IsisPercentagePanel.css | 18 -
.../scalars/isisapplib/IsisTimePanel.css | 18 -
.../scalars/isisapplib/IsisTimeStampPanel.css | 18 -
.../scalars/jdkdates/JavaSqlDatePanel.css | 18 -
.../scalars/jdkdates/JavaSqlTimePanel.css | 18 -
.../scalars/jdkdates/JavaSqlTimestampPanel.css | 18 -
.../scalars/jdkdates/JavaUtilDatePanel.css | 18 -
.../scalars/jdkmath/JavaMathBigDecimalPanel.css | 21 -
.../scalars/jdkmath/JavaMathBigIntegerPanel.css | 21 -
.../scalars/jodatime/JodaDateTimePanel.css | 18 -
.../scalars/jodatime/JodaLocalDatePanel.css | 18 -
.../scalars/jodatime/JodaLocalDateTimePanel.css | 18 -
.../scalars/primitive/BooleanPanel.css | 18 -
.../components/scalars/primitive/BytePanel.css | 21 -
.../scalars/primitive/CharacterPanel.css | 18 -
.../scalars/primitive/DoublePanel.css | 21 -
.../components/scalars/primitive/FloatPanel.css | 21 -
.../scalars/primitive/IntegerPanel.css | 21 -
.../components/scalars/primitive/LongPanel.css | 21 -
.../components/scalars/primitive/ShortPanel.css | 21 -
.../scalars/reference/ReferencePanel.css | 58 ---
.../scalars/string/MultiLineStringPanel.css | 18 -
.../components/scalars/string/StringPanel.css | 22 --
.../ui/components/scalars/value/ValuePanel.css | 18 -
.../StandaloneCollectionPanel.css | 44 ---
.../ui/components/unknown/UnknownModelPanel.css | 21 -
.../components/value/StandaloneValuePanel.css | 18 -
.../components/voidreturn/VoidReturnPanel.css | 18 -
.../ui/components/welcome/WelcomePanel.css | 32 --
.../zclip/SimpleClipboardModalWindowPanel.css | 31 --
.../viewer/wicket/ui/pages/PageAbstract.css | 360 ------------------
.../wicket/ui/pages/bootstrap-overrides.css | 379 ++++++++++++++++++-
52 files changed, 376 insertions(+), 1551 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.css
deleted file mode 100644
index a48f178..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.aboutPanel #message {
- background:#FFFFFF;
- border-radius:4px;
- -moz-border-radius:4px;
- -webkit-border-radius:4px;
- display: block;
- margin-left: 50px;
- margin-right: 50px;
- margin-top: 50px;
- padding: 15px;
- text-align:center;
- font-size:1.2em;
-}
-
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.css
deleted file mode 100644
index 9f1612a..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.css
deleted file mode 100644
index 5e9f6e5..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-.actionPanel {
-}
-
-div.actionPanel .iconAndTitle {
- float: left;
-}
-
-.actionPanel .iconAndTitle .entityImage {
- width: 32px;
- height: 32px;
-}
-
-.actionPanel .iconAndTitle .entityTitle {
- font-size: x-large;
-}
-
-.actionPanel .iconAndTitle .actionName {
- font-size: large;
- line-height:150%;
- clear:both;
-}
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.css
deleted file mode 100644
index 9f1612a..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.css
deleted file mode 100644
index 099a85d..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.collectionContentsAsIconsPanel li {
- list-style-type: none;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolvedPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolvedPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolvedPanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolvedPanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css
deleted file mode 100644
index 013a4f3..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
-.entityCollectionsPanel fieldset {
- border: 1px solid threedshadow;
-}
-*/
-
-.entityCollectionsPanel fieldset legend {
- position:absolute;
- left:10px;
- top:12px;
-}
-
-.entityCollectionsPanel .actions {
- float: right;
- height: 0px;
-}
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/combined/EntityCombinedPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/combined/EntityCombinedPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/combined/EntityCombinedPanel.css
deleted file mode 100644
index 4452c69..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/combined/EntityCombinedPanel.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#entityPropertiesForLayout {
- float: left;
- width: 35%
-}
-
-#entityCollectionsForLayout {
- float: right;
- width: 64%
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.css
deleted file mode 100644
index 3e9b367..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-.entityIconAndTitlePanel a.zclip-copy {
- background-image: url("../org.apache.isis.viewer.wicket.ui.components.entity.icontitle.EntityIconAndTitlePanel/copy-26.png");
- background-position: right;
- background-repeat: no-repeat;
- margin-left: 10px;
- margin-right: 10px;
-}
-
-.entityIconAndTitlePanel a.zclip-copy:hover,
-.entityIconAndTitlePanel a.zclip-copy.hover {
- cursor: pointer;
-}
-
-.entityIconAndTitlePanel a.zclip-copy:active,
-.entityIconAndTitlePanel a.zclip-copy.active {
- /* not required */
-}
-
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanel.css
deleted file mode 100644
index c4dae80..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobPanel.css
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-.isisBlobPanel .scalarValue span.downloadTitle,
-.isisBlobPanel .scalarValue span.uploadTitle,
-.isisBlobPanel .scalarValue span.clearTitle {
- margin-right: 10px;
- margin-bottom:10px;
- border: 0px;
- padding:5px 10px;
- border-radius:4px;
- -moz-border-radius:4px;
- -webkit-border-radius:4px;
- background-color:#FFFFFF;
- color:#46413B;
- font-style:normal !important;
- font-size: 0.9em;
- font-weight: bold;
-}
-
-.isisBlobPanel .scalarValue span.uploadTitle,
-.isisBlobPanel .scalarValue span.downloadTitle {
- padding-top: 0px;
- padding-bottom: 0px;
- float:left;
- display:block;
-}
-
-.isisBlobPanel .scalarValue span.clearTitle {
- padding-top: 5px;
- padding-bottom: 5px;
-}
-
-.isisBlobPanel .scalarValue a span.downloadTitle,
-.isisBlobPanel .scalarValue span.uploadTitle,
-.isisBlobPanel .scalarValue a span.clearTitle {
- background-color:#F0EFEA;
- text-decoration:none;
-}
-
-.isisBlobPanel .scalarValue a:hover span.downloadTitle,
-.isisBlobPanel .scalarValue span.uploadTitle:hover,
-.isisBlobPanel .scalarValue span.uploadTitle input:hover,
-.isisBlobPanel .scalarValue a:hover span.clearTitle {
- background-color:#40C0CB;
- color: white;
- text-decoration:none;
- cursor: pointer;
-}
-
-
-.isisBlobPanel .scalarValue {
- height: 30px;
- line-height: 30px;
-}
-
-.isisBlobPanel .fileName {
- /*display: block;*/
-}
-
-
-.isisBlobPanel .scalarImage {
- float:left;
- margin-right: 10px;
- margin-bottom: 10px;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanel.css
deleted file mode 100644
index 9f1612a..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisClobPanel.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.css
deleted file mode 100644
index a53bb29..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-.isisPasswordPanel input[type=password] {
- border-radius:4px;
- -moz-border-radius:4px;
- -webkit-border-radius:4px;
- padding:6px;
- border:1px solid #F0EFEA;
- border-top:1px solid #CCCBC7;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.css
deleted file mode 100644
index 3a0e811..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.javaMathBigDecimalPanel input {
- text-align: right;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.css
deleted file mode 100644
index c122ee1..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.javaMathBigIntegerPanel input {
- text-align: right;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.css
deleted file mode 100644
index 0c2f940..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.bytePanel input {
- text-align: right;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.css
deleted file mode 100644
index 11631d2..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.doublePanel input {
- text-align: right;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.css
deleted file mode 100644
index 8fc506f..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.floatPanel input {
- text-align: right;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.css
deleted file mode 100644
index fc8ed50..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.integerPanel input {
- text-align: right;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.css
deleted file mode 100644
index 7959193..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.longPanel input {
- text-align: right;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.css
deleted file mode 100644
index 07953d9..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.shortPanel input {
- text-align: right;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.css
deleted file mode 100644
index eee89fb..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.css
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-.referencePanel .scalarIfCompact .scalarValue {
- float: none;
-}
-
-.referencePanel div.entityLinkSelect2Panel {
- display: inline
-}
-
-.referencePanel div.entityLinkSelect2Panel > div {
- margin-left: 2px;
-}
-
-.referencePanel .entityLinkSelect2Panel .entityImage {
- width: 16px;
- height: 16px;
-}
-
-.referencePanel .entityLinkSelect2Panel a.entityClearLink {
- display:inline-table;
- margin-left: 0px;
- padding-left: 0px;
- padding-right: 0px;
- font-size: smaller;
-}
-
-.collectionContentsAsAjaxTablePanel .referencePanel .entityLinkSelect2Panel .autoCompletePlaceholder {
- padding-top: 0px;
- height: 0px;
-}
-
-.collectionContentsAsAjaxTablePanel .referencePanel .entityLinkSelect2Panel .wrapper {
- display:table-cell;
-}
-
-.referencePanel .entityLinkSelect2Panel .autoCompletePlaceholder {
- display: block;
- padding-top: 5px;
- height: 25px;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.css
deleted file mode 100644
index f4ecfbd..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.stringPanel .scalarValue input {
- font-size:14px;
-}
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.css
deleted file mode 100644
index 08ebcec..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
-.standaloneCollectionPanel {
-}
-
-div.standaloneCollectionPanel .iconAndTitle {
- float: left;
-}
-
-.standaloneCollectionPanel .iconAndTitle .entityImage {
- width: 32px;
- height: 32px;
-}
-
-.standaloneCollectionPanel .iconAndTitle .entityTitle {
- font-size: x-large;
-}
-
-.standaloneCollectionPanel .iconAndTitle .actionName {
- font-size: large;
- line-height:150%;
- clear:both;
-}
-
-*/
-
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.css
deleted file mode 100644
index 981ce8a..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.unknownModelPanel label {
- color: red;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.css
deleted file mode 100644
index dc3be41..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.welcomePanel #message {
- background:#FFFFFF;
- border-radius:4px;
- -moz-border-radius:4px;
- -webkit-border-radius:4px;
- display: block;
- margin-left: 50px;
- margin-right: 50px;
- margin-top: 50px;
- padding: 15px;
- text-align:center;
- font-size:1.2em;
-}
-
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.css
deleted file mode 100644
index 1c8dfa7..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-div.wicket-modal div.w_content_3,
-div.wicket-modal div.w_content_2,
-div.wicket-modal div.w_content_1,
-div.wicket-modal div.w_content,
-.wicket-modal .w_content_container,
-.w_isis_zclip,
-.simpleClipboardPanel form {
- border-radius:4px;
- -moz-border-radius:4px;
- -webkit-border-radius:4px;
-}
-
[05/13] isis git commit: ISIS-537: tidy up in
ActionLinkFactoryAbstract and ActionPromptProvider (throw
IllegalArgumentException rather than NPE).
Posted by da...@apache.org.
ISIS-537: tidy up in ActionLinkFactoryAbstract and ActionPromptProvider (throw IllegalArgumentException rather than NPE).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7a3e5a56
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7a3e5a56
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7a3e5a56
Branch: refs/heads/master
Commit: 7a3e5a56a959bd1c518c7c1b3e08ebc332bfa45c
Parents: 434ab61
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Dec 1 09:10:00 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Dec 1 09:10:00 2014 +0000
----------------------------------------------------------------------
.../wicket/model/models/ActionPromptProvider.java | 12 +++++-------
.../widgets/cssmenu/ActionLinkFactoryAbstract.java | 15 ++-------------
2 files changed, 7 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7a3e5a56/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java
index 492e3e0..42fbda5 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionPromptProvider.java
@@ -25,12 +25,10 @@ public interface ActionPromptProvider {
public static ActionPromptProvider getFrom(Component component) {
final Page page = component.getPage();
- if(page instanceof ActionPromptProvider) {
- final ActionPromptProvider provider = (ActionPromptProvider) page;
- return provider;
- }
- // else
- return null;
+ if(page == null) {
+ throw new IllegalArgumentException("Programming error: component must be added to a page in order to locate the ActionPromptProvider");
+ }
+ return getFrom(page);
}
public static ActionPromptProvider getFrom(Page page) {
if(page instanceof ActionPromptProvider) {
@@ -38,7 +36,7 @@ public interface ActionPromptProvider {
return provider;
}
// else
- return null;
+ throw new IllegalArgumentException("Programming error: all pages should inherit from PageAbstract, which serves as the ActionPromptProvider");
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/7a3e5a56/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
index 48eb9d2..5c7f779 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
@@ -27,7 +27,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.link.AbstractLink;
@@ -60,17 +59,6 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
private static final long serialVersionUID = 1L;
- public static void addTargetBlankIfActionReturnsUrl(final AbstractLink link, final ObjectAction action) {
- final ObjectSpecification returnType = action.getReturnType();
- if(returnType != null && "java.net.URL".equals(returnType.getFullIdentifier())) {
- link.add(new AttributeAppender("target", Model.of("_blank")));
- link.add(new CssClassAppender("noVeil"));
- }
- }
-
- /**
- * Either creates a link for the action be rendered in a {@link ModalWindow}.
- */
protected AbstractLink newLink(
final String linkId,
final ObjectAdapter objectAdapter,
@@ -86,10 +74,11 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
@Override
public void onClick(AjaxRequestTarget target) {
- final ActionPrompt actionPrompt = ActionPromptProvider.Util.getFrom(getPage()).getActionPrompt();
if(ajaxDeferredBehaviour != null) {
ajaxDeferredBehaviour.initiate(target);
} else {
+ final ActionPromptProvider promptProvider = ActionPromptProvider.Util.getFrom(getPage());
+ final ActionPrompt actionPrompt = promptProvider.getActionPrompt();
ActionPromptHeaderPanel titlePanel = new ActionPromptHeaderPanel(actionPrompt.getTitleId(), actionModel);
final ActionPanel actionPanel =
(ActionPanel) getComponentFactoryRegistry().createComponent(
[03/13] isis git commit: Update Jackson to 2.4.3
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
index def1cfb..7f32405 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigInteger.java
@@ -20,8 +20,6 @@ package org.apache.isis.viewer.restfulobjects.applib;
import java.io.IOException;
import java.math.BigInteger;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -45,17 +43,17 @@ public class JsonRepresentationTest_getBigInteger {
}
@Test
- public void happyCase() throws JsonParseException, JsonMappingException, IOException {
+ public void happyCase() throws IOException {
assertThat(jsonRepresentation.getBigInteger("aBigInteger"), is(new BigInteger("12345678901234567890")));
}
@Test
- public void happyCaseForFormatJustFits() throws JsonParseException, JsonMappingException, IOException {
+ public void happyCaseForFormatJustFits() throws IOException {
assertThat(jsonRepresentation.getBigInteger("aBigInteger", "big-integer(20)"), is(new BigInteger("12345678901234567890")));
}
@Test
- public void invalidFormat() throws JsonParseException, JsonMappingException, IOException {
+ public void invalidFormat() throws IOException {
expectedException.expect(IllegalArgumentException.class);
expectedException.expectMessage("Value '12345678901234567890' larger than that allowed by format 'big-integer(19)'");
@@ -63,12 +61,12 @@ public class JsonRepresentationTest_getBigInteger {
}
@Test
- public void validFormattedFromPath() throws JsonParseException, JsonMappingException, IOException {
+ public void validFormattedFromPath() throws IOException {
assertThat(jsonRepresentation.getBigInteger("yetAnotherSubMap.aFormattedBigInteger.value"), is(new BigInteger("123")));
}
@Test
- public void invalidFormattedFromPath() throws JsonParseException, JsonMappingException, IOException {
+ public void invalidFormattedFromPath() throws IOException {
expectedException.expect(IllegalArgumentException.class);
expectedException.expectMessage("Value '123' larger than that allowed by format 'big-integer(2)'");
@@ -76,17 +74,17 @@ public class JsonRepresentationTest_getBigInteger {
}
@Test
- public void invalidFormattedFromPathButOverridden() throws JsonParseException, JsonMappingException, IOException {
+ public void invalidFormattedFromPathButOverridden() throws IOException {
assertThat(jsonRepresentation.getBigInteger("yetAnotherSubMap.anInvalidFormattedBigInteger.value", "big-integer(3)"), is(new BigInteger("123")));
}
@Test
- public void forNonExistent() throws JsonParseException, JsonMappingException, IOException {
+ public void forNonExistent() throws IOException {
assertThat(jsonRepresentation.getBigInteger("doesNotExist"), is(nullValue()));
}
@Test
- public void forNonParseableString() throws JsonParseException, JsonMappingException, IOException {
+ public void forNonParseableString() throws IOException {
expectedException.expect(IllegalArgumentException.class);
expectedException.expectMessage("'aString' is not a biginteger");
@@ -94,7 +92,7 @@ public class JsonRepresentationTest_getBigInteger {
}
@Test
- public void forMap() throws JsonParseException, JsonMappingException, IOException {
+ public void forMap() throws IOException {
expectedException.expect(IllegalArgumentException.class);
expectedException.expectMessage("'aSubMap' is not a biginteger");
@@ -102,7 +100,7 @@ public class JsonRepresentationTest_getBigInteger {
}
@Test
- public void forList() throws JsonParseException, JsonMappingException, IOException {
+ public void forList() throws IOException {
expectedException.expect(IllegalArgumentException.class);
expectedException.expectMessage("'aSubList' is not a biginteger");
@@ -110,7 +108,7 @@ public class JsonRepresentationTest_getBigInteger {
}
@Test
- public void forMultipartKey() throws JsonParseException, JsonMappingException, IOException {
+ public void forMultipartKey() throws IOException {
assertThat(jsonRepresentation.getBigInteger("aSubMap.aBigInteger"), is(new BigInteger("12345678901234567890")));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
index 77fdc46..7182572 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBoolean.java
@@ -26,8 +26,6 @@ import static org.junit.Assert.fail;
import java.io.IOException;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Test;
@@ -41,17 +39,17 @@ public class JsonRepresentationTest_getBoolean {
}
@Test
- public void happyCase() throws JsonParseException, JsonMappingException, IOException {
+ public void happyCase() throws IOException {
assertThat(jsonRepresentation.getBoolean("aBoolean"), is(true));
}
@Test
- public void forNonExistent() throws JsonParseException, JsonMappingException, IOException {
+ public void forNonExistent() throws IOException {
assertThat(jsonRepresentation.getBoolean("doesNotExist"), is(nullValue()));
}
@Test
- public void forValueButNotABoolean() throws JsonParseException, JsonMappingException, IOException {
+ public void forValueButNotABoolean() throws IOException {
try {
jsonRepresentation.getBoolean("aString");
fail();
@@ -61,7 +59,7 @@ public class JsonRepresentationTest_getBoolean {
}
@Test
- public void forMap() throws JsonParseException, JsonMappingException, IOException {
+ public void forMap() throws IOException {
try {
jsonRepresentation.getBoolean("aSubMap");
fail();
@@ -71,7 +69,7 @@ public class JsonRepresentationTest_getBoolean {
}
@Test
- public void forList() throws JsonParseException, JsonMappingException, IOException {
+ public void forList() throws IOException {
try {
jsonRepresentation.getBoolean("aSubList");
fail();
@@ -81,7 +79,7 @@ public class JsonRepresentationTest_getBoolean {
}
@Test
- public void forMultipartKey() throws JsonParseException, JsonMappingException, IOException {
+ public void forMultipartKey() throws IOException {
assertThat(jsonRepresentation.getBoolean("aSubMap.aBoolean"), is(true));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
index 43a745e..ecd88da 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getDouble.java
@@ -19,8 +19,6 @@
package org.apache.isis.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -45,17 +43,17 @@ public class JsonRepresentationTest_getDouble {
}
@Test
- public void happyCase() throws JsonParseException, JsonMappingException, IOException {
+ public void happyCase() throws IOException {
assertThat(jsonRepresentation.getDouble("aDouble"), is(12345678901234534.3242));
}
@Test
- public void forNonExistent() throws JsonParseException, JsonMappingException, IOException {
+ public void forNonExistent() throws IOException {
assertThat(jsonRepresentation.getDouble("doesNotExist"), is(nullValue()));
}
@Test
- public void forValueButNotAnLong() throws JsonParseException, JsonMappingException, IOException {
+ public void forValueButNotAnLong() throws IOException {
try {
jsonRepresentation.getDouble("aString");
fail();
@@ -65,7 +63,7 @@ public class JsonRepresentationTest_getDouble {
}
@Test
- public void forMap() throws JsonParseException, JsonMappingException, IOException {
+ public void forMap() throws IOException {
try {
jsonRepresentation.getDouble("aSubMap");
fail();
@@ -75,7 +73,7 @@ public class JsonRepresentationTest_getDouble {
}
@Test
- public void forList() throws JsonParseException, JsonMappingException, IOException {
+ public void forList() throws IOException {
try {
jsonRepresentation.getDouble("aSubList");
fail();
@@ -85,7 +83,7 @@ public class JsonRepresentationTest_getDouble {
}
@Test
- public void forMultipartKey() throws JsonParseException, JsonMappingException, IOException {
+ public void forMultipartKey() throws IOException {
assertThat(jsonRepresentation.getDouble("aSubMap.aDouble"), is(12345678901234534.4567));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
index 5fe5894..7e6d8da 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getInt.java
@@ -18,19 +18,16 @@
*/
package org.apache.isis.viewer.restfulobjects.applib;
+import java.io.IOException;
+import org.junit.Before;
+import org.junit.Test;
+
import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
-import java.io.IOException;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.junit.Before;
-import org.junit.Test;
-
public class JsonRepresentationTest_getInt {
private JsonRepresentation jsonRepresentation;
@@ -41,17 +38,17 @@ public class JsonRepresentationTest_getInt {
}
@Test
- public void happyCase() throws JsonParseException, JsonMappingException, IOException {
+ public void happyCase() throws IOException {
assertThat(jsonRepresentation.getInt("anInt"), is(123));
}
@Test
- public void forNonExistent() throws JsonParseException, JsonMappingException, IOException {
+ public void forNonExistent() throws IOException {
assertThat(jsonRepresentation.getInt("doesNotExist"), is(nullValue()));
}
@Test
- public void forValueButNotAnInt() throws JsonParseException, JsonMappingException, IOException {
+ public void forValueButNotAnInt() throws IOException {
try {
jsonRepresentation.getInt("aString");
fail();
@@ -61,7 +58,7 @@ public class JsonRepresentationTest_getInt {
}
@Test
- public void forMap() throws JsonParseException, JsonMappingException, IOException {
+ public void forMap() throws IOException {
try {
jsonRepresentation.getInt("aSubMap");
fail();
@@ -71,7 +68,7 @@ public class JsonRepresentationTest_getInt {
}
@Test
- public void forList() throws JsonParseException, JsonMappingException, IOException {
+ public void forList() throws IOException {
try {
jsonRepresentation.getInt("aSubList");
fail();
@@ -81,7 +78,7 @@ public class JsonRepresentationTest_getInt {
}
@Test
- public void forMultipartKey() throws JsonParseException, JsonMappingException, IOException {
+ public void forMultipartKey() throws IOException {
assertThat(jsonRepresentation.getInt("aSubMap.anInt"), is(456));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
index d05ee0e..87fff3c 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLink_isLink.java
@@ -27,8 +27,6 @@ import static org.junit.Assert.fail;
import java.io.IOException;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Test;
@@ -44,27 +42,27 @@ public class JsonRepresentationTest_getLink_isLink {
}
@Test
- public void forLink_whenSimpleKey() throws JsonParseException, JsonMappingException, IOException {
+ public void forLink_whenSimpleKey() throws IOException {
link.withRel("someRel");
assertThat(jsonRepresentation.isLink("aLink"), is(true));
assertThat(jsonRepresentation.getLink("aLink"), is(link));
}
@Test
- public void forLink_whenMultipartKey() throws JsonParseException, JsonMappingException, IOException {
+ public void forLink_whenMultipartKey() throws IOException {
link.withRel("someSubRel");
assertThat(jsonRepresentation.isLink("aSubMap.aLink"), is(true));
assertThat(jsonRepresentation.getLink("aSubMap.aLink"), is(link));
}
@Test
- public void forNonExistent() throws JsonParseException, JsonMappingException, IOException {
+ public void forNonExistent() throws IOException {
assertThat(jsonRepresentation.isLink("doesNotExist"), is(false));
assertThat(jsonRepresentation.getLink("doesNotExist"), is(nullValue()));
}
@Test
- public void forValue() throws JsonParseException, JsonMappingException, IOException {
+ public void forValue() throws IOException {
assertThat(jsonRepresentation.isLink("anInt"), is(false));
try {
jsonRepresentation.getLink("anInt");
@@ -75,7 +73,7 @@ public class JsonRepresentationTest_getLink_isLink {
}
@Test
- public void forMap() throws JsonParseException, JsonMappingException, IOException {
+ public void forMap() throws IOException {
assertThat(jsonRepresentation.isLink("aSubMap"), is(false));
try {
jsonRepresentation.getLink("aSubMap");
@@ -86,7 +84,7 @@ public class JsonRepresentationTest_getLink_isLink {
}
@Test
- public void forList() throws JsonParseException, JsonMappingException, IOException {
+ public void forList() throws IOException {
assertThat(jsonRepresentation.isLink("aSubList"), is(false));
try {
jsonRepresentation.getLink("aSubList");
@@ -97,7 +95,7 @@ public class JsonRepresentationTest_getLink_isLink {
}
@Test
- public void withPredicate() throws JsonParseException, JsonMappingException, IOException {
+ public void withPredicate() throws IOException {
// given
link = new LinkRepresentation().withRel(Rel.SELF).withHref("http://foo/bar").withMethod(RestfulHttpMethod.GET);
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
index e3ada18..8330947 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getLong.java
@@ -18,19 +18,16 @@
*/
package org.apache.isis.viewer.restfulobjects.applib;
+import java.io.IOException;
+import org.junit.Before;
+import org.junit.Test;
+
import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
-import java.io.IOException;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.junit.Before;
-import org.junit.Test;
-
public class JsonRepresentationTest_getLong {
private JsonRepresentation jsonRepresentation;
@@ -41,17 +38,17 @@ public class JsonRepresentationTest_getLong {
}
@Test
- public void happyCase() throws JsonParseException, JsonMappingException, IOException {
+ public void happyCase() throws IOException {
assertThat(jsonRepresentation.getLong("aLong"), is(1234567890123L));
}
@Test
- public void forNonExistent() throws JsonParseException, JsonMappingException, IOException {
+ public void forNonExistent() throws IOException {
assertThat(jsonRepresentation.getLong("doesNotExist"), is(nullValue()));
}
@Test
- public void forValueButNotAnLong() throws JsonParseException, JsonMappingException, IOException {
+ public void forValueButNotAnLong() throws IOException {
try {
jsonRepresentation.getLong("aString");
fail();
@@ -61,7 +58,7 @@ public class JsonRepresentationTest_getLong {
}
@Test
- public void forMap() throws JsonParseException, JsonMappingException, IOException {
+ public void forMap() throws IOException {
try {
jsonRepresentation.getLong("aSubMap");
fail();
@@ -71,7 +68,7 @@ public class JsonRepresentationTest_getLong {
}
@Test
- public void forList() throws JsonParseException, JsonMappingException, IOException {
+ public void forList() throws IOException {
try {
jsonRepresentation.getLong("aSubList");
fail();
@@ -81,7 +78,7 @@ public class JsonRepresentationTest_getLong {
}
@Test
- public void forMultipartKey() throws JsonParseException, JsonMappingException, IOException {
+ public void forMultipartKey() throws IOException {
assertThat(jsonRepresentation.getLong("aSubMap.aLong"), is(1234567890456L));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
index 84c32b7..e94fd0b 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getNull_isNull.java
@@ -27,8 +27,6 @@ import static org.junit.Assert.fail;
import java.io.IOException;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Test;
@@ -42,7 +40,7 @@ public class JsonRepresentationTest_getNull_isNull {
}
@Test
- public void forNullValue() throws JsonParseException, JsonMappingException, IOException {
+ public void forNullValue() throws IOException {
final JsonRepresentation nullValue = jsonRepresentation.getNull("aNull");
assertThat(nullValue, is(not(nullValue())));
assertThat(nullValue.isNull(), is(true));
@@ -52,7 +50,7 @@ public class JsonRepresentationTest_getNull_isNull {
}
@Test
- public void isNull_forArray() throws JsonParseException, JsonMappingException, IOException {
+ public void isNull_forArray() throws IOException {
final Boolean isNull = jsonRepresentation.isNull("anEmptyArray");
assertThat(isNull, is(false));
}
@@ -79,7 +77,7 @@ public class JsonRepresentationTest_getNull_isNull {
}
@Test
- public void isNull_forMap() throws JsonParseException, JsonMappingException, IOException {
+ public void isNull_forMap() throws IOException {
final Boolean isNull = jsonRepresentation.isNull("aSubMap");
assertThat(isNull, is(false));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
index 8a953db..ea092f9 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getRepresentation.java
@@ -18,18 +18,15 @@
*/
package org.apache.isis.viewer.restfulobjects.applib;
+import java.io.IOException;
+import org.junit.Before;
+import org.junit.Test;
+
import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import java.io.IOException;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.junit.Before;
-import org.junit.Test;
-
public class JsonRepresentationTest_getRepresentation {
private JsonRepresentation jsonRepresentation;
@@ -40,59 +37,59 @@ public class JsonRepresentationTest_getRepresentation {
}
@Test
- public void forMap() throws JsonParseException, JsonMappingException, IOException {
+ public void forMap() throws IOException {
final JsonRepresentation mapRepresentation = jsonRepresentation.getRepresentation("aLink");
assertThat(mapRepresentation.getString("rel"), is("someRel"));
assertThat(mapRepresentation.isMap(), is(true));
}
@Test
- public void forNonExistent() throws JsonParseException, JsonMappingException, IOException {
+ public void forNonExistent() throws IOException {
assertThat(jsonRepresentation.getRepresentation("doesNotExist"), is(nullValue()));
}
@Test
- public void forValue() throws JsonParseException, JsonMappingException, IOException {
+ public void forValue() throws IOException {
final JsonRepresentation valueRepresentation = jsonRepresentation.getRepresentation("anInt");
assertThat(valueRepresentation.isValue(), is(true));
}
@Test
- public void forList() throws JsonParseException, JsonMappingException, IOException {
+ public void forList() throws IOException {
final JsonRepresentation listRepresentation = jsonRepresentation.getRepresentation("aSubList");
assertThat(listRepresentation.isArray(), is(true));
}
@Test
- public void forPath() throws JsonParseException, JsonMappingException, IOException {
+ public void forPath() throws IOException {
final JsonRepresentation representation = jsonRepresentation.getRepresentation("aSubMap.aLink");
assertThat(representation.isMap(), is(true));
assertThat(representation.getString("href"), is("http://foo/bar"));
}
@Test
- public void forListWithSingleCriteriaMatchingOne() throws JsonParseException, JsonMappingException, IOException {
+ public void forListWithSingleCriteriaMatchingOne() throws IOException {
final JsonRepresentation representation = jsonRepresentation.getRepresentation("anotherSubMap.aListOfLinks[rel=aRel]");
assertThat(representation.isLink(), is(true));
assertThat(representation.asLink().getHref(), is("http://foo/bar"));
}
@Test
- public void forListWithMultipleCriteriaMatchingOne() throws JsonParseException, JsonMappingException, IOException {
+ public void forListWithMultipleCriteriaMatchingOne() throws IOException {
final JsonRepresentation representation = jsonRepresentation.getRepresentation("anotherSubMap.aListOfLinks[rel=multiRel data=someData]");
assertThat(representation.isLink(), is(true));
assertThat(representation.asLink().getHref(), is("http://foo/bar/multiRel1"));
}
@Test
- public void forListWithMultipleCriteriaMatchingMultiple() throws JsonParseException, JsonMappingException, IOException {
+ public void forListWithMultipleCriteriaMatchingMultiple() throws IOException {
final JsonRepresentation representation = jsonRepresentation.getRepresentation("anotherSubMap.aListOfLinks[rel=multiRel method=GET]");
assertThat(representation.isArray(), is(true));
assertThat(representation.size(), is(2));
}
@Test
- public void whenStartingWithList() throws JsonParseException, JsonMappingException, IOException {
+ public void whenStartingWithList() throws IOException {
final JsonRepresentation listRepresentation = jsonRepresentation.getRepresentation("anotherSubMap.aListOfLinks");
final JsonRepresentation representation = listRepresentation.getRepresentation("[rel=multiRel method=GET]");
assertThat(representation.isArray(), is(true));
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
index 3bd627a..223a5eb 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getString_isString.java
@@ -26,8 +26,6 @@ import static org.junit.Assert.fail;
import java.io.IOException;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Test;
@@ -41,19 +39,19 @@ public class JsonRepresentationTest_getString_isString {
}
@Test
- public void happyCase() throws JsonParseException, JsonMappingException, IOException {
+ public void happyCase() throws IOException {
assertThat(jsonRepresentation.isString("aString"), is(true));
assertThat(jsonRepresentation.getString("aString"), is("aStringValue"));
}
@Test
- public void forNonExistent() throws JsonParseException, JsonMappingException, IOException {
+ public void forNonExistent() throws IOException {
assertThat(jsonRepresentation.isString("doesNotExist"), is(false));
assertThat(jsonRepresentation.getString("doesNotExist"), is(nullValue()));
}
@Test
- public void forValueButNotAString() throws JsonParseException, JsonMappingException, IOException {
+ public void forValueButNotAString() throws IOException {
assertThat(jsonRepresentation.isString("anInt"), is(false));
try {
jsonRepresentation.getString("anInt");
@@ -64,7 +62,7 @@ public class JsonRepresentationTest_getString_isString {
}
@Test
- public void forMap() throws JsonParseException, JsonMappingException, IOException {
+ public void forMap() throws IOException {
assertThat(jsonRepresentation.isString("aSubMap"), is(false));
try {
jsonRepresentation.getString("aSubMap");
@@ -75,7 +73,7 @@ public class JsonRepresentationTest_getString_isString {
}
@Test
- public void forList() throws JsonParseException, JsonMappingException, IOException {
+ public void forList() throws IOException {
assertThat(jsonRepresentation.isString("aSubList"), is(false));
try {
jsonRepresentation.getString("aSubList");
@@ -86,7 +84,7 @@ public class JsonRepresentationTest_getString_isString {
}
@Test
- public void forMultipartKey() throws JsonParseException, JsonMappingException, IOException {
+ public void forMultipartKey() throws IOException {
assertThat(jsonRepresentation.isString("aSubMap.aString"), is(true));
assertThat(jsonRepresentation.getString("aSubMap.aString"), is("aSubMapStringValue"));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
index dffb2f1..a2aa491 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_isArray_isMap_isValue.java
@@ -18,17 +18,14 @@
*/
package org.apache.isis.viewer.restfulobjects.applib;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Test;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class JsonRepresentationTest_isArray_isMap_isValue {
private JsonRepresentation jsonRepresentation;
@@ -39,14 +36,14 @@ public class JsonRepresentationTest_isArray_isMap_isValue {
}
@Test
- public void forMap() throws JsonParseException, JsonMappingException, IOException {
+ public void forMap() throws IOException {
assertThat(jsonRepresentation.isArray(), is(false));
assertThat(jsonRepresentation.isMap(), is(true));
assertThat(jsonRepresentation.isValue(), is(false));
}
@Test
- public void forValue() throws JsonParseException, JsonMappingException, IOException {
+ public void forValue() throws IOException {
final JsonRepresentation valueRepresentation = jsonRepresentation.getRepresentation("aString");
assertThat(valueRepresentation.isArray(), is(false));
assertThat(valueRepresentation.isMap(), is(false));
@@ -54,7 +51,7 @@ public class JsonRepresentationTest_isArray_isMap_isValue {
}
@Test
- public void forList() throws JsonParseException, JsonMappingException, IOException {
+ public void forList() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("list.json"));
assertThat(jsonRepresentation.isArray(), is(true));
assertThat(jsonRepresentation.isMap(), is(false));
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
index 9ce0b9f..2800021 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapHas.java
@@ -18,22 +18,19 @@
*/
package org.apache.isis.viewer.restfulobjects.applib;
+import java.io.IOException;
+import org.junit.Test;
+
import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import java.io.IOException;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.junit.Test;
-
public class JsonRepresentationTest_mapHas {
private JsonRepresentation jsonRepresentation;
@Test
- public void forMap() throws JsonParseException, JsonMappingException, IOException {
+ public void forMap() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
assertThat(jsonRepresentation.mapHas("aString"), is(true));
@@ -42,7 +39,7 @@ public class JsonRepresentationTest_mapHas {
}
@Test(expected = IllegalStateException.class)
- public void forList() throws JsonParseException, JsonMappingException, IOException {
+ public void forList() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("list.json"));
jsonRepresentation.mapHas("aString");
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapIterable.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapIterable.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapIterable.java
index c1db650..5137b71 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapIterable.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_mapIterable.java
@@ -18,26 +18,23 @@
*/
package org.apache.isis.viewer.restfulobjects.applib;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import org.junit.Test;
+
import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Map.Entry;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.junit.Test;
-
public class JsonRepresentationTest_mapIterable {
private JsonRepresentation jsonRepresentation;
@Test
- public void forJsonRepresentation() throws JsonParseException, JsonMappingException, IOException {
+ public void forJsonRepresentation() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
final Iterable<Entry<String, JsonRepresentation>> mapIterable = jsonRepresentation.mapIterable();
final Iterator<Entry<String, JsonRepresentation>> mapIterator = mapIterable.iterator();
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
index e507a85..ef1c1de 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_newObject.java
@@ -18,19 +18,16 @@
*/
package org.apache.isis.viewer.restfulobjects.applib;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class JsonRepresentationTest_newObject {
@Test
- public void happyCase() throws JsonParseException, JsonMappingException, IOException {
+ public void happyCase() throws IOException {
final JsonRepresentation jsonRepresentation = JsonRepresentation.newMap();
assertThat(jsonRepresentation.isMap(), is(true));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java
index 6d7ff2f..1b148d1 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_putXxx.java
@@ -23,8 +23,8 @@ import static org.junit.Assert.assertThat;
import java.io.IOException;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
import org.junit.Before;
import org.junit.Test;
@@ -38,19 +38,19 @@ public class JsonRepresentationTest_putXxx {
}
@Test
- public void putInt() throws JsonParseException, JsonMappingException, IOException {
+ public void putInt() throws IOException {
jsonRepresentation.mapPut("a", 123);
assertThat(jsonRepresentation.getInt("a"), is(123));
}
@Test
- public void putInt_multipart() throws JsonParseException, JsonMappingException, IOException {
+ public void putInt_multipart() throws IOException {
jsonRepresentation.mapPut("a.b", 456);
assertThat(jsonRepresentation.getInt("a.b"), is(456));
}
@Test(expected = IllegalArgumentException.class)
- public void putInt_pathBlockedByValue() throws JsonParseException, JsonMappingException, IOException {
+ public void putInt_pathBlockedByValue() throws IOException {
// given
jsonRepresentation.mapPut("a", 123);
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
index 3bcdb26..aac2500 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_size.java
@@ -19,8 +19,6 @@
package org.apache.isis.viewer.restfulobjects.applib;
import java.io.IOException;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Test;
import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
@@ -32,31 +30,31 @@ public class JsonRepresentationTest_size {
private JsonRepresentation jsonRepresentation;
@Test
- public void size_forEmptyMap() throws JsonParseException, JsonMappingException, IOException {
+ public void size_forEmptyMap() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("emptyMap.json"));
assertThat(jsonRepresentation.size(), is(0));
}
@Test
- public void size_forNonEmptyMap() throws JsonParseException, JsonMappingException, IOException {
+ public void size_forNonEmptyMap() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
assertThat(jsonRepresentation.size(), is(16));
}
@Test
- public void size_forEmptyList() throws JsonParseException, JsonMappingException, IOException {
+ public void size_forEmptyList() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("emptyList.json"));
assertThat(jsonRepresentation.size(), is(0));
}
@Test
- public void size_forNonEmptyList() throws JsonParseException, JsonMappingException, IOException {
+ public void size_forNonEmptyList() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("list.json"));
assertThat(jsonRepresentation.size(), is(2));
}
@Test(expected = IllegalStateException.class)
- public void size_forValue() throws JsonParseException, JsonMappingException, IOException {
+ public void size_forValue() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
final JsonRepresentation valueRepresentation = jsonRepresentation.getRepresentation("anInt");
valueRepresentation.size();
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
index f4a7f5b..9e4549a 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollection.java
@@ -19,8 +19,6 @@
package org.apache.isis.viewer.restfulobjects.applib.domainobjects;
import java.io.IOException;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Test;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
@@ -39,7 +37,7 @@ public class DomainObjectRepresentationTest_getCollection {
}
@Test
- public void getCollection() throws JsonParseException, JsonMappingException, IOException {
+ public void getCollection() throws IOException {
final JsonRepresentation flag = representation.getCollection("someCollection");
assertThat(flag, is(not(nullValue())));
assertThat(flag.getBoolean("value"), is(true));
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
index cde0d12..765ee24 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getCollections.java
@@ -19,8 +19,6 @@
package org.apache.isis.viewer.restfulobjects.applib.domainobjects;
import java.io.IOException;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Test;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
@@ -39,7 +37,7 @@ public class DomainObjectRepresentationTest_getCollections {
}
@Test
- public void getProperties() throws JsonParseException, JsonMappingException, IOException {
+ public void getProperties() throws IOException {
final JsonRepresentation collections = representation.getCollections();
final JsonRepresentation members = representation.getMembers();
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
index 0d97cd8..8f755c8 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperties.java
@@ -19,8 +19,6 @@
package org.apache.isis.viewer.restfulobjects.applib.domainobjects;
import java.io.IOException;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Test;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
@@ -39,7 +37,7 @@ public class DomainObjectRepresentationTest_getProperties {
}
@Test
- public void getProperties() throws JsonParseException, JsonMappingException, IOException {
+ public void getProperties() throws IOException {
final JsonRepresentation properties = representation.getProperties();
final JsonRepresentation members = representation.getMembers();
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
index cb8d49d..1b2fef7 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentationTest_getProperty.java
@@ -27,8 +27,6 @@ import static org.junit.Assert.assertThat;
import java.io.IOException;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Test;
@@ -42,7 +40,7 @@ public class DomainObjectRepresentationTest_getProperty {
}
@Test
- public void getProperty() throws JsonParseException, JsonMappingException, IOException {
+ public void getProperty() throws IOException {
final JsonRepresentation flag = representation.getProperty("flag");
assertThat(flag, is(not(nullValue())));
assertThat(flag.getBoolean("value"), is(true));
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
index 04440bf..3f0d111 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
@@ -16,8 +16,7 @@
*/
package org.apache.isis.viewer.restfulobjects.rendering.domainobjects;
-import org.codehaus.jackson.node.NullNode;
-
+import com.fasterxml.jackson.databind.node.NullNode;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
@@ -302,4 +301,4 @@ public abstract class AbstractObjectMemberReprRenderer<R extends ReprRendererAbs
return objectMember.isVisible(getRendererContext().getAuthenticationSession(), objectAdapter, where);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
index dabdf02..005e26e 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ActionResultReprRenderer.java
@@ -19,8 +19,7 @@ package org.apache.isis.viewer.restfulobjects.rendering.domainobjects;
import java.util.Collection;
import java.util.Map;
-import org.codehaus.jackson.node.NullNode;
-
+import com.fasterxml.jackson.databind.node.NullNode;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
@@ -181,4 +180,4 @@ public class ActionResultReprRenderer extends ReprRendererAbstract<ActionResultR
selfLink.mapPut("args", bodyArgs);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
index 37d4025..12ff554 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
@@ -23,11 +23,11 @@ import java.math.BigInteger;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import com.fasterxml.jackson.databind.node.NullNode;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.codehaus.jackson.node.NullNode;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
index 864ea39..efd4ba8 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
@@ -18,9 +18,9 @@ package org.apache.isis.viewer.restfulobjects.rendering.domainobjects;
import java.util.List;
import java.util.Map;
+import com.fasterxml.jackson.databind.node.NullNode;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.codehaus.jackson.node.NullNode;
import org.apache.isis.applib.annotation.ActionSemantics;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -225,4 +225,4 @@ public class ObjectActionReprRenderer extends AbstractObjectMemberReprRenderer<O
getExtensions().mapPut("actionSemantics", semantics.getCamelCaseName());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
index f19c312..30ee1b7 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
@@ -18,8 +18,8 @@ package org.apache.isis.viewer.restfulobjects.rendering.domainobjects;
import java.util.List;
import java.util.Map;
+import com.fasterxml.jackson.databind.node.NullNode;
import com.google.common.collect.Lists;
-import org.codehaus.jackson.node.NullNode;
import org.apache.isis.applib.annotation.Render.Type;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -236,4 +236,4 @@ public class ObjectPropertyReprRenderer extends AbstractObjectMemberReprRenderer
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java
index 08f7fef..fc3e529 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java
@@ -32,8 +32,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.LinkFollowSpecs;
import org.apache.isis.viewer.restfulobjects.rendering.RendererContext;
import org.apache.isis.viewer.restfulobjects.rendering.ReprRendererAbstract;
-import org.codehaus.jackson.node.NullNode;
-
+import com.fasterxml.jackson.databind.node.NullNode;
import com.google.common.base.Strings;
public class DomainTypeReprRenderer extends ReprRendererAbstract<DomainTypeReprRenderer, ObjectSpecification> {
@@ -166,4 +165,4 @@ public class DomainTypeReprRenderer extends ReprRendererAbstract<DomainTypeReprR
getExtensions().mapPut("isService", objectSpecification.isService());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
index 51ea87b..7088f82 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
@@ -19,8 +19,6 @@
package org.apache.isis.viewer.restfulobjects.rendering.util;
import java.io.IOException;
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.restfulobjects.applib.util.JsonMapper;
@@ -33,10 +31,6 @@ public final class JsonWriterUtil {
final JsonMapper.PrettyPrinting prettyPrinting = inferPrettyPrinting(IsisContext.getDeploymentType());
try {
return JsonMapper.instance(prettyPrinting).write(object);
- } catch (final JsonGenerationException e) {
- throw new RuntimeException(e);
- } catch (final JsonMappingException e) {
- throw new RuntimeException(e);
} catch (final IOException e) {
throw new RuntimeException(e);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/Util.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/Util.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/Util.java
index 341b2ac..33037bb 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/Util.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/Util.java
@@ -19,10 +19,10 @@ package org.apache.isis.viewer.restfulobjects.rendering.util;
import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
import com.google.common.base.Charsets;
import com.google.common.io.ByteStreams;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.util.JsonMapper;
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java b/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
index f524e5a..17a1a86 100644
--- a/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
+++ b/core/viewer-restfulobjects-rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
@@ -20,7 +20,13 @@ package org.apache.isis.viewer.restfulobjects.rendering.domainobjects;
import java.math.BigDecimal;
import java.math.BigInteger;
-import org.codehaus.jackson.node.*;
+import com.fasterxml.jackson.databind.node.BigIntegerNode;
+import com.fasterxml.jackson.databind.node.BooleanNode;
+import com.fasterxml.jackson.databind.node.DecimalNode;
+import com.fasterxml.jackson.databind.node.DoubleNode;
+import com.fasterxml.jackson.databind.node.IntNode;
+import com.fasterxml.jackson.databind.node.LongNode;
+import com.fasterxml.jackson.databind.node.TextNode;
import org.hamcrest.Matchers;
import org.jmock.Expectations;
import org.jmock.Mockery;
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/Util.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/Util.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/Util.java
index bcbe014..369c06d 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/Util.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/Util.java
@@ -20,10 +20,12 @@ package org.apache.isis.viewer.restfulobjects.tck;
import java.io.IOException;
import javax.ws.rs.core.Response;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.apache.isis.core.commons.matchers.IsisMatchers;
-import org.apache.isis.viewer.restfulobjects.applib.*;
+import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.Rel;
+import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
+import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.RequestParameter;
@@ -36,7 +38,9 @@ import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainServiceR
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ListRepresentation;
import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
public class Util {
@@ -44,7 +48,7 @@ public class Util {
private Util() {
}
- public static String givenLinkToService(RestfulClient restfulClient, String serviceId) throws JsonParseException, JsonMappingException, IOException {
+ public static String givenLinkToService(RestfulClient restfulClient, String serviceId) throws IOException {
final DomainServiceResource resource = restfulClient.getDomainServiceResource();
final Response response = resource.services();
@@ -54,7 +58,7 @@ public class Util {
return href;
}
- public static String givenHrefToService(RestfulClient client, final String serviceId) throws JsonParseException, JsonMappingException, IOException {
+ public static String givenHrefToService(RestfulClient client, final String serviceId) throws IOException {
final DomainServiceResource resource = client.getDomainServiceResource();
final Response response = resource.services();
final ListRepresentation services = RestfulResponse.<ListRepresentation> ofT(response).getEntity();
@@ -62,7 +66,7 @@ public class Util {
return services.getRepresentation("value[rel=urn:org.restfulobjects:rels/service;serviceId=\"%s\"]", serviceId).asLink().getHref();
}
- public static JsonRepresentation givenAction(RestfulClient client, final String serviceId, final String actionId) throws JsonParseException, JsonMappingException, IOException {
+ public static JsonRepresentation givenAction(RestfulClient client, final String serviceId, final String actionId) throws IOException {
final String href = givenHrefToService(client, serviceId);
final String detailRel = Rel.DETAILS.andParam("action", actionId);
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenDisabledMembers_thenRepresentation_ok.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenDisabledMembers_thenRepresentation_ok.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenDisabledMembers_thenRepresentation_ok.java
index 7d87dad..fc8bb1c 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenDisabledMembers_thenRepresentation_ok.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenDisabledMembers_thenRepresentation_ok.java
@@ -21,8 +21,6 @@ package org.apache.isis.viewer.restfulobjects.tck.domainobject.oid;
import java.io.IOException;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status.Family;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -67,7 +65,7 @@ public class Get_givenDisabledMembers_thenRepresentation_ok {
}
- private DomainObjectRepresentation givenDomainObjectRepresentationFor(final String domainType, String instanceId) throws JsonParseException, JsonMappingException, IOException {
+ private DomainObjectRepresentation givenDomainObjectRepresentationFor(final String domainType, String instanceId) throws IOException {
final DomainObjectResource domainObjectResource = client.getDomainObjectResource();
final Response domainObjectResp = domainObjectResource.object(domainType, instanceId);
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenHasIcon_thenRepresentation_ok_TOFIX.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenHasIcon_thenRepresentation_ok_TOFIX.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenHasIcon_thenRepresentation_ok_TOFIX.java
index c64334b..a3faec4 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenHasIcon_thenRepresentation_ok_TOFIX.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenHasIcon_thenRepresentation_ok_TOFIX.java
@@ -18,24 +18,13 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobject.oid;
-import static org.apache.isis.core.commons.matchers.IsisMatchers.matches;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.assertThat;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status.Family;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-
import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -46,6 +35,12 @@ import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainObjectRe
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainObjectResource;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
+import static org.apache.isis.core.commons.matchers.IsisMatchers.matches;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.assertThat;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class Get_givenHasIcon_thenRepresentation_ok_TOFIX {
@Rule
@@ -76,7 +71,7 @@ public class Get_givenHasIcon_thenRepresentation_ok_TOFIX {
}
- private DomainObjectRepresentation givenDomainObjectRepresentationFor(final String domainType, String instanceId) throws JsonParseException, JsonMappingException, IOException {
+ private DomainObjectRepresentation givenDomainObjectRepresentationFor(final String domainType, String instanceId) throws IOException {
final Response domainObjectResp = domainObjectResource.object(domainType, instanceId);
final RestfulResponse<DomainObjectRepresentation> domainObjectJsonResp = RestfulResponse.ofT(domainObjectResp);
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenHiddenMembers_thenRepresentation_ok.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenHiddenMembers_thenRepresentation_ok.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenHiddenMembers_thenRepresentation_ok.java
index e0dc57c..ff0358e 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenHiddenMembers_thenRepresentation_ok.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenHiddenMembers_thenRepresentation_ok.java
@@ -20,8 +20,6 @@ package org.apache.isis.viewer.restfulobjects.tck.domainobject.oid;
import java.io.IOException;
import javax.ws.rs.core.Response;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -67,7 +65,7 @@ public class Get_givenHiddenMembers_thenRepresentation_ok {
}
- private DomainObjectRepresentation givenDomainObjectRepresentationFor(final String domainType, String instanceId) throws JsonParseException, JsonMappingException, IOException {
+ private DomainObjectRepresentation givenDomainObjectRepresentationFor(final String domainType, String instanceId) throws IOException {
final DomainObjectResource domainObjectResource = client.getDomainObjectResource();
final Response domainObjectResp = domainObjectResource.object(domainType, instanceId);
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenViewModel_thenRepresentation_ok_TODO.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenViewModel_thenRepresentation_ok_TODO.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenViewModel_thenRepresentation_ok_TODO.java
index 6a30b7c..46bc674 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenViewModel_thenRepresentation_ok_TODO.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Get_givenViewModel_thenRepresentation_ok_TODO.java
@@ -18,6 +18,13 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobject.oid;
+import java.io.IOException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status.Family;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
@@ -25,18 +32,10 @@ import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainObjectRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainObjectResource;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status.Family;
-import java.io.IOException;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
public class Get_givenViewModel_thenRepresentation_ok_TODO {
@@ -73,7 +72,7 @@ public class Get_givenViewModel_thenRepresentation_ok_TODO {
- private DomainObjectRepresentation givenDomainObjectRepresentationFor(final String domainType, String instanceId) throws JsonParseException, JsonMappingException, IOException {
+ private DomainObjectRepresentation givenDomainObjectRepresentationFor(final String domainType, String instanceId) throws IOException {
final DomainObjectResource domainObjectResource = client.getDomainObjectResource();
final Response domainObjectResp = domainObjectResource.object(domainType, instanceId);
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Put_whenArgsValid_thenMultiplePropertyUpdate.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Put_whenArgsValid_thenMultiplePropertyUpdate.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Put_whenArgsValid_thenMultiplePropertyUpdate.java
index 7e53275..25122a7 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Put_whenArgsValid_thenMultiplePropertyUpdate.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Put_whenArgsValid_thenMultiplePropertyUpdate.java
@@ -23,8 +23,6 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status.Family;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.joda.time.LocalDate;
@@ -210,7 +208,7 @@ public class Put_whenArgsValid_thenMultiplePropertyUpdate {
return ISODateTimeFormat.timeNoMillis().withZoneUTC().print(dt);
}
- private DomainObjectRepresentation getObjectRepr(final String domainType, final String instanceId) throws JsonParseException, JsonMappingException, IOException {
+ private DomainObjectRepresentation getObjectRepr(final String domainType, final String instanceId) throws IOException {
final Response domainObjectResp = domainObjectResource.object(domainType, instanceId);
final RestfulResponse<DomainObjectRepresentation> domainObjectJsonResp = RestfulResponse.ofT(domainObjectResp);
assertThat(domainObjectJsonResp.getStatus().getFamily(), is(Family.SUCCESSFUL));
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValidContainsPlus_thenStringPropertyUpdated_ok_TODO.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValidContainsPlus_thenStringPropertyUpdated_ok_TODO.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValidContainsPlus_thenStringPropertyUpdated_ok_TODO.java
index b1ac945..34a3e80 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValidContainsPlus_thenStringPropertyUpdated_ok_TODO.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValidContainsPlus_thenStringPropertyUpdated_ok_TODO.java
@@ -21,8 +21,6 @@ package org.apache.isis.viewer.restfulobjects.tck.domainobject.oid.property;
import java.io.IOException;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status.Family;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -82,7 +80,7 @@ public class Put_whenArgValidContainsPlus_thenStringPropertyUpdated_ok_TODO {
}
- private ObjectPropertyRepresentation getObjectPropertyRepr(final String domainType, final String instanceId, String propertyId) throws JsonParseException, JsonMappingException, IOException {
+ private ObjectPropertyRepresentation getObjectPropertyRepr(final String domainType, final String instanceId, String propertyId) throws IOException {
final Response domainObjectResp = domainObjectResource.propertyDetails(domainType, instanceId, propertyId);
final RestfulResponse<ObjectPropertyRepresentation> domainObjectJsonResp = RestfulResponse.ofT(domainObjectResp);
assertThat(domainObjectJsonResp.getStatus().getFamily(), is(Family.SUCCESSFUL));
@@ -91,7 +89,7 @@ public class Put_whenArgValidContainsPlus_thenStringPropertyUpdated_ok_TODO {
return repr;
}
- private LinkRepresentation getObjectPropertyReprModifyLink(String domainType, String instanceId, String propertyId) throws JsonParseException, JsonMappingException, IOException {
+ private LinkRepresentation getObjectPropertyReprModifyLink(String domainType, String instanceId, String propertyId) throws IOException {
ObjectPropertyRepresentation objectPropertyRepr = getObjectPropertyRepr(domainType, instanceId, propertyId);
return objectPropertyRepr.getLinkWithRel(Rel.MODIFY);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenJdkPropertyUpdated_ok.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenJdkPropertyUpdated_ok.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenJdkPropertyUpdated_ok.java
index 56cf70b..84d06f4 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenJdkPropertyUpdated_ok.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenJdkPropertyUpdated_ok.java
@@ -23,8 +23,6 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status.Family;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.joda.time.format.ISODateTimeFormat;
@@ -128,7 +126,7 @@ public class Put_whenArgValid_thenJdkPropertyUpdated_ok {
}
- private ObjectPropertyRepresentation getObjectPropertyRepr(final String domainType, final String instanceId, String propertyId) throws JsonParseException, JsonMappingException, IOException {
+ private ObjectPropertyRepresentation getObjectPropertyRepr(final String domainType, final String instanceId, String propertyId) throws IOException {
final Response domainObjectResp = domainObjectResource.propertyDetails(domainType, instanceId, propertyId);
final RestfulResponse<ObjectPropertyRepresentation> domainObjectJsonResp = RestfulResponse.ofT(domainObjectResp);
assertThat(domainObjectJsonResp.getStatus().getFamily(), is(Family.SUCCESSFUL));
@@ -137,7 +135,7 @@ public class Put_whenArgValid_thenJdkPropertyUpdated_ok {
return repr;
}
- private LinkRepresentation getObjectPropertyReprModifyLink(String domainType, String instanceId, String propertyId) throws JsonParseException, JsonMappingException, IOException {
+ private LinkRepresentation getObjectPropertyReprModifyLink(String domainType, String instanceId, String propertyId) throws IOException {
ObjectPropertyRepresentation objectPropertyRepr = getObjectPropertyRepr(domainType, instanceId, propertyId);
return objectPropertyRepr.getLinkWithRel(Rel.MODIFY);
}
[02/13] isis git commit: Update Jackson to 2.4.3
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenJodaTimePropertyUpdated_ok_TODO.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenJodaTimePropertyUpdated_ok_TODO.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenJodaTimePropertyUpdated_ok_TODO.java
index 6f631d2..72c4173 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenJodaTimePropertyUpdated_ok_TODO.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenJodaTimePropertyUpdated_ok_TODO.java
@@ -21,13 +21,15 @@ package org.apache.isis.viewer.restfulobjects.tck.domainobject.oid.property;
import java.io.IOException;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status.Family;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
import org.joda.time.format.ISODateTimeFormat;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
@@ -98,7 +100,7 @@ public class Put_whenArgValid_thenJodaTimePropertyUpdated_ok_TODO {
assertThat(followedRepr(modifyLink,argRepr).getString("value"), is(s));
}
- private ObjectPropertyRepresentation getObjectPropertyRepr(final String domainType, final String instanceId, String propertyId) throws JsonParseException, JsonMappingException, IOException {
+ private ObjectPropertyRepresentation getObjectPropertyRepr(final String domainType, final String instanceId, String propertyId) throws IOException {
final Response domainObjectResp = domainObjectResource.propertyDetails(domainType, instanceId, propertyId);
final RestfulResponse<ObjectPropertyRepresentation> domainObjectJsonResp = RestfulResponse.ofT(domainObjectResp);
assertThat(domainObjectJsonResp.getStatus().getFamily(), is(Family.SUCCESSFUL));
@@ -107,7 +109,7 @@ public class Put_whenArgValid_thenJodaTimePropertyUpdated_ok_TODO {
return repr;
}
- private LinkRepresentation getObjectPropertyReprModifyLink(String domainType, String instanceId, String propertyId) throws JsonParseException, JsonMappingException, IOException {
+ private LinkRepresentation getObjectPropertyReprModifyLink(String domainType, String instanceId, String propertyId) throws IOException {
ObjectPropertyRepresentation objectPropertyRepr = getObjectPropertyRepr(domainType, instanceId, propertyId);
return objectPropertyRepr.getLinkWithRel(Rel.MODIFY);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenPrimitivePropertyUpdated_ok.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenPrimitivePropertyUpdated_ok.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenPrimitivePropertyUpdated_ok.java
index 8759e66..8d81f31 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenPrimitivePropertyUpdated_ok.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenPrimitivePropertyUpdated_ok.java
@@ -21,8 +21,6 @@ package org.apache.isis.viewer.restfulobjects.tck.domainobject.oid.property;
import java.io.IOException;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status.Family;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -122,7 +120,7 @@ public class Put_whenArgValid_thenPrimitivePropertyUpdated_ok {
}
- private ObjectPropertyRepresentation getObjectPropertyRepr(final String domainType, final String instanceId, String propertyId) throws JsonParseException, JsonMappingException, IOException {
+ private ObjectPropertyRepresentation getObjectPropertyRepr(final String domainType, final String instanceId, String propertyId) throws IOException {
final Response domainObjectResp = domainObjectResource.propertyDetails(domainType, instanceId, propertyId);
final RestfulResponse<ObjectPropertyRepresentation> domainObjectJsonResp = RestfulResponse.ofT(domainObjectResp);
assertThat(domainObjectJsonResp.getStatus().getFamily(), is(Family.SUCCESSFUL));
@@ -131,7 +129,7 @@ public class Put_whenArgValid_thenPrimitivePropertyUpdated_ok {
return repr;
}
- private LinkRepresentation getObjectPropertyReprModifyLink(String domainType, String instanceId, String propertyId) throws JsonParseException, JsonMappingException, IOException {
+ private LinkRepresentation getObjectPropertyReprModifyLink(String domainType, String instanceId, String propertyId) throws IOException {
ObjectPropertyRepresentation objectPropertyRepr = getObjectPropertyRepr(domainType, instanceId, propertyId);
return objectPropertyRepr.getLinkWithRel(Rel.MODIFY);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_whenDoesntExistOid_then_404.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_whenDoesntExistOid_then_404.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_whenDoesntExistOid_then_404.java
index 9ace17f..5b3f3f8 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_whenDoesntExistOid_then_404.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_whenDoesntExistOid_then_404.java
@@ -18,29 +18,19 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.io.IOException;
-
import javax.ws.rs.core.Response;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-
-import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.isis.viewer.restfulobjects.applib.Rel;
-import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainServiceResource;
-import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ListRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class Get_whenDoesntExistOid_then_404 {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenActionSemanticsOfIdempotent_thenResponseCode_205_bad_TODO.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenActionSemanticsOfIdempotent_thenResponseCode_205_bad_TODO.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenActionSemanticsOfIdempotent_thenResponseCode_205_bad_TODO.java
index cc0b31d..3bd0dea 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenActionSemanticsOfIdempotent_thenResponseCode_205_bad_TODO.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenActionSemanticsOfIdempotent_thenResponseCode_205_bad_TODO.java
@@ -18,24 +18,13 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.MediaType;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -50,6 +39,12 @@ import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectActionRe
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.Util;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class Get_givenActionSemanticsOfIdempotent_thenResponseCode_205_bad_TODO {
@Rule
@@ -99,7 +94,7 @@ public class Get_givenActionSemanticsOfIdempotent_thenResponseCode_205_bad_TODO
// not possible to test using resourceProxy
- private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse, hasStatus(HttpStatusCode.METHOD_NOT_ALLOWED));
assertThat(restfulResponse.getHeader(Header.WARNING), is("object is immutable")); // not a good message, but as per spec
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenActionSemanticsOfNotIdempotent_thenResponseCode_205_bad_TOFIX.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenActionSemanticsOfNotIdempotent_thenResponseCode_205_bad_TOFIX.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenActionSemanticsOfNotIdempotent_thenResponseCode_205_bad_TOFIX.java
index fa8b75d..7ed8a17 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenActionSemanticsOfNotIdempotent_thenResponseCode_205_bad_TOFIX.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenActionSemanticsOfNotIdempotent_thenResponseCode_205_bad_TOFIX.java
@@ -18,24 +18,13 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.MediaType;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -50,6 +39,12 @@ import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectActionRe
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.Util;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class Get_givenActionSemanticsOfNotIdempotent_thenResponseCode_205_bad_TOFIX {
@Rule
@@ -99,7 +94,7 @@ public class Get_givenActionSemanticsOfNotIdempotent_thenResponseCode_205_bad_TO
// not possible to test using resourceProxy
- private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse, hasStatus(HttpStatusCode.METHOD_NOT_ALLOWED));
assertThat(restfulResponse.getHeader(Header.WARNING), is("object is immutable")); // not a good message, but as per spec
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenActionSemanticsOfSafe_ok.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenActionSemanticsOfSafe_ok.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenActionSemanticsOfSafe_ok.java
index cce19c1..3c054c5 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenActionSemanticsOfSafe_ok.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenActionSemanticsOfSafe_ok.java
@@ -20,13 +20,15 @@ package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.actio
import java.io.IOException;
import javax.ws.rs.core.Response;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.viewer.restfulobjects.applib.*;
+import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.Rel;
+import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
+import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.Header;
@@ -82,7 +84,7 @@ public class Get_givenActionSemanticsOfSafe_ok {
then(restfulResponse);
}
- private static void then(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void then(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse.getHeader(Header.CONTENT_TYPE), hasMediaTypeProfile(RestfulMediaType.APPLICATION_JSON_ACTION_RESULT));
final ActionResultRepresentation actionResultRepr = restfulResponse.getEntity();
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenDisabled_thenResponseCode_203.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenDisabled_thenResponseCode_203.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenDisabled_thenResponseCode_203.java
index b37d3a4..a9e2e20 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenDisabled_thenResponseCode_203.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenDisabled_thenResponseCode_203.java
@@ -18,23 +18,12 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -49,6 +38,11 @@ import org.apache.isis.viewer.restfulobjects.applib.util.UrlEncodingUtils;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.Util;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class Get_givenDisabled_thenResponseCode_203 {
@Rule
@@ -107,7 +101,7 @@ public class Get_givenDisabled_thenResponseCode_203 {
thenResponseIsErrorWithInvalidReason(restfulResponse, "Always disabled");
}
- private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse, String disabledReason) throws JsonParseException, JsonMappingException, IOException {
+ private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse, String disabledReason) throws IOException {
assertThat(restfulResponse, hasStatus(HttpStatusCode.FORBIDDEN));
assertThat(restfulResponse.getHeader(Header.WARNING), is(disabledReason));
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenMandatorySimpleArg_whenArgMissing_bad.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenMandatorySimpleArg_whenArgMissing_bad.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenMandatorySimpleArg_whenArgMissing_bad.java
index 7a80072..37e849b 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenMandatorySimpleArg_whenArgMissing_bad.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenMandatorySimpleArg_whenArgMissing_bad.java
@@ -21,8 +21,6 @@ package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.actio
import java.io.IOException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Rule;
@@ -43,7 +41,9 @@ import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers;
import org.apache.isis.viewer.restfulobjects.tck.Util;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.*;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -110,7 +110,7 @@ public class Get_givenMandatorySimpleArg_whenArgMissing_bad {
thenResponseIsErrorWithInvalidReason(restfulResponse);
}
- private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse, hasStatus(HttpStatusCode.BAD_REQUEST));
assertThat(restfulResponse.getHeader(Header.WARNING), is("No argument found for (mandatory) parameter 'from'"));
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenMandatorySimpleArg_whenArgNullValue_bad.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenMandatorySimpleArg_whenArgNullValue_bad.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenMandatorySimpleArg_whenArgNullValue_bad.java
index 99d367c..9e4de16 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenMandatorySimpleArg_whenArgNullValue_bad.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenMandatorySimpleArg_whenArgNullValue_bad.java
@@ -21,8 +21,6 @@ package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.actio
import java.io.IOException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Rule;
@@ -43,7 +41,9 @@ import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers;
import org.apache.isis.viewer.restfulobjects.tck.Util;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.*;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -108,7 +108,7 @@ public class Get_givenMandatorySimpleArg_whenArgNullValue_bad {
thenResponseIsErrorWithInvalidReason(restfulResponse);
}
- private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse, hasStatus(HttpStatusCode.VALIDATION_FAILED));
assertThat(restfulResponse.getHeader(Header.WARNING), is("Validation failed, see body for details"));
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenNoArgRequired_whenNoArgProvided_ok.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenNoArgRequired_whenNoArgProvided_ok.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenNoArgRequired_whenNoArgProvided_ok.java
index 43f64f9..c9c3e99 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenNoArgRequired_whenNoArgProvided_ok.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenNoArgRequired_whenNoArgProvided_ok.java
@@ -18,15 +18,12 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.Response;
-
+import org.hamcrest.Matchers;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -42,12 +39,11 @@ import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ListRepresenta
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectActionRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.Util;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.hamcrest.Matchers;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class Get_givenNoArgRequired_whenNoArgProvided_ok {
@@ -88,7 +84,7 @@ public class Get_givenNoArgRequired_whenNoArgProvided_ok {
then(restfulResponse);
}
- private static void then(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void then(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse.getHeader(Header.CONTENT_TYPE), hasMediaTypeProfile(RestfulMediaType.APPLICATION_JSON_ACTION_RESULT));
final ActionResultRepresentation actionResultRepr = restfulResponse.getEntity();
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenOptionalArg_whenNoArgProvided_ok.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenOptionalArg_whenNoArgProvided_ok.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenOptionalArg_whenNoArgProvided_ok.java
index cbb7847..89a673e 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenOptionalArg_whenNoArgProvided_ok.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenOptionalArg_whenNoArgProvided_ok.java
@@ -18,15 +18,12 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.Response;
-
+import org.hamcrest.Matchers;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -44,12 +41,11 @@ import org.apache.isis.viewer.restfulobjects.applib.util.UrlEncodingUtils;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers;
import org.apache.isis.viewer.restfulobjects.tck.Util;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.hamcrest.Matchers;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class Get_givenOptionalArg_whenNoArgProvided_ok {
@@ -149,7 +145,7 @@ public class Get_givenOptionalArg_whenNoArgProvided_ok {
}
- private static void then(RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void then(RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse.getHeader(Header.CONTENT_TYPE), hasMediaTypeProfile(RestfulMediaType.APPLICATION_JSON_ACTION_RESULT));
final ActionResultRepresentation actionResultRepr = restfulResponse.getEntity();
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenRefArg_whenArgIsHrefAndLinksToNonExistentEntity_bad.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenRefArg_whenArgIsHrefAndLinksToNonExistentEntity_bad.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenRefArg_whenArgIsHrefAndLinksToNonExistentEntity_bad.java
index b1550db..752b0c5 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenRefArg_whenArgIsHrefAndLinksToNonExistentEntity_bad.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenRefArg_whenArgIsHrefAndLinksToNonExistentEntity_bad.java
@@ -21,8 +21,6 @@ package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.actio
import java.io.IOException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -103,7 +101,7 @@ public class Get_givenRefArg_whenArgIsHrefAndLinksToNonExistentEntity_bad {
then(args, restfulResponse);
}
- private static void then(final JsonRepresentation args, RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void then(final JsonRepresentation args, RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
// then the response is an error
assertThat(restfulResponse, hasStatus(HttpStatusCode.VALIDATION_FAILED));
assertThat(restfulResponse.getHeader(Header.WARNING), is("Validation failed, see body for details"));
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenRefArg_whenArgProvided_ok.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenRefArg_whenArgProvided_ok.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenRefArg_whenArgProvided_ok.java
index 91f93ad..74845d5 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenRefArg_whenArgProvided_ok.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenRefArg_whenArgProvided_ok.java
@@ -18,17 +18,12 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.Response;
-
+import org.hamcrest.Matchers;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -46,12 +41,13 @@ import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ScalarValueRep
import org.apache.isis.viewer.restfulobjects.applib.util.UrlEncodingUtils;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.Util;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.hamcrest.Matchers;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
public class Get_givenRefArg_whenArgProvided_ok {
@@ -131,7 +127,7 @@ public class Get_givenRefArg_whenArgProvided_ok {
thenResponseIsScalarValueOf(restfulResponse, true);
}
- private void thenResponseIsScalarValueOf(RestfulResponse<ActionResultRepresentation> restfulResponse, boolean value) throws JsonParseException, JsonMappingException, IOException {
+ private void thenResponseIsScalarValueOf(RestfulResponse<ActionResultRepresentation> restfulResponse, boolean value) throws IOException {
assertThat(restfulResponse.getHeader(Header.CONTENT_TYPE), hasMediaTypeProfile(RestfulMediaType.APPLICATION_JSON_ACTION_RESULT));
ActionResultRepresentation actionResultRepr = restfulResponse.getEntity();
assertThat(actionResultRepr.getResultType(), is(ResultType.SCALAR_VALUE));
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArgInteger_whenArgMalformed_bad_TODO.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArgInteger_whenArgMalformed_bad_TODO.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArgInteger_whenArgMalformed_bad_TODO.java
index e747c9c..2519e5c 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArgInteger_whenArgMalformed_bad_TODO.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArgInteger_whenArgMalformed_bad_TODO.java
@@ -20,13 +20,15 @@ package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.actio
import java.io.IOException;
import javax.ws.rs.core.Response;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.viewer.restfulobjects.applib.*;
+import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.Rel;
+import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
+import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.Header;
@@ -104,7 +106,7 @@ public class Get_givenScalarArgInteger_whenArgMalformed_bad_TODO {
then(restfulResponse);
}
- private static void then(RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void then(RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse.getHeader(Header.CONTENT_TYPE), hasMediaTypeProfile(RestfulMediaType.APPLICATION_JSON_ACTION_RESULT));
final ActionResultRepresentation actionResultRepr = restfulResponse.getEntity();
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArgInteger_whenArgProvided_ok.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArgInteger_whenArgProvided_ok.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArgInteger_whenArgProvided_ok.java
index 8646462..c3cb3bb 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArgInteger_whenArgProvided_ok.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArgInteger_whenArgProvided_ok.java
@@ -20,13 +20,15 @@ package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.actio
import java.io.IOException;
import javax.ws.rs.core.Response;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.viewer.restfulobjects.applib.*;
+import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.Rel;
+import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
+import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.Header;
@@ -104,7 +106,7 @@ public class Get_givenScalarArgInteger_whenArgProvided_ok {
then(restfulResponse);
}
- private static void then(RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void then(RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse.getHeader(Header.CONTENT_TYPE), hasMediaTypeProfile(RestfulMediaType.APPLICATION_JSON_ACTION_RESULT));
final ActionResultRepresentation actionResultRepr = restfulResponse.getEntity();
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArg_whenArgMalformedMissingValueNode_bad.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArg_whenArgMalformedMissingValueNode_bad.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArg_whenArgMalformedMissingValueNode_bad.java
index b151c80..3082091 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArg_whenArgMalformedMissingValueNode_bad.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArg_whenArgMalformedMissingValueNode_bad.java
@@ -18,23 +18,13 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -49,6 +39,11 @@ import org.apache.isis.viewer.restfulobjects.applib.util.UrlEncodingUtils;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.Util;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class Get_givenScalarArg_whenArgMalformedMissingValueNode_bad {
@Rule
@@ -108,7 +103,7 @@ public class Get_givenScalarArg_whenArgMalformedMissingValueNode_bad {
}
- private static void then(RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void then(RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse.getHeader(Header.CONTENT_TYPE), hasMediaTypeProfile(MediaType.APPLICATION_JSON));
final JsonRepresentation errorRepr = restfulResponse.wraps(JsonRepresentation.class).getEntity();
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArg_whenArgSurplus_bad.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArg_whenArgSurplus_bad.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArg_whenArgSurplus_bad.java
index 66e10be..2c21b50 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArg_whenArgSurplus_bad.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenScalarArg_whenArgSurplus_bad.java
@@ -18,24 +18,13 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -52,6 +41,12 @@ import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers;
import org.apache.isis.viewer.restfulobjects.tck.Util;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class Get_givenScalarArg_whenArgSurplus_bad {
@Rule
@@ -119,7 +114,7 @@ public class Get_givenScalarArg_whenArgSurplus_bad {
thenResponseIsErrorWithInvalidReason(restfulResponse);
}
- private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse, hasStatus(HttpStatusCode.BAD_REQUEST));
assertThat(restfulResponse.getHeader(Header.WARNING), is("Argument 'nonExistent' found but no such parameter"));
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenValidationRuleForAllArgs_whenArgFails_bad.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenValidationRuleForAllArgs_whenArgFails_bad.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenValidationRuleForAllArgs_whenArgFails_bad.java
index 4c76bbc..8aa0734 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenValidationRuleForAllArgs_whenArgFails_bad.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenValidationRuleForAllArgs_whenArgFails_bad.java
@@ -18,17 +18,13 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-
+import org.hamcrest.Matchers;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -44,12 +40,12 @@ import org.apache.isis.viewer.restfulobjects.applib.util.UrlEncodingUtils;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers;
import org.apache.isis.viewer.restfulobjects.tck.Util;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.hamcrest.Matchers;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class Get_givenValidationRuleForAllArgs_whenArgFails_bad {
@@ -111,7 +107,7 @@ public class Get_givenValidationRuleForAllArgs_whenArgFails_bad {
thenResponseIsErrorWithInvalidReason(restfulResponse);
}
- private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse, hasStatus(HttpStatusCode.VALIDATION_FAILED));
assertThat(restfulResponse.getHeader(Header.WARNING), is("Validation failed, see body for details"));
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenValidationRuleForSingleArg_whenArgFails_bad.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenValidationRuleForSingleArg_whenArgFails_bad.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenValidationRuleForSingleArg_whenArgFails_bad.java
index 3fd6cc2..1550dc3 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenValidationRuleForSingleArg_whenArgFails_bad.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_givenValidationRuleForSingleArg_whenArgFails_bad.java
@@ -18,18 +18,13 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-
+import org.hamcrest.Matchers;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -45,12 +40,13 @@ import org.apache.isis.viewer.restfulobjects.applib.util.UrlEncodingUtils;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers;
import org.apache.isis.viewer.restfulobjects.tck.Util;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.hamcrest.Matchers;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class Get_givenValidationRuleForSingleArg_whenArgFails_bad {
@@ -113,7 +109,7 @@ public class Get_givenValidationRuleForSingleArg_whenArgFails_bad {
thenResponseIsAValidationError(restfulResponse);
}
- private static void thenResponseIsAValidationError(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void thenResponseIsAValidationError(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse, hasStatus(HttpStatusCode.VALIDATION_FAILED));
assertThat(restfulResponse.getHeader(Header.WARNING), containsString("Validation failed, see body for details"));
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_thenRespHeaders_ContentType_andContentLength_andRespCode_200_ok.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_thenRespHeaders_ContentType_andContentLength_andRespCode_200_ok.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_thenRespHeaders_ContentType_andContentLength_andRespCode_200_ok.java
index a6844fb..50cb663 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_thenRespHeaders_ContentType_andContentLength_andRespCode_200_ok.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_thenRespHeaders_ContentType_andContentLength_andRespCode_200_ok.java
@@ -18,15 +18,12 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.Response;
-
+import org.hamcrest.Matchers;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.core.commons.matchers.IsisMatchers;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
@@ -42,12 +39,11 @@ import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainServiceR
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectActionRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.Util;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.hamcrest.Matchers;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class Get_thenRespHeaders_ContentType_andContentLength_andRespCode_200_ok {
@@ -98,7 +94,7 @@ public class Get_thenRespHeaders_ContentType_andContentLength_andRespCode_200_ok
then(restfulResponse);
}
- private static void then(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void then(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse.getStatus(), is(HttpStatusCode.OK));
assertThat(restfulResponse.getHeader(Header.CONTENT_TYPE), hasMediaTypeProfile(RestfulMediaType.APPLICATION_JSON_ACTION_RESULT));
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenObject_isNotNull_thenRepr_andRespHeaders_and_200_ok.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenObject_isNotNull_thenRepr_andRespHeaders_and_200_ok.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenObject_isNotNull_thenRepr_andRespHeaders_and_200_ok.java
index 9d8bb1e..9a85564 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenObject_isNotNull_thenRepr_andRespHeaders_and_200_ok.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenObject_isNotNull_thenRepr_andRespHeaders_and_200_ok.java
@@ -18,22 +18,11 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.Response;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-
import org.apache.isis.core.commons.matchers.IsisMatchers;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
@@ -51,6 +40,12 @@ import org.apache.isis.viewer.restfulobjects.applib.util.UrlEncodingUtils;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.Util;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
// Get_whenObject_isNotNull_thenRepr_ok_andRespHeaders_ContentType_andContentLength__andRespCode_200_ok
public class Get_whenObject_isNotNull_thenRepr_andRespHeaders_and_200_ok {
@@ -103,7 +98,7 @@ public class Get_whenObject_isNotNull_thenRepr_andRespHeaders_and_200_ok {
then(restfulResponse);
}
- private static void then(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void then(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse.getStatus(), is(HttpStatusCode.OK));
assertThat(restfulResponse.getHeader(Header.CONTENT_TYPE), hasMediaTypeProfile(RestfulMediaType.APPLICATION_JSON_ACTION_RESULT));
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenObject_isNull_thenRepresentation_ok.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenObject_isNull_thenRepresentation_ok.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenObject_isNull_thenRepresentation_ok.java
index e3452a0..37b1caf 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenObject_isNull_thenRepresentation_ok.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenObject_isNull_thenRepresentation_ok.java
@@ -18,21 +18,11 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.Response;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
@@ -47,6 +37,11 @@ import org.apache.isis.viewer.restfulobjects.applib.util.UrlEncodingUtils;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.Util;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
public class Get_whenObject_isNull_thenRepresentation_ok {
@Rule
@@ -98,7 +93,7 @@ public class Get_whenObject_isNull_thenRepresentation_ok {
then(restfulResponse);
}
- private static void then(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void then(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse.getHeader(Header.CONTENT_TYPE), hasMediaTypeProfile(RestfulMediaType.APPLICATION_JSON_ACTION_RESULT));
final ActionResultRepresentation actionResultRepr = restfulResponse.getEntity();
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_givenActionSemanticsOfIdempotent_then_205_bad_TODO.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_givenActionSemanticsOfIdempotent_then_205_bad_TODO.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_givenActionSemanticsOfIdempotent_then_205_bad_TODO.java
index 9ea12f6..00450fa 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_givenActionSemanticsOfIdempotent_then_205_bad_TODO.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_givenActionSemanticsOfIdempotent_then_205_bad_TODO.java
@@ -18,24 +18,13 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.MediaType;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -50,6 +39,12 @@ import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectActionRe
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.Util;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class Post_givenActionSemanticsOfIdempotent_then_205_bad_TODO {
@Rule
@@ -99,7 +94,7 @@ public class Post_givenActionSemanticsOfIdempotent_then_205_bad_TODO {
// not possible to test using resourceProxy
- private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse, hasStatus(HttpStatusCode.METHOD_NOT_ALLOWED));
assertThat(restfulResponse.getHeader(Header.WARNING), is("object is immutable")); // not a good message, but as per spec
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_givenActionSemanticsOfSafe_then_205_bad_TOFIX.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_givenActionSemanticsOfSafe_then_205_bad_TOFIX.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_givenActionSemanticsOfSafe_then_205_bad_TOFIX.java
index 26c9bfd..fa8e824 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_givenActionSemanticsOfSafe_then_205_bad_TOFIX.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_givenActionSemanticsOfSafe_then_205_bad_TOFIX.java
@@ -18,24 +18,13 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.MediaType;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -50,6 +39,12 @@ import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectActionRe
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.Util;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class Post_givenActionSemanticsOfSafe_then_205_bad_TOFIX {
@Rule
@@ -99,7 +94,7 @@ public class Post_givenActionSemanticsOfSafe_then_205_bad_TOFIX {
// not possible to test using resourceProxy
- private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse, hasStatus(HttpStatusCode.METHOD_NOT_ALLOWED));
assertThat(restfulResponse.getHeader(Header.WARNING), is("object is immutable")); // not a good message, but as per spec
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Put_givenActionSemanticsOfNotIdempotent_then_405_bad_TODO.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Put_givenActionSemanticsOfNotIdempotent_then_405_bad_TODO.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Put_givenActionSemanticsOfNotIdempotent_then_405_bad_TODO.java
index fdacf35..6f804d4 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Put_givenActionSemanticsOfNotIdempotent_then_405_bad_TODO.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Put_givenActionSemanticsOfNotIdempotent_then_405_bad_TODO.java
@@ -18,24 +18,13 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.MediaType;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -50,6 +39,12 @@ import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectActionRe
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.Util;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class Put_givenActionSemanticsOfNotIdempotent_then_405_bad_TODO {
@Rule
@@ -99,7 +94,7 @@ public class Put_givenActionSemanticsOfNotIdempotent_then_405_bad_TODO {
// not possible to test using resourceProxy
- private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse, hasStatus(HttpStatusCode.METHOD_NOT_ALLOWED));
assertThat(restfulResponse.getHeader(Header.WARNING), is("object is immutable")); // not a good message, but as per spec
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Put_givenActionSemanticsOfSafe_then_405_bad_TODO.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Put_givenActionSemanticsOfSafe_then_405_bad_TODO.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Put_givenActionSemanticsOfSafe_then_405_bad_TODO.java
index 8af0149..6aba617 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Put_givenActionSemanticsOfSafe_then_405_bad_TODO.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Put_givenActionSemanticsOfSafe_then_405_bad_TODO.java
@@ -18,24 +18,13 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
-
import javax.ws.rs.core.MediaType;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -50,6 +39,12 @@ import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectActionRe
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.Util;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasMediaTypeProfile;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.hasStatus;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class Put_givenActionSemanticsOfSafe_then_405_bad_TODO {
@Rule
@@ -99,7 +94,7 @@ public class Put_givenActionSemanticsOfSafe_then_405_bad_TODO {
// not possible to test using resourceProxy
- private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws JsonParseException, JsonMappingException, IOException {
+ private static void thenResponseIsErrorWithInvalidReason(final RestfulResponse<ActionResultRepresentation> restfulResponse) throws IOException {
assertThat(restfulResponse, hasStatus(HttpStatusCode.METHOD_NOT_ALLOWED));
assertThat(restfulResponse.getHeader(Header.WARNING), is("object is immutable")); // not a good message, but as per spec
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainservice/serviceId/Get_whenDoesntExistId_thenResponseCode_404.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainservice/serviceId/Get_whenDoesntExistId_thenResponseCode_404.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainservice/serviceId/Get_whenDoesntExistId_thenResponseCode_404.java
index c93f28a..d9f758e 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainservice/serviceId/Get_whenDoesntExistId_thenResponseCode_404.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainservice/serviceId/Get_whenDoesntExistId_thenResponseCode_404.java
@@ -18,29 +18,19 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainservice.serviceId;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.io.IOException;
-
import javax.ws.rs.core.Response;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-
-import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.isis.viewer.restfulobjects.applib.Rel;
-import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainServiceResource;
-import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ListRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class Get_whenDoesntExistId_thenResponseCode_404 {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainservice/serviceId/Get_whenQueryArg_xRoFollowLinks_ok.java
----------------------------------------------------------------------
diff --git a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainservice/serviceId/Get_whenQueryArg_xRoFollowLinks_ok.java b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainservice/serviceId/Get_whenQueryArg_xRoFollowLinks_ok.java
index 0971323..0236708 100644
--- a/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainservice/serviceId/Get_whenQueryArg_xRoFollowLinks_ok.java
+++ b/tck/tck-viewer-restfulobjects/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainservice/serviceId/Get_whenQueryArg_xRoFollowLinks_ok.java
@@ -19,8 +19,6 @@
package org.apache.isis.viewer.restfulobjects.tck.domainservice.serviceId;
import java.io.IOException;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -38,7 +36,9 @@ import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
import org.apache.isis.viewer.restfulobjects.tck.Util;
import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isMap;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
public class Get_whenQueryArg_xRoFollowLinks_ok {
@@ -154,7 +154,7 @@ public class Get_whenQueryArg_xRoFollowLinks_ok {
assertThat(actionRepr.getRepresentation("links[rel="+Rel.DETAILS.andParam("action", "newEntity")+"].value"), is(not(nullValue()))); // also followed
}
- private String givenHrefToService(final String serviceId) throws JsonParseException, JsonMappingException, IOException {
+ private String givenHrefToService(final String serviceId) throws IOException {
return Util.givenHrefToService(client, serviceId);
}
[07/13] isis git commit: ISIS-537: deleting unused panel CSS;
moving all CSS in PageAbstract instead into bootstrap-overrides.css.
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
index 1048597..60c8e2c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
@@ -18,363 +18,3 @@
*/
-/* from ActionPromptHeaderPanel */
-
-.entityIconAndTitlePanel img {
- width: 24px;
- height: 24px;
-}
-
-.entityIconAndTitlePanel span.actionName {
- font-size: 20px;
- font-weight: bolder;
-}
-
-
-/* from SimpleClipboardPanel */
-
-.simpleClipboardPanel form {
- margin: 20px;
- background-color: white;
-}
-
-.simpleClipboardPanel div.inner {
- margin: 20px;
- width:640px;
-}
-
-.simpleClipboardPanel div.inner p.scalarName {
- padding-top: 40px;
- padding-bottom: 10px;
-}
-
-.simpleClipboardPanel form input.textField {
- width:600px;
- margin-bottom: 60px;
-}
-
-.simpleClipboardPanel form input.ok {
- margin-bottom: 20px;
-}
-
-
-
-/* from CollectionContentsAsAjaxTablePanel.css */
-
-.collectionContentsAsAjaxTablePanel table.contents {
- font-size: 0.9em;
- width: 100%;
- border-collapse:collapse;
- margin-top:10px;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents caption { text-align: left; }
-.collectionContentsAsAjaxTablePanel table.contents tr {
-}
-
-
-.collectionContentsAsAjaxTablePanel table.contents tr td {
- padding-left: 4px;
- padding-right: 4px;
-}
-.collectionContentsAsAjaxTablePanel table.contents tr th,
-.collectionContentsAsAjaxTablePanel table.contents tr th a span {
- text-align: left;
- white-space: nowrap;
- font-weight: bold;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents tr th a {
- font-weight: normal;
-}
-.collectionContentsAsAjaxTablePanel table.contents #message {
- padding-left: 3px;
-}
-.collectionContentsAsAjaxTablePanel table.contents caption {
- padding-bottom: 2px;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents input:disabled {
- background-color: transparent;
- border: none;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents .javaMathBigDecimalPanel,
-.collectionContentsAsAjaxTablePanel table.contents .javaMathBigIntegerPanel,
-.collectionContentsAsAjaxTablePanel table.contents .bytePanel,
-.collectionContentsAsAjaxTablePanel table.contents .shortPanel,
-.collectionContentsAsAjaxTablePanel table.contents .integerPanel,
-.collectionContentsAsAjaxTablePanel table.contents .longPanel,
-.collectionContentsAsAjaxTablePanel table.contents .floatPanel,
-.collectionContentsAsAjaxTablePanel table.contents .doublePanel {
- text-align: right;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents tbody td,
-.collectionContentsAsAjaxTablePanel table.contents thead th {
- padding:5px;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents tr.navigation div.navigatorLabel {
- float: left;
-}
-
-
-.collectionContentsAsAjaxTablePanel table.contents tr.navigation div.navigator {
- float: right;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents img {
- width: 16px;
- height: 16px;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents tbody .togglebox-column {
- width: 2%;
-}
-.collectionContentsAsAjaxTablePanel table.contents tbody .title-column {
- text-align: center;
- width: 3%;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents a:hover {
- text-decoration:underline;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents .entityLinkSelect2Panel .entityImage {
- padding-right:6px;
-}
-
-.collectionContentsAsAjaxTablePanel table tfoot {
- margin-top:20px;
-}
-
-.collectionContentsAsAjaxTablePanel table tfoot tr td {
- padding:20px 4px 0;
- /*background-color:#FFFFFF !important;*/
-}
-
-.collectionContentsAsAjaxTablePanel .entityActions {
- margin-top: -1px;
- margin-bottom: -10px;
- float: left;
- padding:0 0;
-}
-
-/* bootstrap seems to set to 'pointer' */
-.collectionContentsAsAjaxTablePanel label:hover {
- /*cursor: default;*/
-}
-
-.collectionContentsAsAjaxTablePanel div input[type=text][disabled] {
- padding: 0;
-}
-
-.collectionContentsAsAjaxTablePanel table {
- border: none;
-}
-
-.collectionContentsAsAjaxTablePanel table tr td:first-child,
-.collectionContentsAsAjaxTablePanel table tr th:first-child {
- border-left: none;
-}
-
-.collectionContentsAsAjaxTablePanel table tr th:last-child,
-.collectionContentsAsAjaxTablePanel table tr td:last-child {
- border-right: none;
-}
-
-.collectionContentsAsAjaxTablePanel .table-responsive {
- overflow-x: auto;
- padding-bottom: 10px;
-}
-
-.collectionContentsAsAjaxTablePanel table tbody tr:last-child td {
- border-bottom: none;
-}
-
-.collectionContentsAsAjaxTablePanel table tfoot tr:first-child td {
- border-top: none;
- border-bottom: none;
-}
-
-.collectionContentsAsAjaxTablePanel .table {
- margin-bottom: 0px;
-}
-
-
-/* from CollectionContentsMultipleViewsPanel.css */
-/* AND ALSO duplicated in from EntityLinksSelectorPanel.css */
-
-.linksSelectorPanel .viewLinks {
- float:right;
- display:block;
-}
-
-.linksSelectorPanel ul.dropdown-menu {
- min-width: 0;
-}
-
-.linksSelectorPanel ul.dropdown-menu li.viewItem {
- min-width: 0;
-}
-
-.linksSelectorPanel ul.viewList li.viewItem:first-child span {
- border-radius:4px 0 0 4px;
- -moz-border-radius:4px 0 0 4px;
- -webkit-border-radius:4px 0 0 4px;
-}
-
-.linksSelectorPanel ul.viewList li.viewItem:last-child span {
- border-radius:0 4px 4px 0;
- -moz-border-radius:0 4px 4px 0;
- -webkit-border-radius:0 4px 4px 0;
-}
-
-
-.linksSelectorPanel .link-selector-panel-invisible {
- display:none;
-}
-
-.linksSelectorPanel .list-inline {
- margin-left: 0;
-}
-
-.linksSelectorPanel .list-inline li {
- padding-left: 0;
-}
-
-
-.collectionContentsLinksSelectorPanel select {
- margin-bottom: 1em;
-}
-
-
-/* from CollectionContentsAsSummary */
-
-.collectionContentsAsSummary .propertyNameCell,
-.collectionContentsAsSummary .aggregatesCell {
- vertical-align: middle;
-}
-
-.collectionContentsAsSummary .aggregateName {
- font-style: normal;
- text-align: left;
- font-weight: bold !important;
- font-size: 0.9em;
- padding-left: 20px;
- padding-right: 10px;
- vertical-align: middle;
-}
-
-.collectionContentsAsSummary .numberValue {
- text-align: right;
- width: 80px;
-}
-
-.collectionContentsAsSummary .chart {
- margin-left: 30px;
- display: inline-block;
- min-width: 720px;
-}
-
-a span.ViewLinkItem.summary {
- background-image:url("icon_summary_on.png");
- background-position: center center;
- background-repeat:no-repeat;
-}
-
-span.ViewLinkItem.summary {
- background-image:url("icon_summary_off.png");
- background-position: center center;
- background-repeat:no-repeat;
-}
-
-
-/* from EntityHeaderPanel.css */
-
-.entityHeaderPanel {
- clear:both;
- padding-top:10px;
- display:block;
-}
-
-div.entityHeaderPanel .iconAndTitle{
- float: left;
- padding:0;
- padding-bottom: 5px;
- width: 100%;
-}
-
-div.entityHeaderPanel .iconAndTitleLabel {
- float: left;
-}
-
-div.entityHeaderPanel .entityActions .cssMenuPanel .cssMenuItems:first-child {
- float: left;
- margin-top: 3px;
- margin-left: 20px;
-}
-
-.entityHeaderPanel .entityImage {
- width: 32px;
- height: 32px;
- vertical-align:text-bottom;
-}
-
-.entityHeaderPanel .entityTitle {
- font-size: 1.8em;
- font-weight:normal;
- text-decoration:none;
-}
-
-
-/* from BreadcrumbPanel.css */
-
-.breadcrumbPanel {
- display: inline-block;
- width: 300px;
-}
-
-
-/* from ContainedButtonPanel */
-
-span.containedButtonPanel {
- display: inline;
-}
-
-.containedButtonPanel form {
- display: inline;
-}
-
-
-/* from ZeroClipboardPanel */
-
-.zeroClipboardPanel .subscribingLink {
- display: none;
-}
-
-.zeroClipboardPanel a:hover {
- text-decoration: none;
-}
-
-.copyLink {
- visibility: hidden;
-}
-
-
-/* other */
-
-.mandatory.scalarName:after,
-.mandatory.collectionName:after {
- content: "*";
- font-weight:bold;
- color: #c2270d;
-}
-
-
-.navbar .powered-by {
- margin-right: 0px;
-}
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/e2f15a5d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index 77b9315..c441d4f 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -17,6 +17,10 @@
* under the License.
*/
+body {
+ padding-top: 60px;
+}
+
.table .form-control:disabled {
background-color: transparent;
border: none;
@@ -63,6 +67,374 @@
}
+
+/* from ActionPromptHeaderPanel */
+
+.entityIconAndTitlePanel img {
+ width: 24px;
+ height: 24px;
+}
+
+.entityIconAndTitlePanel span.actionName {
+ font-size: 20px;
+ font-weight: bolder;
+}
+
+
+/* from SimpleClipboardPanel */
+
+.simpleClipboardPanel form {
+ margin: 20px;
+ background-color: white;
+}
+
+.simpleClipboardPanel div.inner {
+ margin: 20px;
+ width:640px;
+}
+
+.simpleClipboardPanel div.inner p.scalarName {
+ padding-top: 40px;
+ padding-bottom: 10px;
+}
+
+.simpleClipboardPanel form input.textField {
+ width:600px;
+ margin-bottom: 60px;
+}
+
+.simpleClipboardPanel form input.ok {
+ margin-bottom: 20px;
+}
+
+
+
+/* from CollectionContentsAsAjaxTablePanel.css */
+
+.collectionContentsAsAjaxTablePanel table.contents {
+ font-size: 0.9em;
+ width: 100%;
+ border-collapse:collapse;
+ margin-top:10px;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents caption { text-align: left; }
+.collectionContentsAsAjaxTablePanel table.contents tr {
+}
+
+
+.collectionContentsAsAjaxTablePanel table.contents tr td {
+ padding-left: 4px;
+ padding-right: 4px;
+}
+.collectionContentsAsAjaxTablePanel table.contents tr th,
+.collectionContentsAsAjaxTablePanel table.contents tr th a span {
+ text-align: left;
+ white-space: nowrap;
+ font-weight: bold;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents tr th a {
+ font-weight: normal;
+}
+.collectionContentsAsAjaxTablePanel table.contents #message {
+ padding-left: 3px;
+}
+.collectionContentsAsAjaxTablePanel table.contents caption {
+ padding-bottom: 2px;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents input:disabled {
+ background-color: transparent;
+ border: none;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents .javaMathBigDecimalPanel,
+.collectionContentsAsAjaxTablePanel table.contents .javaMathBigIntegerPanel,
+.collectionContentsAsAjaxTablePanel table.contents .bytePanel,
+.collectionContentsAsAjaxTablePanel table.contents .shortPanel,
+.collectionContentsAsAjaxTablePanel table.contents .integerPanel,
+.collectionContentsAsAjaxTablePanel table.contents .longPanel,
+.collectionContentsAsAjaxTablePanel table.contents .floatPanel,
+.collectionContentsAsAjaxTablePanel table.contents .doublePanel {
+ text-align: right;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents tbody td,
+.collectionContentsAsAjaxTablePanel table.contents thead th {
+ padding:5px;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents tr.navigation div.navigatorLabel {
+ float: left;
+}
+
+
+.collectionContentsAsAjaxTablePanel table.contents tr.navigation div.navigator {
+ float: right;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents img {
+ width: 16px;
+ height: 16px;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents tbody .togglebox-column {
+ width: 2%;
+}
+.collectionContentsAsAjaxTablePanel table.contents tbody .title-column {
+ text-align: center;
+ width: 3%;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents a:hover {
+ text-decoration:underline;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents .entityLinkSelect2Panel .entityImage {
+ padding-right:6px;
+}
+
+.collectionContentsAsAjaxTablePanel table tfoot {
+ margin-top:20px;
+}
+
+.collectionContentsAsAjaxTablePanel table tfoot tr td {
+ padding:20px 4px 0;
+ /*background-color:#FFFFFF !important;*/
+}
+
+.collectionContentsAsAjaxTablePanel .entityActions {
+ margin-top: -1px;
+ margin-bottom: -10px;
+ float: left;
+ padding:0 0;
+}
+
+/* bootstrap seems to set to 'pointer' */
+.collectionContentsAsAjaxTablePanel label:hover {
+ /*cursor: default;*/
+}
+
+.collectionContentsAsAjaxTablePanel div input[type=text][disabled] {
+ padding: 0;
+}
+
+.collectionContentsAsAjaxTablePanel table {
+ border: none;
+}
+
+.collectionContentsAsAjaxTablePanel table tr td:first-child,
+.collectionContentsAsAjaxTablePanel table tr th:first-child {
+ border-left: none;
+}
+
+.collectionContentsAsAjaxTablePanel table tr th:last-child,
+.collectionContentsAsAjaxTablePanel table tr td:last-child {
+ border-right: none;
+}
+
+.collectionContentsAsAjaxTablePanel .table-responsive {
+ overflow-x: auto;
+ padding-bottom: 10px;
+}
+
+.collectionContentsAsAjaxTablePanel table tbody tr:last-child td {
+ border-bottom: none;
+}
+
+.collectionContentsAsAjaxTablePanel table tfoot tr:first-child td {
+ border-top: none;
+ border-bottom: none;
+}
+
+.collectionContentsAsAjaxTablePanel .table {
+ margin-bottom: 0px;
+}
+
+
+/* from CollectionContentsMultipleViewsPanel.css */
+/* AND ALSO duplicated in from EntityLinksSelectorPanel.css */
+
+.linksSelectorPanel .viewLinks {
+ float:right;
+ display:block;
+}
+
+.linksSelectorPanel ul.dropdown-menu {
+ min-width: 0;
+}
+
+.linksSelectorPanel ul.dropdown-menu li.viewItem {
+ min-width: 0;
+}
+
+.linksSelectorPanel ul.viewList li.viewItem:first-child span {
+ border-radius:4px 0 0 4px;
+ -moz-border-radius:4px 0 0 4px;
+ -webkit-border-radius:4px 0 0 4px;
+}
+
+.linksSelectorPanel ul.viewList li.viewItem:last-child span {
+ border-radius:0 4px 4px 0;
+ -moz-border-radius:0 4px 4px 0;
+ -webkit-border-radius:0 4px 4px 0;
+}
+
+
+.linksSelectorPanel .link-selector-panel-invisible {
+ display:none;
+}
+
+.linksSelectorPanel .list-inline {
+ margin-left: 0;
+}
+
+.linksSelectorPanel .list-inline li {
+ padding-left: 0;
+}
+
+
+.collectionContentsLinksSelectorPanel select {
+ margin-bottom: 1em;
+}
+
+
+/* from CollectionContentsAsSummary */
+
+.collectionContentsAsSummary .propertyNameCell,
+.collectionContentsAsSummary .aggregatesCell {
+ vertical-align: middle;
+}
+
+.collectionContentsAsSummary .aggregateName {
+ font-style: normal;
+ text-align: left;
+ font-weight: bold !important;
+ font-size: 0.9em;
+ padding-left: 20px;
+ padding-right: 10px;
+ vertical-align: middle;
+}
+
+.collectionContentsAsSummary .numberValue {
+ text-align: right;
+ width: 80px;
+}
+
+.collectionContentsAsSummary .chart {
+ margin-left: 30px;
+ display: inline-block;
+ min-width: 720px;
+}
+
+a span.ViewLinkItem.summary {
+ background-image:url("icon_summary_on.png");
+ background-position: center center;
+ background-repeat:no-repeat;
+}
+
+span.ViewLinkItem.summary {
+ background-image:url("icon_summary_off.png");
+ background-position: center center;
+ background-repeat:no-repeat;
+}
+
+
+/* from EntityHeaderPanel.css */
+
+.entityHeaderPanel {
+ clear:both;
+ padding-top:10px;
+ display:block;
+}
+
+div.entityHeaderPanel .iconAndTitle{
+ float: left;
+ padding:0;
+ padding-bottom: 5px;
+ width: 100%;
+}
+
+div.entityHeaderPanel .iconAndTitleLabel {
+ float: left;
+}
+
+div.entityHeaderPanel .entityActions .cssMenuPanel .cssMenuItems:first-child {
+ float: left;
+ margin-top: 3px;
+ margin-left: 20px;
+}
+
+.entityHeaderPanel .entityImage {
+ width: 32px;
+ height: 32px;
+ vertical-align:text-bottom;
+}
+
+.entityHeaderPanel .entityTitle {
+ font-size: 1.8em;
+ font-weight:normal;
+ text-decoration:none;
+}
+
+
+/* from BreadcrumbPanel.css */
+
+.breadcrumbPanel {
+ display: inline-block;
+ width: 300px;
+}
+
+
+/* from ContainedButtonPanel */
+
+span.containedButtonPanel {
+ display: inline;
+}
+
+.containedButtonPanel form {
+ display: inline;
+}
+
+
+/* from ZeroClipboardPanel */
+
+.zeroClipboardPanel .subscribingLink {
+ display: none;
+}
+
+.zeroClipboardPanel a:hover {
+ text-decoration: none;
+}
+
+.copyLink {
+ visibility: hidden;
+}
+
+
+/* other */
+
+.mandatory.scalarName:after,
+.mandatory.collectionName:after {
+ content: "*";
+ font-weight:bold;
+ color: #c2270d;
+}
+
+
+.navbar .powered-by {
+ margin-right: 0px;
+}
+
+
+
+
+
+
+/* from entityPropertiesPanel */
+
+
.entityPropertiesPanel .properties.panel-body {
padding-bottom: 5px;
}
@@ -119,9 +491,7 @@ div.additionalLinkList {
margin-bottom: 0px;
}
-body {
- padding-top: 60px;
-}
+
.nav > li > a {
padding-left: 10px;
@@ -241,6 +611,9 @@ div.label-left .choicesPlaceholder {
.standaloneCollectionPanel .selectorDropdown {
margin-top: -4px;
}
+.standaloneCollectionPanel div.iconAndTitle {
+ min-height: 45px;
+}
.referencePanel .entityLinkSelect2Panel .entityImage {
width: 20px;
[12/13] isis git commit: Merge remote-tracking branch
'martin-g/jackson-2.x-update'
Posted by da...@apache.org.
Merge remote-tracking branch 'martin-g/jackson-2.x-update'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d5201213
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d5201213
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d5201213
Branch: refs/heads/master
Commit: d5201213fdb29b4b29509774917b579b830352ac
Parents: e5a2ade 24320d8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Dec 1 23:36:09 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Dec 1 23:36:09 2014 +0000
----------------------------------------------------------------------
.../MethodPrefixBasedFacetFactoryAbstract.java | 2 -
.../exploration/ExplorationFacetAbstract.java | 1 -
.../ActionInteractionFacetAbstract.java | 2 +-
.../prototype/PrototypeFacetAbstract.java | 1 -
core/pom.xml | 10 +--
core/viewer-restfulobjects-applib/pom.xml | 8 +--
.../applib/JsonRepresentation.java | 74 ++++++++++----------
.../applib/LinkRepresentation.java | 14 ++--
.../applib/client/RepresentationWalker.java | 4 +-
.../applib/client/RestfulResponse.java | 4 +-
.../AbstractObjectMemberRepresentation.java | 2 +-
.../ActionResultRepresentation.java | 2 +-
.../DomainObjectMemberRepresentation.java | 2 +-
.../DomainObjectRepresentation.java | 2 +-
.../domainobjects/DomainRepresentation.java | 2 +-
.../domainobjects/ListRepresentation.java | 2 +-
.../ObjectActionRepresentation.java | 2 +-
.../ObjectCollectionRepresentation.java | 3 +-
.../ObjectPropertyRepresentation.java | 2 +-
.../ScalarValueRepresentation.java | 2 +-
.../AbstractTypeMemberRepresentation.java | 2 +-
.../ActionDescriptionRepresentation.java | 2 +-
...ctionParameterDescriptionRepresentation.java | 2 +-
.../CollectionDescriptionRepresentation.java | 2 +-
.../domaintypes/DomainTypeRepresentation.java | 2 +-
.../PropertyDescriptionRepresentation.java | 2 +-
.../TypeActionResultRepresentation.java | 2 +-
.../domaintypes/TypeListRepresentation.java | 2 +-
.../applib/errors/ErrorRepresentation.java | 2 +-
.../applib/homepage/HomePageRepresentation.java | 2 +-
.../applib/user/UserRepresentation.java | 2 +-
.../restfulobjects/applib/util/JsonMapper.java | 52 ++++++++++----
.../applib/util/JsonNodeUtils.java | 7 +-
.../applib/util/UrlEncodingUtils.java | 2 +-
.../applib/version/VersionRepresentation.java | 2 +-
.../restfulobjects/applib/JsonFixture.java | 6 +-
...entationTest_arrayGet_arraySetElementAt.java | 16 ++---
.../JsonRepresentationTest_arrayIterator.java | 15 ++--
.../JsonRepresentationTest_asInputStream.java | 4 +-
.../applib/JsonRepresentationTest_getArray.java | 12 ++--
.../JsonRepresentationTest_getBigDecimal.java | 39 +++++------
.../JsonRepresentationTest_getBigInteger.java | 24 +++----
.../JsonRepresentationTest_getBoolean.java | 14 ++--
.../JsonRepresentationTest_getDouble.java | 14 ++--
.../applib/JsonRepresentationTest_getInt.java | 23 +++---
.../JsonRepresentationTest_getLink_isLink.java | 16 ++---
.../applib/JsonRepresentationTest_getLong.java | 23 +++---
.../JsonRepresentationTest_getNull_isNull.java | 8 +--
...sonRepresentationTest_getRepresentation.java | 29 ++++----
...onRepresentationTest_getString_isString.java | 14 ++--
...epresentationTest_isArray_isMap_isValue.java | 17 ++---
.../applib/JsonRepresentationTest_mapHas.java | 13 ++--
.../JsonRepresentationTest_mapIterable.java | 15 ++--
.../JsonRepresentationTest_newObject.java | 11 ++-
.../applib/JsonRepresentationTest_putXxx.java | 10 +--
.../applib/JsonRepresentationTest_size.java | 12 ++--
...nObjectRepresentationTest_getCollection.java | 4 +-
...ObjectRepresentationTest_getCollections.java | 4 +-
...nObjectRepresentationTest_getProperties.java | 4 +-
...ainObjectRepresentationTest_getProperty.java | 4 +-
.../AbstractObjectMemberReprRenderer.java | 5 +-
.../domainobjects/ActionResultReprRenderer.java | 5 +-
.../domainobjects/JsonValueEncoder.java | 2 +-
.../domainobjects/ObjectActionReprRenderer.java | 4 +-
.../ObjectPropertyReprRenderer.java | 4 +-
.../domaintypes/DomainTypeReprRenderer.java | 5 +-
.../rendering/util/JsonWriterUtil.java | 6 --
.../restfulobjects/rendering/util/Util.java | 4 +-
.../JsonValueEncoderTest_asAdapter.java | 8 ++-
.../isis/viewer/restfulobjects/tck/Util.java | 18 +++--
...enDisabledMembers_thenRepresentation_ok.java | 4 +-
...ivenHasIcon_thenRepresentation_ok_TOFIX.java | 19 ++---
...ivenHiddenMembers_thenRepresentation_ok.java | 4 +-
...venViewModel_thenRepresentation_ok_TODO.java | 23 +++---
...henArgsValid_thenMultiplePropertyUpdate.java | 4 +-
...sPlus_thenStringPropertyUpdated_ok_TODO.java | 6 +-
..._whenArgValid_thenJdkPropertyUpdated_ok.java | 6 +-
...lid_thenJodaTimePropertyUpdated_ok_TODO.java | 12 ++--
...rgValid_thenPrimitivePropertyUpdated_ok.java | 6 +-
.../action/Get_whenDoesntExistOid_then_404.java | 16 +----
...dempotent_thenResponseCode_205_bad_TODO.java | 19 ++---
...empotent_thenResponseCode_205_bad_TOFIX.java | 19 ++---
.../Get_givenActionSemanticsOfSafe_ok.java | 10 +--
.../Get_givenDisabled_thenResponseCode_203.java | 18 ++---
...enMandatorySimpleArg_whenArgMissing_bad.java | 8 +--
...MandatorySimpleArg_whenArgNullValue_bad.java | 8 +--
...givenNoArgRequired_whenNoArgProvided_ok.java | 24 +++----
...t_givenOptionalArg_whenNoArgProvided_ok.java | 24 +++----
...rgIsHrefAndLinksToNonExistentEntity_bad.java | 4 +-
.../Get_givenRefArg_whenArgProvided_ok.java | 28 ++++----
...larArgInteger_whenArgMalformed_bad_TODO.java | 10 +--
...ivenScalarArgInteger_whenArgProvided_ok.java | 10 +--
...rg_whenArgMalformedMissingValueNode_bad.java | 17 ++---
.../Get_givenScalarArg_whenArgSurplus_bad.java | 19 ++---
...lidationRuleForAllArgs_whenArgFails_bad.java | 26 +++----
...dationRuleForSingleArg_whenArgFails_bad.java | 28 ++++----
...ype_andContentLength_andRespCode_200_ok.java | 24 +++----
...Null_thenRepr_andRespHeaders_and_200_ok.java | 19 ++---
...whenObject_isNull_thenRepresentation_ok.java | 17 ++---
...SemanticsOfIdempotent_then_205_bad_TODO.java | 19 ++---
...ctionSemanticsOfSafe_then_205_bad_TOFIX.java | 19 ++---
...anticsOfNotIdempotent_then_405_bad_TODO.java | 19 ++---
...ActionSemanticsOfSafe_then_405_bad_TODO.java | 19 ++---
..._whenDoesntExistId_thenResponseCode_404.java | 16 +----
.../Get_whenQueryArg_xRoFollowLinks_ok.java | 8 +--
.../Get_whenQueryArg_xRoFollowLinks_ok.java | 25 +++----
106 files changed, 522 insertions(+), 673 deletions(-)
----------------------------------------------------------------------
[06/13] isis git commit: ISIS-537: moved all CSS from components that
provide additional CSS into PageAbstract.css
Posted by da...@apache.org.
ISIS-537: moved all CSS from components that provide additional CSS into PageAbstract.css
The remaining subclasses of PanelAbstract that were overriding renderHead(...) to explicitly contribute its CSS no longer do so; and their CSS instead has been copied into PageAbstract.css.
Also:
- moved algorithm to locate CollectionSelectorProvider from component hierarchy into a Util class (similar to ActionPromptProvider)
- removed the (unused) TabbedPanelAbstract; this will need re-implementing anyway using bootstrap.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e5d59b0b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e5d59b0b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e5d59b0b
Branch: refs/heads/master
Commit: e5d59b0b64e7e3192344bf3db412e20169e53e60
Parents: 7a3e5a5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Dec 1 10:12:15 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Dec 1 10:12:15 2014 +0000
----------------------------------------------------------------------
.../actionprompt/ActionPromptHeaderPanel.css | 28 --
.../actionprompt/ActionPromptHeaderPanel.java | 8 -
.../selector/CollectionSelectorProvider.java | 23 ++
.../CollectionContentsAsAjaxTablePanel.css | 159 ---------
.../CollectionContentsAsAjaxTablePanel.java | 39 +--
.../CollectionContentsMultipleViewsPanel.css | 60 ----
.../CollectionContentsMultipleViewsPanel.java | 29 +-
.../summary/CollectionContentsAsSummary.css | 56 ----
.../summary/CollectionContentsAsSummary.java | 11 -
.../entity/header/EntityHeaderPanel.css | 52 ---
.../entity/header/EntityHeaderPanel.java | 10 -
.../selector/links/EntityLinksSelectorPanel.css | 55 ----
.../links/EntityLinksSelectorPanel.java | 9 -
.../widgets/breadcrumbs/BreadcrumbPanel.css | 24 --
.../widgets/breadcrumbs/BreadcrumbPanel.java | 23 +-
.../widgets/buttons/ContainedButtonPanel.css | 25 --
.../widgets/buttons/ContainedButtonPanel.java | 14 -
.../widgets/buttons/ToggleButtonsPanel.css | 18 --
.../widgets/buttons/ToggleButtonsPanel.java | 16 +-
.../checkbox/ContainedToggleboxPanel.css | 18 --
.../checkbox/ContainedToggleboxPanel.java | 31 +-
.../valuechoices/ValueChoicesSelect2Panel.css | 19 --
.../valuechoices/ValueChoicesSelect2Panel.java | 9 -
.../widgets/zclip/ZeroClipboardPanel.css | 30 --
.../widgets/zclip/ZeroClipboardPanel.java | 9 -
.../viewer/wicket/ui/pages/PageAbstract.css | 320 +++++++++++++++++++
.../viewer/wicket/ui/panels/PanelAbstract.java | 28 --
.../isis/viewer/wicket/ui/tabs/TabAbstract.css | 18 --
.../isis/viewer/wicket/ui/tabs/TabAbstract.html | 26 --
.../isis/viewer/wicket/ui/tabs/TabAbstract.java | 34 --
.../wicket/ui/tabs/TabbedPanelAbstract.css | 90 ------
.../wicket/ui/tabs/TabbedPanelAbstract.html | 28 --
.../wicket/ui/tabs/TabbedPanelAbstract.java | 46 ---
.../isis/viewer/wicket/ui/tabs/tabs-bg.gif | Bin 860 -> 0 bytes
.../isis/viewer/wicket/ui/tabs/tabs-left.gif | Bin 968 -> 0 bytes
.../isis/viewer/wicket/ui/tabs/tabs-left_on.gif | Bin 956 -> 0 bytes
.../isis/viewer/wicket/ui/tabs/tabs-right.gif | Bin 1546 -> 0 bytes
.../viewer/wicket/ui/tabs/tabs-right_on.gif | Bin 1475 -> 0 bytes
38 files changed, 357 insertions(+), 1008 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.css
deleted file mode 100644
index e9d9b56..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.css
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-.entityIconAndTitlePanel img {
- width: 24px;
- height: 24px;
-}
-
-.entityIconAndTitlePanel span.actionName {
- font-size: 20px;
- font-weight: bolder;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
index 31dfb11..4ba0171 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
@@ -1,6 +1,5 @@
package org.apache.isis.viewer.wicket.ui.components.actionprompt;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -8,7 +7,6 @@ import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
/**
* A panel used as a title for the action prompts
@@ -32,10 +30,4 @@ public class ActionPromptHeaderPanel extends PanelAbstract<ActionModel> {
}));
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- PanelUtil.renderHead(response, ActionPromptHeaderPanel.class);
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorProvider.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorProvider.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorProvider.java
index 08132ec..340cad2 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorProvider.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorProvider.java
@@ -18,6 +18,29 @@
*/
package org.apache.isis.viewer.wicket.ui.components.collection.selector;
+import org.apache.wicket.Component;
+
public interface CollectionSelectorProvider {
CollectionSelectorPanel getSelectorDropdownPanel();
+
+ public static class Util {
+
+ /**
+ * Searches up the component hierarchy looking for a parent that implements
+ * {@link org.apache.isis.viewer.wicket.ui.components.collection.selector.CollectionSelectorProvider}.
+ *
+ * @return the panel, or null (if there are no alternative views)
+ */
+ public static CollectionSelectorPanel getCollectionSelectorProvider(Component component) {
+ while(component != null) {
+ if(component instanceof CollectionSelectorProvider) {
+ final CollectionSelectorPanel selectorDropdownPanelIfAny = ((CollectionSelectorProvider) component).getSelectorDropdownPanel();
+ return selectorDropdownPanelIfAny;
+ }
+ component = component.getParent();
+ }
+ throw new IllegalStateException("Could not locate parent that implements CollectionSelectorProvider");
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
deleted file mode 100644
index 275b27c..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-.collectionContentsAsAjaxTablePanel table.contents {
- font-size: 0.9em;
- width: 100%;
- border-collapse:collapse;
- margin-top:10px;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents caption { text-align: left; }
-.collectionContentsAsAjaxTablePanel table.contents tr {
-}
-
-
-.collectionContentsAsAjaxTablePanel table.contents tr td {
- padding-left: 4px;
- padding-right: 4px;
-}
-.collectionContentsAsAjaxTablePanel table.contents tr th,
-.collectionContentsAsAjaxTablePanel table.contents tr th a span {
- text-align: left;
- white-space: nowrap;
- font-weight: bold;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents tr th a {
- font-weight: normal;
-}
-.collectionContentsAsAjaxTablePanel table.contents #message {
- padding-left: 3px;
-}
-.collectionContentsAsAjaxTablePanel table.contents caption {
- padding-bottom: 2px;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents input:disabled {
- background-color: transparent;
- border: none;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents .javaMathBigDecimalPanel,
-.collectionContentsAsAjaxTablePanel table.contents .javaMathBigIntegerPanel,
-.collectionContentsAsAjaxTablePanel table.contents .bytePanel,
-.collectionContentsAsAjaxTablePanel table.contents .shortPanel,
-.collectionContentsAsAjaxTablePanel table.contents .integerPanel,
-.collectionContentsAsAjaxTablePanel table.contents .longPanel,
-.collectionContentsAsAjaxTablePanel table.contents .floatPanel,
-.collectionContentsAsAjaxTablePanel table.contents .doublePanel {
- text-align: right;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents tbody td,
-.collectionContentsAsAjaxTablePanel table.contents thead th {
- padding:5px;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents tr.navigation div.navigatorLabel {
- float: left;
-}
-
-
-.collectionContentsAsAjaxTablePanel table.contents tr.navigation div.navigator {
- float: right;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents img {
- width: 16px;
- height: 16px;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents tbody .togglebox-column {
- width: 2%;
-}
-.collectionContentsAsAjaxTablePanel table.contents tbody .title-column {
- text-align: center;
- width: 3%;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents a:hover {
- text-decoration:underline;
-}
-
-.collectionContentsAsAjaxTablePanel table.contents .entityLinkSelect2Panel .entityImage {
- padding-right:6px;
-}
-
-.collectionContentsAsAjaxTablePanel table tfoot {
- margin-top:20px;
-}
-
-.collectionContentsAsAjaxTablePanel table tfoot tr td {
- padding:20px 4px 0;
- /*background-color:#FFFFFF !important;*/
-}
-
-.collectionContentsAsAjaxTablePanel .entityActions {
- margin-top: -1px;
- margin-bottom: -10px;
- float: left;
- padding:0 0;
-}
-
-/* bootstrap seems to set to 'pointer' */
-.collectionContentsAsAjaxTablePanel label:hover {
- /*cursor: default;*/
-}
-
-.collectionContentsAsAjaxTablePanel div input[type=text][disabled] {
- padding: 0;
-}
-
-.collectionContentsAsAjaxTablePanel table {
- border: none;
-}
-
-.collectionContentsAsAjaxTablePanel table tr td:first-child,
-.collectionContentsAsAjaxTablePanel table tr th:first-child {
- border-left: none;
-}
-
-.collectionContentsAsAjaxTablePanel table tr th:last-child,
-.collectionContentsAsAjaxTablePanel table tr td:last-child {
- border-right: none;
-}
-
-.collectionContentsAsAjaxTablePanel .table-responsive {
- overflow-x: auto;
- padding-bottom: 10px;
-}
-
-.collectionContentsAsAjaxTablePanel table tbody tr:last-child td {
- border-bottom: none;
-}
-
-.collectionContentsAsAjaxTablePanel table tfoot tr:first-child td {
- border-top: none;
- border-bottom: none;
-}
-
-.collectionContentsAsAjaxTablePanel .table {
- margin-bottom: 0px;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index 44669cd..b4a3b02 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -27,7 +27,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.model.Model;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.filter.Filter;
@@ -52,13 +51,12 @@ import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterTitleColumn;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterToggleboxColumn;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
/**
* {@link PanelAbstract Panel} that represents a {@link EntityCollectionModel
* collection of entity}s rendered using {@link AjaxFallbackDefaultDataTable}.
*/
-public class CollectionContentsAsAjaxTablePanel extends PanelAbstract<EntityCollectionModel> implements CollectionCountProvider /*, ActionPromptProvider, BulkActionsProvider */, UiHintPathSignificant {
+public class CollectionContentsAsAjaxTablePanel extends PanelAbstract<EntityCollectionModel> implements CollectionCountProvider , UiHintPathSignificant {
private static final long serialVersionUID = 1L;
@@ -210,35 +208,7 @@ public class CollectionContentsAsAjaxTablePanel extends PanelAbstract<EntityColl
}
- //region > BulkActionsProvider
-
- //endregion
-
-
-// //region > ActionPromptModalWindowProvider
-//
-// private ActionPromptModalWindow actionPromptModalWindow;
-// public ActionPromptModalWindow getActionPrompt() {
-// return ActionPromptModalWindow.getActionPromptModalWindowIfEnabled(actionPromptModalWindow);
-// }
-//
-// private void addActionPromptModalWindow() {
-// this.actionPromptModalWindow = ActionPromptModalWindow.newModalWindow(ID_ACTION_PROMPT_MODAL_WINDOW);
-// addOrReplace(actionPromptModalWindow);
-// }
-//
-// //endregion
-
- // //////////////////////////////////////
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- PanelUtil.renderHead(response, getClass());
- }
-
- // //////////////////////////////////////
+ //region > dependencies
@Inject
private WicketViewerSettings settings;
@@ -250,9 +220,6 @@ public class CollectionContentsAsAjaxTablePanel extends PanelAbstract<EntityColl
return getAuthenticationSession().getMessageBroker();
}
- // //////////////////////////////////////
-
-
-
+ //endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.css
deleted file mode 100644
index 8c3902e..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.css
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.linksSelectorPanel .viewLinks {
- float:right;
- display:block;
-}
-
-.linksSelectorPanel ul.dropdown-menu {
- min-width: 0;
-}
-
-.linksSelectorPanel ul.dropdown-menu li.viewItem {
- min-width: 0;
-}
-
-.linksSelectorPanel ul.viewList li.viewItem:first-child span {
- border-radius:4px 0 0 4px;
- -moz-border-radius:4px 0 0 4px;
- -webkit-border-radius:4px 0 0 4px;
-}
-
-.linksSelectorPanel ul.viewList li.viewItem:last-child span {
- border-radius:0 4px 4px 0;
- -moz-border-radius:0 4px 4px 0;
- -webkit-border-radius:0 4px 4px 0;
-}
-
-
-.linksSelectorPanel .link-selector-panel-invisible {
- display:none;
-}
-
-.linksSelectorPanel .list-inline {
- margin-left: 0;
-}
-
-.linksSelectorPanel .list-inline li {
- padding-left: 0;
-}
-
-
-.collectionContentsLinksSelectorPanel select {
- margin-bottom: 1em;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
index a6d5d9a..8c3a1e6 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
@@ -24,7 +24,6 @@ import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.event.IEvent;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.isis.viewer.wicket.model.hints.IsisEnvelopeEvent;
import org.apache.isis.viewer.wicket.model.hints.IsisUiHintEvent;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
@@ -37,7 +36,6 @@ import org.apache.isis.viewer.wicket.ui.components.collection.selector.Collectio
import org.apache.isis.viewer.wicket.ui.components.collection.selector.CollectionSelectorPanel;
import org.apache.isis.viewer.wicket.ui.components.collection.selector.CollectionSelectorProvider;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.CssClassRemover;
@@ -91,7 +89,7 @@ public class CollectionContentsMultipleViewsPanel
private void addUnderlyingViews() {
final EntityCollectionModel model = getModel();
- final CollectionSelectorPanel selectorDropdownPanelIfAny = getSelectorDropdownPanel();
+ final CollectionSelectorPanel selectorDropdownPanelIfAny = CollectionSelectorProvider.Util.getCollectionSelectorProvider(this);
final int selected = selectorDropdownPanelIfAny != null
? selectorHelper.honourViewHintElseDefault(selectorDropdownPanelIfAny)
: 0;
@@ -141,7 +139,7 @@ public class CollectionContentsMultipleViewsPanel
final UiHintContainer uiHintContainer = uiHintEvent.getUiHintContainer();
int underlyingViewNum = 0;
- final CollectionSelectorPanel selectorDropdownPanel = this.getSelectorDropdownPanel();
+ final CollectionSelectorPanel selectorDropdownPanel = CollectionSelectorProvider.Util.getCollectionSelectorProvider(this);
if(selectorDropdownPanel == null) {
// not expected, because this event shouldn't be called.
// but no harm in simply returning...
@@ -194,12 +192,6 @@ public class CollectionContentsMultipleViewsPanel
component.add(modifier);
}
- @Override
- public void renderHead(final IHeaderResponse response) {
- super.renderHead(response);
- PanelUtil.renderHead(response, CollectionContentsMultipleViewsPanel.class);
- }
-
@Override
@@ -212,22 +204,5 @@ public class CollectionContentsMultipleViewsPanel
}
}
- /**
- * Searches up the component hierarchy looking for a parent that implements
- * {@link org.apache.isis.viewer.wicket.ui.components.collection.selector.CollectionSelectorProvider}.
- *
- * @return the panel, or null (if there are no alternative views)
- */
- private CollectionSelectorPanel getSelectorDropdownPanel() {
- Component component = this;
- while(component != null) {
- if(component instanceof CollectionSelectorProvider) {
- final CollectionSelectorPanel selectorDropdownPanelIfAny = ((CollectionSelectorProvider) component).getSelectorDropdownPanel();
- return selectorDropdownPanelIfAny;
- }
- component = component.getParent();
- }
- throw new IllegalStateException("Could not locate parent that implements HasSelectorDropdownPanel");
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.css
deleted file mode 100644
index 4d010a3..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.css
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-.collectionContentsAsSummary .propertyNameCell,
-.collectionContentsAsSummary .aggregatesCell {
- vertical-align: middle;
-}
-
-.collectionContentsAsSummary .aggregateName {
- font-style: normal;
- text-align: left;
- font-weight: bold !important;
- font-size: 0.9em;
- padding-left: 20px;
- padding-right: 10px;
- vertical-align: middle;
-}
-
-.collectionContentsAsSummary .numberValue {
- text-align: right;
- width: 80px;
-}
-
-.collectionContentsAsSummary .chart {
- margin-left: 30px;
- display: inline-block;
- min-width: 720px;
-}
-
-a span.ViewLinkItem.summary {
- background-image:url("icon_summary_on.png");
- background-position: center center;
- background-repeat:no-repeat;
-}
-
-span.ViewLinkItem.summary {
- background-image:url("icon_summary_off.png");
- background-position: center center;
- background-repeat:no-repeat;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
index 32809e5..49be8db 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
@@ -25,17 +25,13 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Collections;
import java.util.List;
-
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
-
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.list.AbstractItem;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.Model;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectAdapterUtils;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -44,7 +40,6 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.ui.components.collection.count.CollectionCountProvider;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
/**
* {@link PanelAbstract Panel} that represents a {@link EntityCollectionModel
@@ -206,10 +201,4 @@ public class CollectionContentsAsSummary extends PanelAbstract<EntityCollectionM
return model.getCount();
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- PanelUtil.renderHead(response, CollectionContentsAsSummary.class);
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
deleted file mode 100644
index 76b9496..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.entityHeaderPanel {
- clear:both;
- padding-top:10px;
- display:block;
-}
-
-div.entityHeaderPanel .iconAndTitle{
- float: left;
- padding:0;
- padding-bottom: 5px;
- width: 100%;
-}
-
-div.entityHeaderPanel .iconAndTitleLabel {
- float: left;
-}
-
-div.entityHeaderPanel .entityActions .cssMenuPanel .cssMenuItems:first-child {
- float: left;
- margin-top: 3px;
- margin-left: 20px;
-}
-
-.entityHeaderPanel .entityImage {
- width: 32px;
- height: 32px;
- vertical-align:text-bottom;
-}
-
-.entityHeaderPanel .entityTitle {
- font-size: 1.8em;
- font-weight:normal;
- text-decoration:none;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
index 6edd1af..ec86034 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
@@ -21,7 +21,6 @@ package org.apache.isis.viewer.wicket.ui.components.entity.header;
import java.util.List;
import org.apache.wicket.Component;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.runtime.system.DeploymentType;
@@ -35,7 +34,6 @@ import org.apache.isis.viewer.wicket.ui.components.additionallinks.AdditionalLin
import org.apache.isis.viewer.wicket.ui.components.additionallinks.EntityActionUtil;
import org.apache.isis.viewer.wicket.ui.components.entity.EntityActionLinkFactory;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
/**
* {@link PanelAbstract Panel} representing the summary details (title, icon and
@@ -95,14 +93,6 @@ public class EntityHeaderPanel extends PanelAbstract<EntityModel> {
}
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- PanelUtil.renderHead(response, getClass());
- }
-
-
// ///////////////////////////////////////////////
// Dependency Injection
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.css
deleted file mode 100644
index 6f7be55..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.css
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.linksSelectorPanel .viewLinks {
- float:right;
- display:block;
-}
-
-.linksSelectorPanel ul.dropdown-menu {
- min-width: 0;
-}
-
-.linksSelectorPanel ul.dropdown-menu li.viewItem {
- min-width: 0;
-}
-
-.linksSelectorPanel ul.viewList li.viewItem:first-child span {
- border-radius:4px 0 0 4px;
- -moz-border-radius:4px 0 0 4px;
- -webkit-border-radius:4px 0 0 4px;
-}
-
-.linksSelectorPanel ul.viewList li.viewItem:last-child span {
- border-radius:0 4px 4px 0;
- -moz-border-radius:0 4px 4px 0;
- -webkit-border-radius:0 4px 4px 0;
-}
-
-
-.linksSelectorPanel .link-selector-panel-invisible {
- display:none;
-}
-
-.linksSelectorPanel .list-inline {
- margin-left: 0;
-}
-
-.linksSelectorPanel .list-inline li {
- padding-left: 0;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java
index e8f7da9..ed4389a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/selector/links/EntityLinksSelectorPanel.java
@@ -33,7 +33,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.AbstractLink;
@@ -53,7 +52,6 @@ import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.components.additionallinks.AdditionalLinksPanel;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.CssClassRemover;
@@ -385,12 +383,5 @@ public class EntityLinksSelectorPanel extends PanelAbstract<EntityModel> impleme
}
- @Override
- public void renderHead(final IHeaderResponse response) {
- super.renderHead(response);
- PanelUtil.renderHead(response, EntityLinksSelectorPanel.class);
- }
-
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.css
deleted file mode 100644
index 40177b9..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-.breadcrumbPanel {
- display: inline-block;
- width: 300px;
-}
-
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index 9efe491..76badf0 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -17,28 +17,21 @@
package org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs;
import java.util.Collection;
-
import com.vaynberg.wicket.select2.Response;
import com.vaynberg.wicket.select2.Select2Choice;
import com.vaynberg.wicket.select2.Settings;
import com.vaynberg.wicket.select2.TextChoiceProvider;
-
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.commons.authentication.MessageBroker;
+import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.errors.JGrowlUtil;
-import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
-import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
@@ -118,19 +111,5 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
addOrReplace(breadcrumbChoice);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- PanelUtil.renderHead(response, BreadcrumbPanel.class);
- }
-
- // //////////////////////////////////////
-
- protected PageClassRegistry getPageClassRegistry() {
- final PageClassRegistryAccessor pcra = (PageClassRegistryAccessor) getApplication();
- return pcra.getPageClassRegistry();
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.css
deleted file mode 100644
index 5e063e6..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-span.containedButtonPanel {
- display: inline;
-}
-
-.containedButtonPanel form {
- display: inline;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java
index 8da696c..5319a87 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButtonPanel.java
@@ -20,21 +20,15 @@
package org.apache.isis.viewer.wicket.ui.components.widgets.buttons;
import java.util.List;
-
import com.google.common.collect.Lists;
-
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.Model;
-
-import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
/**
* A button contained within its own form.
@@ -94,13 +88,5 @@ public class ContainedButtonPanel extends PanelAbstract<Model<String>> {
public void onSubmit() {
}
- /**
- * Because there is no {@link ComponentFactory} for this component,
- * its CSS must be contributed in this way instead (also meaning its CSS is not bundled).
- */
- @Override
- public void renderHead(final IHeaderResponse response) {
- PanelUtil.renderHead(response, this.getClass());
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java
index 07fb296..8faff9a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java
@@ -20,14 +20,9 @@
package org.apache.isis.viewer.wicket.ui.components.widgets.buttons;
import java.io.Serializable;
-
import org.apache.wicket.Component;
-import org.apache.wicket.markup.head.IHeaderResponse;
-
import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
/**
* Abstraction of show/hide, ie two buttons only one of which is visible.
@@ -148,15 +143,6 @@ public class ToggleButtonsPanel extends PanelAbstract<EntityModel> {
component2.setVisible(flag);
}
}
-
- /**
- * Because there is no {@link ComponentFactory} for this component,
- * its CSS must be contributed in this way instead (also meaning its CSS is not bundled).
- */
- @Override
- public void renderHead(final IHeaderResponse response) {
- PanelUtil.renderHead(response, this.getClass());
- }
-
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
index a265255..af2ea6c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
@@ -19,21 +19,12 @@
package org.apache.isis.viewer.wicket.ui.components.widgets.checkbox;
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.Model;
-
-import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
/**
* A button contained within its own form.
@@ -47,7 +38,7 @@ public class ContainedToggleboxPanel extends PanelAbstract<Model<Boolean>> {
private static final String ID_TOGGLEBOX = "togglebox";
private final AjaxCheckBox checkbox;
- private final List<Component> componentsToRerender = Lists.newArrayList();
+// private final List<Component> componentsToRerender = Lists.newArrayList();
public ContainedToggleboxPanel(final String id) {
super(id);
@@ -68,11 +59,12 @@ public class ContainedToggleboxPanel extends PanelAbstract<Model<Boolean>> {
form.add(checkbox);
}
- public void addComponentToRerender(final Component component) {
- component.setOutputMarkupPlaceholderTag(true);
- componentsToRerender.add(component);
- }
-
+
+// public void addComponentToRerender(final Component component) {
+// component.setOutputMarkupPlaceholderTag(true);
+// componentsToRerender.add(component);
+// }
+
/**
* Hook method for (typically anonymous) subclasses to override.
*/
@@ -88,13 +80,4 @@ public class ContainedToggleboxPanel extends PanelAbstract<Model<Boolean>> {
onSubmit(target);
}
- /**
- * Because there is no {@link ComponentFactory} for this component,
- * its CSS must be contributed in this way instead (also meaning its CSS is not bundled).
- */
- @Override
- public void renderHead(final IHeaderResponse response) {
- PanelUtil.renderHead(response, this.getClass());
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.css
deleted file mode 100644
index 9f1612a..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index 346a40f..2f6b442 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@ -28,7 +28,6 @@ import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -43,7 +42,6 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.components.widgets.ObjectAdapterMementoProviderAbstract;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.Select2ChoiceUtil;
-import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements ScalarModelWithPending {
@@ -227,13 +225,6 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
select2Field.add(behavior);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- PanelUtil.renderHead(response, ValueChoicesSelect2Panel.class);
- }
-
// //////////////////////////////////////
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css
deleted file mode 100644
index 5a90393..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.css
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-.zeroClipboardPanel .subscribingLink {
- display: none;
-}
-
-.zeroClipboardPanel a:hover {
- text-decoration: none;
-}
-
-.copyLink {
- visibility: hidden;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
index df94b11..15bd4b4 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
@@ -22,7 +22,6 @@ import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.event.IEvent;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -38,7 +37,6 @@ import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
import org.apache.isis.viewer.wicket.ui.util.Links;
public class ZeroClipboardPanel extends PanelAbstract<EntityModel> {
@@ -74,13 +72,6 @@ public class ZeroClipboardPanel extends PanelAbstract<EntityModel> {
setVisible(renderingHint == EntityModel.RenderingHint.REGULAR && mode == EntityModel.Mode.VIEW);
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- PanelUtil.renderHead(response, ZeroClipboardPanel.class);
- }
-
private AjaxLink<ObjectAdapter> createLink(String linkId) {
return newSimpleClipboardLink(linkId);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
index 601ad57..1048597 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
@@ -18,6 +18,21 @@
*/
+/* from ActionPromptHeaderPanel */
+
+.entityIconAndTitlePanel img {
+ width: 24px;
+ height: 24px;
+}
+
+.entityIconAndTitlePanel span.actionName {
+ font-size: 20px;
+ font-weight: bolder;
+}
+
+
+/* from SimpleClipboardPanel */
+
.simpleClipboardPanel form {
margin: 20px;
background-color: white;
@@ -44,6 +59,311 @@
+/* from CollectionContentsAsAjaxTablePanel.css */
+
+.collectionContentsAsAjaxTablePanel table.contents {
+ font-size: 0.9em;
+ width: 100%;
+ border-collapse:collapse;
+ margin-top:10px;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents caption { text-align: left; }
+.collectionContentsAsAjaxTablePanel table.contents tr {
+}
+
+
+.collectionContentsAsAjaxTablePanel table.contents tr td {
+ padding-left: 4px;
+ padding-right: 4px;
+}
+.collectionContentsAsAjaxTablePanel table.contents tr th,
+.collectionContentsAsAjaxTablePanel table.contents tr th a span {
+ text-align: left;
+ white-space: nowrap;
+ font-weight: bold;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents tr th a {
+ font-weight: normal;
+}
+.collectionContentsAsAjaxTablePanel table.contents #message {
+ padding-left: 3px;
+}
+.collectionContentsAsAjaxTablePanel table.contents caption {
+ padding-bottom: 2px;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents input:disabled {
+ background-color: transparent;
+ border: none;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents .javaMathBigDecimalPanel,
+.collectionContentsAsAjaxTablePanel table.contents .javaMathBigIntegerPanel,
+.collectionContentsAsAjaxTablePanel table.contents .bytePanel,
+.collectionContentsAsAjaxTablePanel table.contents .shortPanel,
+.collectionContentsAsAjaxTablePanel table.contents .integerPanel,
+.collectionContentsAsAjaxTablePanel table.contents .longPanel,
+.collectionContentsAsAjaxTablePanel table.contents .floatPanel,
+.collectionContentsAsAjaxTablePanel table.contents .doublePanel {
+ text-align: right;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents tbody td,
+.collectionContentsAsAjaxTablePanel table.contents thead th {
+ padding:5px;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents tr.navigation div.navigatorLabel {
+ float: left;
+}
+
+
+.collectionContentsAsAjaxTablePanel table.contents tr.navigation div.navigator {
+ float: right;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents img {
+ width: 16px;
+ height: 16px;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents tbody .togglebox-column {
+ width: 2%;
+}
+.collectionContentsAsAjaxTablePanel table.contents tbody .title-column {
+ text-align: center;
+ width: 3%;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents a:hover {
+ text-decoration:underline;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents .entityLinkSelect2Panel .entityImage {
+ padding-right:6px;
+}
+
+.collectionContentsAsAjaxTablePanel table tfoot {
+ margin-top:20px;
+}
+
+.collectionContentsAsAjaxTablePanel table tfoot tr td {
+ padding:20px 4px 0;
+ /*background-color:#FFFFFF !important;*/
+}
+
+.collectionContentsAsAjaxTablePanel .entityActions {
+ margin-top: -1px;
+ margin-bottom: -10px;
+ float: left;
+ padding:0 0;
+}
+
+/* bootstrap seems to set to 'pointer' */
+.collectionContentsAsAjaxTablePanel label:hover {
+ /*cursor: default;*/
+}
+
+.collectionContentsAsAjaxTablePanel div input[type=text][disabled] {
+ padding: 0;
+}
+
+.collectionContentsAsAjaxTablePanel table {
+ border: none;
+}
+
+.collectionContentsAsAjaxTablePanel table tr td:first-child,
+.collectionContentsAsAjaxTablePanel table tr th:first-child {
+ border-left: none;
+}
+
+.collectionContentsAsAjaxTablePanel table tr th:last-child,
+.collectionContentsAsAjaxTablePanel table tr td:last-child {
+ border-right: none;
+}
+
+.collectionContentsAsAjaxTablePanel .table-responsive {
+ overflow-x: auto;
+ padding-bottom: 10px;
+}
+
+.collectionContentsAsAjaxTablePanel table tbody tr:last-child td {
+ border-bottom: none;
+}
+
+.collectionContentsAsAjaxTablePanel table tfoot tr:first-child td {
+ border-top: none;
+ border-bottom: none;
+}
+
+.collectionContentsAsAjaxTablePanel .table {
+ margin-bottom: 0px;
+}
+
+
+/* from CollectionContentsMultipleViewsPanel.css */
+/* AND ALSO duplicated in from EntityLinksSelectorPanel.css */
+
+.linksSelectorPanel .viewLinks {
+ float:right;
+ display:block;
+}
+
+.linksSelectorPanel ul.dropdown-menu {
+ min-width: 0;
+}
+
+.linksSelectorPanel ul.dropdown-menu li.viewItem {
+ min-width: 0;
+}
+
+.linksSelectorPanel ul.viewList li.viewItem:first-child span {
+ border-radius:4px 0 0 4px;
+ -moz-border-radius:4px 0 0 4px;
+ -webkit-border-radius:4px 0 0 4px;
+}
+
+.linksSelectorPanel ul.viewList li.viewItem:last-child span {
+ border-radius:0 4px 4px 0;
+ -moz-border-radius:0 4px 4px 0;
+ -webkit-border-radius:0 4px 4px 0;
+}
+
+
+.linksSelectorPanel .link-selector-panel-invisible {
+ display:none;
+}
+
+.linksSelectorPanel .list-inline {
+ margin-left: 0;
+}
+
+.linksSelectorPanel .list-inline li {
+ padding-left: 0;
+}
+
+
+.collectionContentsLinksSelectorPanel select {
+ margin-bottom: 1em;
+}
+
+
+/* from CollectionContentsAsSummary */
+
+.collectionContentsAsSummary .propertyNameCell,
+.collectionContentsAsSummary .aggregatesCell {
+ vertical-align: middle;
+}
+
+.collectionContentsAsSummary .aggregateName {
+ font-style: normal;
+ text-align: left;
+ font-weight: bold !important;
+ font-size: 0.9em;
+ padding-left: 20px;
+ padding-right: 10px;
+ vertical-align: middle;
+}
+
+.collectionContentsAsSummary .numberValue {
+ text-align: right;
+ width: 80px;
+}
+
+.collectionContentsAsSummary .chart {
+ margin-left: 30px;
+ display: inline-block;
+ min-width: 720px;
+}
+
+a span.ViewLinkItem.summary {
+ background-image:url("icon_summary_on.png");
+ background-position: center center;
+ background-repeat:no-repeat;
+}
+
+span.ViewLinkItem.summary {
+ background-image:url("icon_summary_off.png");
+ background-position: center center;
+ background-repeat:no-repeat;
+}
+
+
+/* from EntityHeaderPanel.css */
+
+.entityHeaderPanel {
+ clear:both;
+ padding-top:10px;
+ display:block;
+}
+
+div.entityHeaderPanel .iconAndTitle{
+ float: left;
+ padding:0;
+ padding-bottom: 5px;
+ width: 100%;
+}
+
+div.entityHeaderPanel .iconAndTitleLabel {
+ float: left;
+}
+
+div.entityHeaderPanel .entityActions .cssMenuPanel .cssMenuItems:first-child {
+ float: left;
+ margin-top: 3px;
+ margin-left: 20px;
+}
+
+.entityHeaderPanel .entityImage {
+ width: 32px;
+ height: 32px;
+ vertical-align:text-bottom;
+}
+
+.entityHeaderPanel .entityTitle {
+ font-size: 1.8em;
+ font-weight:normal;
+ text-decoration:none;
+}
+
+
+/* from BreadcrumbPanel.css */
+
+.breadcrumbPanel {
+ display: inline-block;
+ width: 300px;
+}
+
+
+/* from ContainedButtonPanel */
+
+span.containedButtonPanel {
+ display: inline;
+}
+
+.containedButtonPanel form {
+ display: inline;
+}
+
+
+/* from ZeroClipboardPanel */
+
+.zeroClipboardPanel .subscribingLink {
+ display: none;
+}
+
+.zeroClipboardPanel a:hover {
+ text-decoration: none;
+}
+
+.copyLink {
+ visibility: hidden;
+}
+
+
+/* other */
.mandatory.scalarName:after,
.mandatory.collectionName:after {
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index fb05b1e..bf713e5 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -21,11 +21,9 @@ package org.apache.isis.viewer.wicket.ui.panels;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
@@ -34,7 +32,6 @@ import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.isis.PersistenceSessionProvider;
-import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
@@ -103,32 +100,7 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel implement
Components.permanentlyHide(this, ids);
}
- // ///////////////////////////////////////////////////////////////////
- // Header Contributors
- // ///////////////////////////////////////////////////////////////////
-
- /**
- * Renders the corresponding CSS for this panel.
- *
- * <p>
- * For most subclasses of {@link PanelAbstract} - specifically those that have their own {@link ComponentFactory},
- * it is additionally the responsibility (via {@link ComponentFactory#getCssResourceReference()}) of the factory
- * to declare the {@link CssResourceReference}(s) to be included. These are then all bundled up into
- * a single unit, as part of the application bootstrapping (<tt>IsisWicketApplication#init</tt>).
- *
- * <p>
- * This is done because some browsers (we're looking at you, IE!) have a limit of only 31 CSS files.
- *
- * <p>
- * For subclasses that do not have a {@link ComponentFactory}, their CSS will simply be referenced standalone.
- */
- @Override
- public void renderHead(final IHeaderResponse response) {
- // TODO: mgrigorov remove this stuff once happy no longer needed at all, plus any CSS of panels that used to rely on this.
-// PanelUtil.renderHead(response, this.getClass());
- }
-
// ///////////////////////////////////////////////////////////////////
// Hint support
// ///////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.css
deleted file mode 100644
index eaeea17..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.html
deleted file mode 100644
index 2b43039..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
- <wicket:panel>
- <div class="tab panel panel-default">
- <wicket:child/>
- </div>
- </wicket:panel>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.java
deleted file mode 100644
index 0cda987..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.viewer.wicket.ui.tabs;
-
-import org.apache.wicket.model.IModel;
-
-import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-
-public class TabAbstract<T extends IModel<?>> extends PanelAbstract<T> {
-
- private static final long serialVersionUID = 1L;
-
- public TabAbstract(final String id, final T model) {
- super(id, model);
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.css
deleted file mode 100644
index 45b1a24..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.css
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
-Tabbed Panels should be implemented by subclassing TabbedPanel or its subclass, AjaxTabbedPanel
-(both in org.apache.wicket.extensions.markup.html.tabs).
-
-The HTML for TabbedPanel (as of 1.4.9) is as follows:
-
-<div wicket:id="tabs-container" class="tab-row">
-<ul>
- <li wicket:id="tabs">
- <a href="#" wicket:id="link"><span wicket:id="title">[[tab title]]</span></a>
- </li>
-</ul>
-</div>
-<div wicket:id="panel" class="tab-panel">[panel]</div>
-
-As can be seen, it defines the following CSS styles:
-
-1) tab-row : renders a bulleted list of tab titles
-2) tab-panel : a panel representing the content of the currently selected tab
-
-The CSS below reflects these style names. All are scoped under 'tabbedPanel', defined by Wicket Objects.
-*/
-
-
-div.tabbedPanel div.tab-row {
- float:left;
- width:100%;
- line-height:normal;
-}
-
-div.tabbedPanel div.tab-row ul {
- margin:0;
- padding:10px 10px 0;
- list-style:none;e
-}
-
-div.tabbedPanel div.tab-row li {
- float:left;
- /*background:url("tabs-left.gif") no-repeat left top;*/
- margin:0;
- padding:0 0 0 9px;
-}
-
-div.tabbedPanel div.tab-row a {
- display:block;
- padding:5px 15px 4px 6px;
- text-decoration:none;
- font-weight:bold;
- white-space:nowrap;
-}
-
-div.tab-panel {
- clear: left;
-}
-
-div.tabbedPanel div.tab-row a:hover {
- color:#00477F;
-}
-
-div.tabbedPanel div.tab-row a {
- color:#407098;
- background-color: #D7E7F5;
- padding-bottom:5px;
-}
-
-
-div.tabbedPanel div.tab-row li.selected a {
- color:#00477F;
- background-color: #EEEEEE;
- padding-bottom:5px;
- }
-
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.html
deleted file mode 100644
index 9807dd8..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<html>
- <body>
- <wicket:panel>
- <div class="tabbedPanel">
- <wicket:child/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.java
deleted file mode 100644
index cc97a68..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.viewer.wicket.ui.tabs;
-
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.model.IModel;
-
-import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
-
-/**
- * Adapter class for tabbed panels; does very little in itself, but does ensure
- * that the CSS needed is rendered.
- */
-public abstract class TabbedPanelAbstract<T extends IModel<?>> extends PanelAbstract<T> {
-
- private static final long serialVersionUID = 1L;
-
- public TabbedPanelAbstract(final String id, final T model) {
- super(id, model);
- }
-
- @Override
- public void renderHead(final IHeaderResponse response) {
- super.renderHead(response);
- PanelUtil.renderHead(response, TabbedPanelAbstract.class);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-bg.gif
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-bg.gif b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-bg.gif
deleted file mode 100644
index 3ae5c60..0000000
Binary files a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-left.gif
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-left.gif b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-left.gif
deleted file mode 100644
index 473505a..0000000
Binary files a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-left.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-left_on.gif
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-left_on.gif b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-left_on.gif
deleted file mode 100644
index 58d8425..0000000
Binary files a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-left_on.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-right.gif
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-right.gif b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-right.gif
deleted file mode 100644
index e97e0e9..0000000
Binary files a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-right.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/e5d59b0b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-right_on.gif
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-right_on.gif b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-right_on.gif
deleted file mode 100644
index 9b02b58..0000000
Binary files a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/tabs-right_on.gif and /dev/null differ
[13/13] isis git commit: ISIS-537: tiny fix, adding final modifier,
per code review
Posted by da...@apache.org.
ISIS-537: tiny fix, adding final modifier, per code review
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/67409b15
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/67409b15
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/67409b15
Branch: refs/heads/master
Commit: 67409b154cb2a7df4b978dd2ad6ad5111b6bfb68
Parents: d520121
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Dec 1 23:38:40 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Dec 1 23:38:40 2014 +0000
----------------------------------------------------------------------
.../org/apache/isis/viewer/wicket/model/models/ActionModel.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/67409b15/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index 05fb26c..b4b2853 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -79,7 +79,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
private static final long serialVersionUID = 1L;
private static final String NULL_ARG = "$nullArg$";
- private static Pattern KEY_VALUE_PATTERN = Pattern.compile("([^=]+)=(.+)");
+ private static final Pattern KEY_VALUE_PATTERN = Pattern.compile("([^=]+)=(.+)");
/**
* Whether we are obtaining arguments (eg in a dialog), or displaying the
[04/13] isis git commit: Update Jackson to 2.4.3
Posted by da...@apache.org.
Update Jackson to 2.4.3
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/24320d86
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/24320d86
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/24320d86
Branch: refs/heads/master
Commit: 24320d86f4362df552b237d6ba33947e5c734db4
Parents: 8ae1792
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Nov 23 10:23:28 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Nov 23 10:23:28 2014 +0100
----------------------------------------------------------------------
.../MethodPrefixBasedFacetFactoryAbstract.java | 2 -
.../exploration/ExplorationFacetAbstract.java | 1 -
.../ActionInteractionFacetAbstract.java | 2 +-
.../prototype/PrototypeFacetAbstract.java | 1 -
core/pom.xml | 10 +--
core/viewer-restfulobjects-applib/pom.xml | 8 +--
.../applib/JsonRepresentation.java | 74 ++++++++++----------
.../applib/LinkRepresentation.java | 14 ++--
.../applib/client/RepresentationWalker.java | 4 +-
.../applib/client/RestfulResponse.java | 4 +-
.../AbstractObjectMemberRepresentation.java | 2 +-
.../ActionResultRepresentation.java | 2 +-
.../DomainObjectMemberRepresentation.java | 2 +-
.../DomainObjectRepresentation.java | 2 +-
.../domainobjects/DomainRepresentation.java | 2 +-
.../domainobjects/ListRepresentation.java | 2 +-
.../ObjectActionRepresentation.java | 2 +-
.../ObjectCollectionRepresentation.java | 3 +-
.../ObjectPropertyRepresentation.java | 2 +-
.../ScalarValueRepresentation.java | 2 +-
.../AbstractTypeMemberRepresentation.java | 2 +-
.../ActionDescriptionRepresentation.java | 2 +-
...ctionParameterDescriptionRepresentation.java | 2 +-
.../CollectionDescriptionRepresentation.java | 2 +-
.../domaintypes/DomainTypeRepresentation.java | 2 +-
.../PropertyDescriptionRepresentation.java | 2 +-
.../TypeActionResultRepresentation.java | 2 +-
.../domaintypes/TypeListRepresentation.java | 2 +-
.../applib/errors/ErrorRepresentation.java | 2 +-
.../applib/homepage/HomePageRepresentation.java | 2 +-
.../applib/user/UserRepresentation.java | 2 +-
.../restfulobjects/applib/util/JsonMapper.java | 52 ++++++++++----
.../applib/util/JsonNodeUtils.java | 7 +-
.../applib/util/UrlEncodingUtils.java | 2 +-
.../applib/version/VersionRepresentation.java | 2 +-
.../restfulobjects/applib/JsonFixture.java | 6 +-
...entationTest_arrayGet_arraySetElementAt.java | 16 ++---
.../JsonRepresentationTest_arrayIterator.java | 15 ++--
.../JsonRepresentationTest_asInputStream.java | 4 +-
.../applib/JsonRepresentationTest_getArray.java | 12 ++--
.../JsonRepresentationTest_getBigDecimal.java | 39 +++++------
.../JsonRepresentationTest_getBigInteger.java | 24 +++----
.../JsonRepresentationTest_getBoolean.java | 14 ++--
.../JsonRepresentationTest_getDouble.java | 14 ++--
.../applib/JsonRepresentationTest_getInt.java | 23 +++---
.../JsonRepresentationTest_getLink_isLink.java | 16 ++---
.../applib/JsonRepresentationTest_getLong.java | 23 +++---
.../JsonRepresentationTest_getNull_isNull.java | 8 +--
...sonRepresentationTest_getRepresentation.java | 29 ++++----
...onRepresentationTest_getString_isString.java | 14 ++--
...epresentationTest_isArray_isMap_isValue.java | 17 ++---
.../applib/JsonRepresentationTest_mapHas.java | 13 ++--
.../JsonRepresentationTest_mapIterable.java | 15 ++--
.../JsonRepresentationTest_newObject.java | 11 ++-
.../applib/JsonRepresentationTest_putXxx.java | 10 +--
.../applib/JsonRepresentationTest_size.java | 12 ++--
...nObjectRepresentationTest_getCollection.java | 4 +-
...ObjectRepresentationTest_getCollections.java | 4 +-
...nObjectRepresentationTest_getProperties.java | 4 +-
...ainObjectRepresentationTest_getProperty.java | 4 +-
.../AbstractObjectMemberReprRenderer.java | 5 +-
.../domainobjects/ActionResultReprRenderer.java | 5 +-
.../domainobjects/JsonValueEncoder.java | 2 +-
.../domainobjects/ObjectActionReprRenderer.java | 4 +-
.../ObjectPropertyReprRenderer.java | 4 +-
.../domaintypes/DomainTypeReprRenderer.java | 5 +-
.../rendering/util/JsonWriterUtil.java | 6 --
.../restfulobjects/rendering/util/Util.java | 4 +-
.../JsonValueEncoderTest_asAdapter.java | 8 ++-
.../isis/viewer/restfulobjects/tck/Util.java | 18 +++--
...enDisabledMembers_thenRepresentation_ok.java | 4 +-
...ivenHasIcon_thenRepresentation_ok_TOFIX.java | 19 ++---
...ivenHiddenMembers_thenRepresentation_ok.java | 4 +-
...venViewModel_thenRepresentation_ok_TODO.java | 23 +++---
...henArgsValid_thenMultiplePropertyUpdate.java | 4 +-
...sPlus_thenStringPropertyUpdated_ok_TODO.java | 6 +-
..._whenArgValid_thenJdkPropertyUpdated_ok.java | 6 +-
...lid_thenJodaTimePropertyUpdated_ok_TODO.java | 12 ++--
...rgValid_thenPrimitivePropertyUpdated_ok.java | 6 +-
.../action/Get_whenDoesntExistOid_then_404.java | 16 +----
...dempotent_thenResponseCode_205_bad_TODO.java | 19 ++---
...empotent_thenResponseCode_205_bad_TOFIX.java | 19 ++---
.../Get_givenActionSemanticsOfSafe_ok.java | 10 +--
.../Get_givenDisabled_thenResponseCode_203.java | 18 ++---
...enMandatorySimpleArg_whenArgMissing_bad.java | 8 +--
...MandatorySimpleArg_whenArgNullValue_bad.java | 8 +--
...givenNoArgRequired_whenNoArgProvided_ok.java | 24 +++----
...t_givenOptionalArg_whenNoArgProvided_ok.java | 24 +++----
...rgIsHrefAndLinksToNonExistentEntity_bad.java | 4 +-
.../Get_givenRefArg_whenArgProvided_ok.java | 28 ++++----
...larArgInteger_whenArgMalformed_bad_TODO.java | 10 +--
...ivenScalarArgInteger_whenArgProvided_ok.java | 10 +--
...rg_whenArgMalformedMissingValueNode_bad.java | 17 ++---
.../Get_givenScalarArg_whenArgSurplus_bad.java | 19 ++---
...lidationRuleForAllArgs_whenArgFails_bad.java | 26 +++----
...dationRuleForSingleArg_whenArgFails_bad.java | 28 ++++----
...ype_andContentLength_andRespCode_200_ok.java | 24 +++----
...Null_thenRepr_andRespHeaders_and_200_ok.java | 19 ++---
...whenObject_isNull_thenRepresentation_ok.java | 17 ++---
...SemanticsOfIdempotent_then_205_bad_TODO.java | 19 ++---
...ctionSemanticsOfSafe_then_205_bad_TOFIX.java | 19 ++---
...anticsOfNotIdempotent_then_405_bad_TODO.java | 19 ++---
...ActionSemanticsOfSafe_then_405_bad_TODO.java | 19 ++---
..._whenDoesntExistId_thenResponseCode_404.java | 16 +----
.../Get_whenQueryArg_xRoFollowLinks_ok.java | 8 +--
.../Get_whenQueryArg_xRoFollowLinks_ok.java | 25 +++----
106 files changed, 522 insertions(+), 673 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
index 6384bbd..7292ca2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
@@ -25,8 +25,6 @@ import java.util.List;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactory;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java
index 1a713c6..455f226 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java
@@ -23,7 +23,6 @@ import org.apache.isis.applib.events.VisibilityEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
-import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
public abstract class ExplorationFacetAbstract extends MarkerFacetAbstract implements ExplorationFacet {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionInteractionFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionInteractionFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionInteractionFacetAbstract.java
index 734c37e..404f3c0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionInteractionFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionInteractionFacetAbstract.java
@@ -48,7 +48,7 @@ public abstract class ActionInteractionFacetAbstract
* not invalidate), then the event is passed through to the executing phase using this thread-local.
* </p>
*/
- final static ThreadLocal<ActionInteractionEvent<?>> currentInteraction = new ThreadLocal<ActionInteractionEvent<?>>();
+ final static ThreadLocal<ActionInteractionEvent<?>> currentInteraction = new ThreadLocal<>();
public ActionInteractionFacetAbstract(
final Class<? extends ActionInteractionEvent<?>> eventType,
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
index 9a16781..f6f2dd5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
@@ -23,7 +23,6 @@ import org.apache.isis.applib.events.VisibilityEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
-import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
public abstract class PrototypeFacetAbstract extends MarkerFacetAbstract implements PrototypeFacet {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index bd75c23..2b1bd32 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -112,7 +112,7 @@
<commons-httpclient.version>3.1</commons-httpclient.version>
<commons-codec.version>1.9</commons-codec.version>
- <jackson.version>1.9.11</jackson.version>
+ <jackson.version>2.4.3</jackson.version>
<gson.version>2.2.4</gson.version>
<!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver -->
@@ -1282,13 +1282,13 @@ ${license.additional-notes}
<!-- JSON libraries -->
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index 2915072..c223748 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -84,12 +84,12 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentation.java
index fcaa3f5..d569deb 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentation.java
@@ -31,6 +31,12 @@ import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.NullNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.POJONode;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
@@ -38,12 +44,6 @@ import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.node.ArrayNode;
-import org.codehaus.jackson.node.JsonNodeFactory;
-import org.codehaus.jackson.node.NullNode;
-import org.codehaus.jackson.node.ObjectNode;
-import org.codehaus.jackson.node.POJONode;
import org.joda.time.LocalTime;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
@@ -85,7 +85,7 @@ public class JsonRepresentation {
if (!input.isTextual()) {
throw new IllegalStateException("found node that is not a string " + input.toString());
}
- return input.getTextValue();
+ return input.textValue();
}
});
REPRESENTATION_INSTANTIATORS.put(JsonNode.class, new Function<JsonNode, JsonNode>() {
@@ -293,7 +293,7 @@ public class JsonRepresentation {
if (!node.isNumber()) {
throw new IllegalArgumentException(formatExMsg(path, "is not a number"));
}
- return node.getNumberValue();
+ return node.numberValue();
}
@@ -342,7 +342,7 @@ public class JsonRepresentation {
if (!node.isTextual()) {
throw new IllegalArgumentException(formatExMsg(path, "is not a date"));
}
- final String textValue = node.getTextValue();
+ final String textValue = node.textValue();
return new java.util.Date(yyyyMMdd.parseMillis(textValue));
}
@@ -368,7 +368,7 @@ public class JsonRepresentation {
if (!node.isTextual()) {
throw new IllegalArgumentException(formatExMsg(path, "is not a date-time"));
}
- final String textValue = node.getTextValue();
+ final String textValue = node.textValue();
return new java.util.Date(yyyyMMddTHHmmssZ.parseMillis(textValue));
}
@@ -394,7 +394,7 @@ public class JsonRepresentation {
if (!node.isTextual()) {
throw new IllegalArgumentException(formatExMsg(path, "is not a time"));
}
- final String textValue = node.getTextValue();
+ final String textValue = node.textValue();
final LocalTime localTime = _HHmmss.parseLocalTime(textValue + "Z");
return new java.util.Date(localTime.getMillisOfDay());
}
@@ -437,7 +437,7 @@ public class JsonRepresentation {
if (!node.isBoolean()) {
throw new IllegalArgumentException(formatExMsg(path, "is not a boolean"));
}
- return node.getBooleanValue();
+ return node.booleanValue();
}
// ///////////////////////////////////////////////////////////////////////
@@ -468,7 +468,7 @@ public class JsonRepresentation {
// there is no node.isByte()
throw new IllegalArgumentException(formatExMsg(path, "is not a number"));
}
- return node.getNumberValue().byteValue();
+ return node.numberValue().byteValue();
}
// ///////////////////////////////////////////////////////////////////////
@@ -499,7 +499,7 @@ public class JsonRepresentation {
// there is no node.isShort()
throw new IllegalArgumentException(formatExMsg(path, "is not a number"));
}
- return node.getNumberValue().shortValue();
+ return node.shortValue();
}
@@ -530,7 +530,7 @@ public class JsonRepresentation {
if (!node.isTextual()) {
throw new IllegalArgumentException(formatExMsg(path, "is not textual"));
}
- final String textValue = node.getTextValue();
+ final String textValue = node.textValue();
if(textValue == null || textValue.length() == 0) {
return null;
}
@@ -577,7 +577,7 @@ public class JsonRepresentation {
if (!node.isInt()) {
throw new IllegalArgumentException(formatExMsg(path, "is not an int"));
}
- return node.getIntValue();
+ return node.intValue();
}
@@ -618,10 +618,10 @@ public class JsonRepresentation {
}
checkValue(path, node, "a long");
if(node.isInt()) {
- return Long.valueOf(node.getIntValue());
+ return Long.valueOf(node.intValue());
}
if(node.isLong()) {
- return node.getLongValue();
+ return node.longValue();
}
throw new IllegalArgumentException(formatExMsg(path, "is not a long"));
}
@@ -653,7 +653,7 @@ public class JsonRepresentation {
if (!node.isNumber()) {
throw new IllegalArgumentException(formatExMsg(path, "is not a number"));
}
- return node.getNumberValue().floatValue();
+ return node.floatValue();
}
@@ -712,7 +712,7 @@ public class JsonRepresentation {
if (!node.isDouble()) {
throw new IllegalArgumentException(formatExMsg(path, "is not a double"));
}
- return node.getDoubleValue();
+ return node.doubleValue();
}
// ///////////////////////////////////////////////////////////////////////
@@ -728,7 +728,7 @@ public class JsonRepresentation {
}
private boolean isBigInteger(final JsonNode node) {
- return !representsNull(node) && node.isValueNode() && (node.isBigInteger() || node.isLong() || node.isInt() || node.isTextual() && parseableAsBigInteger(node.getTextValue()));
+ return !representsNull(node) && node.isValueNode() && (node.isBigInteger() || node.isLong() || node.isInt() || node.isTextual() && parseableAsBigInteger(node.textValue()));
}
private static boolean parseableAsBigInteger(String str) {
@@ -800,16 +800,16 @@ public class JsonRepresentation {
private BigInteger getBigInteger(String path, JsonNode node) {
if (node.isBigInteger()) {
- return node.getBigIntegerValue();
+ return node.bigIntegerValue();
}
if (node.isTextual()) {
- return new BigInteger(node.getTextValue());
+ return new BigInteger(node.textValue());
}
if (node.isLong()) {
- return BigInteger.valueOf(node.getLongValue());
+ return BigInteger.valueOf(node.longValue());
}
if (node.isInt()) {
- return BigInteger.valueOf(node.getIntValue());
+ return BigInteger.valueOf(node.intValue());
}
throw new IllegalArgumentException(formatExMsg(path, "is not a biginteger, is not any other integral number, is not text parseable as a biginteger"));
}
@@ -827,7 +827,7 @@ public class JsonRepresentation {
}
private boolean isBigDecimal(final JsonNode node) {
- return !representsNull(node) && node.isValueNode() && (node.isBigDecimal() || node.isDouble() || node.isLong() || node.isInt() || node.isBigInteger() || node.isTextual() && parseableAsBigDecimal(node.getTextValue()));
+ return !representsNull(node) && node.isValueNode() && (node.isBigDecimal() || node.isDouble() || node.isLong() || node.isInt() || node.isBigInteger() || node.isTextual() && parseableAsBigDecimal(node.textValue()));
}
private static boolean parseableAsBigDecimal(String str) {
@@ -904,23 +904,23 @@ public class JsonRepresentation {
private BigDecimal getBigDecimal(String path, JsonNode node) {
if (node.isBigDecimal()) {
- return node.getDecimalValue();
+ return node.decimalValue();
}
if (node.isTextual()) {
- return new BigDecimal(node.getTextValue());
+ return new BigDecimal(node.textValue());
}
if (node.isLong()) {
- return new BigDecimal(node.getLongValue());
+ return new BigDecimal(node.longValue());
}
if (node.isDouble()) {
// there will be rounding errors, most likely
- return BigDecimal.valueOf(node.getDoubleValue());
+ return BigDecimal.valueOf(node.doubleValue());
}
if (node.isBigInteger()) {
- return new BigDecimal(node.getBigIntegerValue());
+ return new BigDecimal(node.bigIntegerValue());
}
if (node.isInt()) {
- return new BigDecimal(node.getIntValue());
+ return new BigDecimal(node.intValue());
}
throw new IllegalArgumentException(formatExMsg(path, "is not a bigdecimal, is not any other numeric, is not text parseable as a bigdecimal"));
}
@@ -965,12 +965,12 @@ public class JsonRepresentation {
if (!node.isTextual()) {
throw new IllegalArgumentException(formatExMsg(path, "is not a string"));
}
- return node.getTextValue();
+ return node.textValue();
}
public String asArg() {
if (isValue()) {
- return asJsonNode().getValueAsText();
+ return asJsonNode().asText();
} else {
return asJsonNode().toString();
}
@@ -1108,7 +1108,7 @@ public class JsonRepresentation {
if (asJsonNode().size() != 1) {
throw new IllegalStateException("does not represent link");
}
- final String linkPropertyName = asJsonNode().getFieldNames().next();
+ final String linkPropertyName = asJsonNode().fieldNames().next();
return getLink(linkPropertyName);
}
@@ -1572,7 +1572,7 @@ public class JsonRepresentation {
public Iterator<Map.Entry<String, JsonRepresentation>> mapIterator() {
ensureIsAMap();
- return Iterators.transform(jsonNode.getFields(), MAP_ENTRY_JSON_NODE_TO_JSON_REPRESENTATION);
+ return Iterators.transform(jsonNode.fields(), MAP_ENTRY_JSON_NODE_TO_JSON_REPRESENTATION);
}
private void ensureIsAMap() {
@@ -1676,7 +1676,7 @@ public class JsonRepresentation {
private String getFormatValueIfAnyFrom(JsonNode jsonNode) {
String format;
final JsonNode formatNode = jsonNode.get("format");
- format = formatNode != null && formatNode.isTextual()? formatNode.getTextValue(): null;
+ format = formatNode != null && formatNode.isTextual()? formatNode.textValue(): null;
return format;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentation.java
index ec9fa57..a883fe6 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/LinkRepresentation.java
@@ -20,12 +20,12 @@ package org.apache.isis.viewer.restfulobjects.applib;
import javax.ws.rs.core.MediaType;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.isis.viewer.restfulobjects.applib.client.ClientRequestConfigurer;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.node.JsonNodeFactory;
-import org.codehaus.jackson.node.ObjectNode;
import org.jboss.resteasy.client.ClientExecutor;
public final class LinkRepresentation extends JsonRepresentation {
@@ -40,7 +40,7 @@ public final class LinkRepresentation extends JsonRepresentation {
}
public String getRel() {
- return asObjectNode().path("rel").getTextValue();
+ return asObjectNode().path("rel").textValue();
}
public LinkRepresentation withRel(final String rel) {
@@ -54,7 +54,7 @@ public final class LinkRepresentation extends JsonRepresentation {
public String getHref() {
- return asObjectNode().path("href").getTextValue();
+ return asObjectNode().path("href").textValue();
}
public LinkRepresentation withHref(final String href) {
@@ -76,12 +76,12 @@ public final class LinkRepresentation extends JsonRepresentation {
}
public RestfulHttpMethod getHttpMethod() {
- final String methodStr = asObjectNode().path("method").getTextValue();
+ final String methodStr = asObjectNode().path("method").textValue();
return RestfulHttpMethod.valueOf(methodStr);
}
public MediaType getType() {
- final String typeStr = asObjectNode().path("type").getTextValue();
+ final String typeStr = asObjectNode().path("type").textValue();
if (typeStr == null) {
return MediaType.APPLICATION_JSON_TYPE;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RepresentationWalker.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RepresentationWalker.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RepresentationWalker.java
index 5c2fd87..420691c 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RepresentationWalker.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RepresentationWalker.java
@@ -26,9 +26,9 @@ import javax.ws.rs.core.Response.Status.Family;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
import com.google.common.collect.Lists;
public class RepresentationWalker {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java
index aadef4d..29e9e26 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java
@@ -34,9 +34,9 @@ import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.util.JsonMapper;
import org.apache.isis.viewer.restfulobjects.applib.util.Parser;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
import com.google.common.collect.Maps;
public class RestfulResponse<T> {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.java
index fc0c74f..cab33c9 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domainobjects;
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
public abstract class AbstractObjectMemberRepresentation extends DomainRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ActionResultRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ActionResultRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ActionResultRepresentation.java
index cf9d66a..d03a5d6 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ActionResultRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ActionResultRepresentation.java
@@ -18,8 +18,8 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domainobjects;
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import org.codehaus.jackson.JsonNode;
public class ActionResultRepresentation extends AbstractObjectMemberRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.java
index 6b271ce..f6986fe 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domainobjects;
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
/**
* Represents the members within the {@link DomainObjectRepresentation}'s <tt>members</tt>
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.java
index 81a033f..2288518 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.java
@@ -19,12 +19,12 @@
package org.apache.isis.viewer.restfulobjects.applib.domainobjects;
import java.util.Map;
+import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
-import org.codehaus.jackson.JsonNode;
public class DomainObjectRepresentation extends DomainRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java
index 1a954b1..e6709bd 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domainobjects;
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation.HasExtensions;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation.HasLinkToSelf;
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java
index cf82860..c116d45 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ListRepresentation.java
@@ -18,11 +18,11 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domainobjects;
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation.HasLinkToUp;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
-import org.codehaus.jackson.JsonNode;
public class ListRepresentation extends DomainRepresentation implements HasLinkToUp {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectActionRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectActionRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectActionRepresentation.java
index 54af825..6b8389f 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectActionRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectActionRepresentation.java
@@ -18,9 +18,9 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domainobjects;
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
-import org.codehaus.jackson.JsonNode;
public class ObjectActionRepresentation extends AbstractObjectMemberRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.java
index 99ee68a..859d416 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.java
@@ -18,8 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domainobjects;
-import org.codehaus.jackson.JsonNode;
-
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
public class ObjectCollectionRepresentation extends AbstractObjectMemberRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.java
index 3662302..fd1fb0a 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domainobjects;
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
public class ObjectPropertyRepresentation extends AbstractObjectMemberRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ScalarValueRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ScalarValueRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ScalarValueRepresentation.java
index 6f102a8..87c1bf2 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ScalarValueRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/ScalarValueRepresentation.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domainobjects;
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
public class ScalarValueRepresentation extends DomainRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.java
index 6a9312b..5aba282 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.java
@@ -18,8 +18,8 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domaintypes;
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainRepresentation;
-import org.codehaus.jackson.JsonNode;
public abstract class AbstractTypeMemberRepresentation extends DomainRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.java
index 233dfd5..7c6faea 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domaintypes;
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
public class ActionDescriptionRepresentation extends AbstractTypeMemberRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.java
index cde428c..fe99d2b 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domaintypes;
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
public class ActionParameterDescriptionRepresentation extends AbstractTypeMemberRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.java
index 9c36b3c..3211b58 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domaintypes;
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
public class CollectionDescriptionRepresentation extends AbstractTypeMemberRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeRepresentation.java
index 8c40e17..1c3d232 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeRepresentation.java
@@ -18,8 +18,8 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domaintypes;
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainRepresentation;
-import org.codehaus.jackson.JsonNode;
public class DomainTypeRepresentation extends DomainRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.java
index 62036fc..7a3395a 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domaintypes;
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
public class PropertyDescriptionRepresentation extends AbstractTypeMemberRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.java
index 896d2dd..25fc610 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.java
@@ -18,8 +18,8 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domaintypes;
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainRepresentation;
-import org.codehaus.jackson.JsonNode;
public class TypeActionResultRepresentation extends DomainRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeListRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeListRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeListRepresentation.java
index c9572b1..57a6fed 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeListRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/TypeListRepresentation.java
@@ -18,8 +18,8 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.domaintypes;
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainRepresentation;
-import org.codehaus.jackson.JsonNode;
public class TypeListRepresentation extends DomainRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/errors/ErrorRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/errors/ErrorRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/errors/ErrorRepresentation.java
index 7b5448c..f1fc9db 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/errors/ErrorRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/errors/ErrorRepresentation.java
@@ -18,8 +18,8 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.errors;
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import org.codehaus.jackson.JsonNode;
public class ErrorRepresentation extends JsonRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageRepresentation.java
index 3ffd966..9e964d9 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/homepage/HomePageRepresentation.java
@@ -18,10 +18,10 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.homepage;
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainRepresentation;
-import org.codehaus.jackson.JsonNode;
public class HomePageRepresentation extends DomainRepresentation {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserRepresentation.java
index 6a280d4..fed5d91 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/user/UserRepresentation.java
@@ -18,12 +18,12 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.user;
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation.HasLinkToUp;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainRepresentation;
-import org.codehaus.jackson.JsonNode;
public class UserRepresentation extends DomainRepresentation implements HasLinkToUp {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonMapper.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonMapper.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonMapper.java
index 7f130a5..1661064 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonMapper.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonMapper.java
@@ -26,13 +26,31 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import javax.ws.rs.core.Response;
-import org.codehaus.jackson.*;
-import org.codehaus.jackson.map.*;
-import org.codehaus.jackson.map.deser.BeanDeserializerFactory;
-import org.codehaus.jackson.map.deser.JsonNodeDeserializer;
-import org.codehaus.jackson.map.deser.StdDeserializerProvider;
-import org.codehaus.jackson.map.module.SimpleModule;
-import org.codehaus.jackson.type.JavaType;
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.BeanDescription;
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.databind.DeserializationConfig;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationConfig;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.cfg.DeserializerFactoryConfig;
+import com.fasterxml.jackson.databind.deser.BeanDeserializerFactory;
+import com.fasterxml.jackson.databind.deser.DefaultDeserializationContext;
+import com.fasterxml.jackson.databind.deser.std.JsonNodeDeserializer;
+import com.fasterxml.jackson.databind.module.SimpleModule;
import org.jboss.resteasy.client.ClientResponse;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
@@ -49,8 +67,12 @@ public final class JsonMapper {
*/
@SuppressWarnings("deprecation")
private static final class JsonRepresentationDeserializerFactory extends BeanDeserializerFactory {
+ public JsonRepresentationDeserializerFactory(DeserializerFactoryConfig config) {
+ super(config);
+ }
+
@Override
- public JsonDeserializer<Object> createBeanDeserializer(final DeserializationConfig config, final DeserializerProvider p, final JavaType type, final BeanProperty property) throws JsonMappingException {
+ public JsonDeserializer<Object> createBeanDeserializer(DeserializationContext config, JavaType type, BeanDescription property) throws JsonMappingException {
final Class<?> rawClass = type.getRawClass();
if (JsonRepresentation.class.isAssignableFrom(rawClass)) {
try {
@@ -63,7 +85,7 @@ public final class JsonMapper {
// fall through
}
}
- return super.createBeanDeserializer(config, p, type, property);
+ return super.createBeanDeserializer(config, type, property);
}
private static final class JsonRepresentationDeserializer extends JsonDeserializer<Object> {
@@ -99,16 +121,18 @@ public final class JsonMapper {
private static ObjectMapper createObjectMapper(PrettyPrinting prettyPrinting) {
// it's a shame that the serialization and deserialization mechanism
// used aren't symmetric... but it works.
- final DeserializerProvider deserializerProvider = new StdDeserializerProvider(new JsonRepresentationDeserializerFactory());
+ DeserializerFactoryConfig deserializerFactoryConfig = new DeserializerFactoryConfig();
+ JsonRepresentationDeserializerFactory deserializerFactory = new JsonRepresentationDeserializerFactory(deserializerFactoryConfig);
+ final DefaultDeserializationContext deserializerProvider = new DefaultDeserializationContext.Impl(deserializerFactory);
final ObjectMapper objectMapper = new ObjectMapper(null, null, deserializerProvider);
- final SimpleModule jsonModule = new SimpleModule("json", new Version(1, 0, 0, null));
+ final SimpleModule jsonModule = new SimpleModule("json", new Version(1, 0, 0, null, "org.apache", "isis"));
jsonModule.addSerializer(JsonRepresentation.class, new JsonRepresentationSerializer());
objectMapper.registerModule(jsonModule);
if(prettyPrinting == PrettyPrinting.ENABLE) {
- objectMapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
+ objectMapper.configure(SerializationFeature.INDENT_OUTPUT, true);
}
- objectMapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+ objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
return objectMapper;
}
@@ -169,4 +193,4 @@ public final class JsonMapper {
return objectMapper.writeValueAsString(object);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonNodeUtils.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonNodeUtils.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonNodeUtils.java
index 7f61f02..c95e84c 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonNodeUtils.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/JsonNodeUtils.java
@@ -22,12 +22,11 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.List;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.node.JsonNodeFactory;
-import org.codehaus.jackson.node.ObjectNode;
-
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Charsets;
public class JsonNodeUtils {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/UrlEncodingUtils.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/UrlEncodingUtils.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/UrlEncodingUtils.java
index 8f16633..9ccb2ba 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/UrlEncodingUtils.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/util/UrlEncodingUtils.java
@@ -23,10 +23,10 @@ import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.Arrays;
import java.util.List;
+import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.base.Charsets;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
-import org.codehaus.jackson.JsonNode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
public final class UrlEncodingUtils {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
index fa49124..a7559d8 100644
--- a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
+++ b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/version/VersionRepresentation.java
@@ -18,12 +18,12 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.version;
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation.HasLinkToUp;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainRepresentation;
-import org.codehaus.jackson.JsonNode;
public class VersionRepresentation extends DomainRepresentation implements HasLinkToUp {
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonFixture.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonFixture.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonFixture.java
index 6644f92..4ac440c 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonFixture.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonFixture.java
@@ -21,10 +21,10 @@ package org.apache.isis.viewer.restfulobjects.applib;
import java.io.IOException;
import org.apache.isis.viewer.restfulobjects.applib.util.JsonMapper;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.base.Charsets;
import com.google.common.io.Resources;
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
index 83af6d5..613ae16 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayGet_arraySetElementAt.java
@@ -26,8 +26,6 @@ import static org.junit.Assert.assertThat;
import java.io.IOException;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Test;
@@ -44,43 +42,43 @@ public class JsonRepresentationTest_arrayGet_arraySetElementAt {
}
@Test(expected = IndexOutOfBoundsException.class)
- public void arrayGet_outOfBounds() throws JsonParseException, JsonMappingException, IOException {
+ public void arrayGet_outOfBounds() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("emptyList.json"));
jsonRepresentation.arrayGet(0);
}
@Test(expected = IndexOutOfBoundsException.class)
- public void arraySetElementAt_outOfBounds() throws JsonParseException, JsonMappingException, IOException {
+ public void arraySetElementAt_outOfBounds() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("emptyList.json"));
jsonRepresentation.arraySetElementAt(0, objectRepr);
}
@Test
- public void arrayGet_forNonEmptyList() throws JsonParseException, JsonMappingException, IOException {
+ public void arrayGet_forNonEmptyList() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("list.json"));
assertThat(jsonRepresentation.arrayGet(0), is(not(nullValue())));
}
@Test
- public void arraySetElementAt_happyCaseWhenSetElementToObject() throws JsonParseException, JsonMappingException, IOException {
+ public void arraySetElementAt_happyCaseWhenSetElementToObject() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("list.json"));
jsonRepresentation.arraySetElementAt(0, objectRepr);
}
@Test(expected = IllegalArgumentException.class)
- public void arraySetElementAt_forAttemptingToSetElementToArray() throws JsonParseException, JsonMappingException, IOException {
+ public void arraySetElementAt_forAttemptingToSetElementToArray() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("list.json"));
jsonRepresentation.arraySetElementAt(0, arrayRepr);
}
@Test(expected = IllegalStateException.class)
- public void arrayGet_forMap() throws JsonParseException, JsonMappingException, IOException {
+ public void arrayGet_forMap() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("emptyMap.json"));
jsonRepresentation.arrayGet(0);
}
@Test(expected = IllegalStateException.class)
- public void arrayGet_forValue() throws JsonParseException, JsonMappingException, IOException {
+ public void arrayGet_forValue() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("map.json"));
final JsonRepresentation valueRepresentation = jsonRepresentation.getRepresentation("anInt");
valueRepresentation.arrayGet(0);
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayIterator.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayIterator.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayIterator.java
index bb64de0..48eed72 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayIterator.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_arrayIterator.java
@@ -18,23 +18,20 @@
*/
package org.apache.isis.viewer.restfulobjects.applib;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
import java.util.Iterator;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Test;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class JsonRepresentationTest_arrayIterator {
private JsonRepresentation jsonRepresentation;
@Test
- public void forJsonRepresentation() throws JsonParseException, JsonMappingException, IOException {
+ public void forJsonRepresentation() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("list.json"));
final Iterator<JsonRepresentation> arrayIterator = jsonRepresentation.arrayIterator(JsonRepresentation.class);
assertThat(arrayIterator.hasNext(), is(true));
@@ -45,7 +42,7 @@ public class JsonRepresentationTest_arrayIterator {
}
@Test
- public void forString() throws JsonParseException, JsonMappingException, IOException {
+ public void forString() throws IOException {
jsonRepresentation = new JsonRepresentation(readJson("listOfStrings.json"));
final Iterator<String> arrayIterator = jsonRepresentation.arrayIterator(String.class);
assertThat(arrayIterator.hasNext(), is(true));
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
index 611fd5f..42c0a62 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_asInputStream.java
@@ -28,8 +28,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Test;
@@ -45,7 +43,7 @@ public class JsonRepresentationTest_asInputStream {
}
@Test
- public void asInputStream() throws JsonParseException, JsonMappingException, IOException {
+ public void asInputStream() throws IOException {
final InputStream array = jsonRepresentation.asInputStream();
final ByteArrayOutputStream to = new ByteArrayOutputStream();
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
index 06718b2..10b046b 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getArray.java
@@ -27,8 +27,6 @@ import static org.junit.Assert.fail;
import java.io.IOException;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Test;
@@ -42,26 +40,26 @@ public class JsonRepresentationTest_getArray {
}
@Test
- public void nonEmptyArray() throws JsonParseException, JsonMappingException, IOException {
+ public void nonEmptyArray() throws IOException {
final JsonRepresentation array = jsonRepresentation.getArray("aStringArray");
assertThat(array, is(not(nullValue())));
assertThat(array.size(), is(3));
}
@Test
- public void emptyArray() throws JsonParseException, JsonMappingException, IOException {
+ public void emptyArray() throws IOException {
final JsonRepresentation array = jsonRepresentation.getArray("anEmptyArray");
assertThat(array, is(not(nullValue())));
assertThat(array.size(), is(0));
}
@Test
- public void forNonExistent() throws JsonParseException, JsonMappingException, IOException {
+ public void forNonExistent() throws IOException {
assertThat(jsonRepresentation.getArray("doesNotExist"), is(nullValue()));
}
@Test
- public void forValue() throws JsonParseException, JsonMappingException, IOException {
+ public void forValue() throws IOException {
try {
jsonRepresentation.getArray("aString");
fail();
@@ -71,7 +69,7 @@ public class JsonRepresentationTest_getArray {
}
@Test
- public void forMap() throws JsonParseException, JsonMappingException, IOException {
+ public void forMap() throws IOException {
try {
jsonRepresentation.getArray("aSubMap");
fail();
http://git-wip-us.apache.org/repos/asf/isis/blob/24320d86/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
index 97c6acd..e812995 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/JsonRepresentationTest_getBigDecimal.java
@@ -18,21 +18,18 @@
*/
package org.apache.isis.viewer.restfulobjects.applib;
-import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import java.io.IOException;
import java.math.BigDecimal;
-
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import static org.apache.isis.viewer.restfulobjects.applib.JsonFixture.readJson;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
public class JsonRepresentationTest_getBigDecimal {
@Rule
@@ -46,27 +43,27 @@ public class JsonRepresentationTest_getBigDecimal {
}
@Test
- public void happyCase() throws JsonParseException, JsonMappingException, IOException {
+ public void happyCase() throws IOException {
assertThat(jsonRepresentation.getBigDecimal("aBigDecimal"), is(new BigDecimal("12345678901234567890.1234")));
}
@Test
- public void happyCaseConvertingAnotherDoubleToBigDecimal() throws JsonParseException, JsonMappingException, IOException {
+ public void happyCaseConvertingAnotherDoubleToBigDecimal() throws IOException {
assertThat(jsonRepresentation.getBigDecimal("anotherDouble"), is(new BigDecimal("1234567.89")));
}
@Test
- public void happyCaseConvertingAnIntToBigDecimal() throws JsonParseException, JsonMappingException, IOException {
+ public void happyCaseConvertingAnIntToBigDecimal() throws IOException {
assertThat(jsonRepresentation.getBigDecimal("anInt"), is(new BigDecimal("123")));
}
@Test
- public void happyCaseForFormatJustFits() throws JsonParseException, JsonMappingException, IOException {
+ public void happyCaseForFormatJustFits() throws IOException {
assertThat(jsonRepresentation.getBigDecimal("aBigDecimal", "big-decimal(24,4)"), is(new BigDecimal("12345678901234567890.1234")));
}
@Test
- public void invalidFormat() throws JsonParseException, JsonMappingException, IOException {
+ public void invalidFormat() throws IOException {
expectedException.expect(IllegalArgumentException.class);
expectedException.expectMessage("Value '12345678901234567890.1234' larger than that allowed by format 'big-decimal(22,3)'");
@@ -74,12 +71,12 @@ public class JsonRepresentationTest_getBigDecimal {
}
@Test
- public void validFormattedFromPath() throws JsonParseException, JsonMappingException, IOException {
+ public void validFormattedFromPath() throws IOException {
assertThat(jsonRepresentation.getBigDecimal("yetAnotherSubMap.aFormattedBigDecimal.value"), is(new BigDecimal("123.45")));
}
@Test
- public void invalidFormattedFromPath() throws JsonParseException, JsonMappingException, IOException {
+ public void invalidFormattedFromPath() throws IOException {
expectedException.expect(IllegalArgumentException.class);
expectedException.expectMessage("Value '123.45' larger than that allowed by format 'big-decimal(4,2)'");
@@ -87,17 +84,17 @@ public class JsonRepresentationTest_getBigDecimal {
}
@Test
- public void invalidFormattedFromPathButOverridden() throws JsonParseException, JsonMappingException, IOException {
+ public void invalidFormattedFromPathButOverridden() throws IOException {
assertThat(jsonRepresentation.getBigDecimal("yetAnotherSubMap.anInvalidFormattedBigDecimal.value", "big-decimal(5,2)"), is(new BigDecimal("123.45")));
}
@Test
- public void forNonExistent() throws JsonParseException, JsonMappingException, IOException {
+ public void forNonExistent() throws IOException {
assertThat(jsonRepresentation.getBigDecimal("doesNotExist"), is(nullValue()));
}
@Test
- public void forNonParseableString() throws JsonParseException, JsonMappingException, IOException {
+ public void forNonParseableString() throws IOException {
expectedException.expect(IllegalArgumentException.class);
expectedException.expectMessage("'aString' is not a bigdecimal");
@@ -105,7 +102,7 @@ public class JsonRepresentationTest_getBigDecimal {
}
@Test
- public void forMap() throws JsonParseException, JsonMappingException, IOException {
+ public void forMap() throws IOException {
expectedException.expect(IllegalArgumentException.class);
expectedException.expectMessage("'aSubMap' is not a bigdecimal");
@@ -113,7 +110,7 @@ public class JsonRepresentationTest_getBigDecimal {
}
@Test
- public void forList() throws JsonParseException, JsonMappingException, IOException {
+ public void forList() throws IOException {
expectedException.expect(IllegalArgumentException.class);
expectedException.expectMessage("'aSubList' is not a bigdecimal");
@@ -121,7 +118,7 @@ public class JsonRepresentationTest_getBigDecimal {
}
@Test
- public void forMultipartKey() throws JsonParseException, JsonMappingException, IOException {
+ public void forMultipartKey() throws IOException {
assertThat(jsonRepresentation.getBigDecimal("aSubMap.aBigDecimal"), is(new BigDecimal("12345678901234567890.1234")));
}
[10/13] isis git commit: ISIS-961: in IsisTransactionManager,
call setAbortCause if an exception is caught for any reason (this
includes an exception thrown by domain object code).
Posted by da...@apache.org.
ISIS-961: in IsisTransactionManager, call setAbortCause if an exception is caught for any reason (this includes an exception thrown by domain object code).
Also:
- minor enhancement/improvement to error page so that a NonRecoverableException's message is displayed rather than a generic message.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d231d201
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d231d201
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d231d201
Branch: refs/heads/master
Commit: d231d2019705f6a1642900ada3e4a5e8de85b4b3
Parents: c05621a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Dec 1 23:15:42 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Dec 1 23:15:42 2014 +0000
----------------------------------------------------------------------
.../ui/components/actions/ActionPanel.java | 4 +--
.../cssmenu/ActionLinkFactoryAbstract.java | 7 ++--
.../viewer/wicket/ui/errors/ExceptionModel.java | 11 ++++++-
.../transaction/IsisTransactionManager.java | 34 ++++++++++++++------
4 files changed, 40 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d231d201/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
index b2959ff..238840e 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
@@ -351,8 +351,8 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements ActionExe
if (appEx != null) {
getMessageBroker().setApplicationError(appEx.getMessage());
- // there's no need to abort the transaction, it will have already been done
- // (in IsisTransactionManager#executeWithinTransaction(...)).
+ // there's no need to set the abort cause on the transaction, it will have already been done
+ // (in IsisTransactionManager#executeWithinTransaction(...)).
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d231d201/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
index 5c7f779..d5ab010 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
@@ -26,18 +26,15 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.link.AbstractLink;
-import org.apache.wicket.model.Model;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
@@ -223,6 +220,10 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
final RecoverableException appEx = ActionModel.getApplicationExceptionIfAny(ex);
if (appEx != null) {
IsisContext.getMessageBroker().setApplicationError(appEx.getMessage());
+
+ // there's no need to set the abort cause on the transaction, it will have already been done
+ // (in IsisTransactionManager#executeWithinTransaction(...)).
+
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d231d201/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
index fbb4aed..8c87bf2 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
@@ -18,9 +18,12 @@
*/
package org.apache.isis.viewer.wicket.ui.errors;
+import java.util.Iterator;
import java.util.List;
import com.google.common.base.Throwables;
+import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
+import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.viewer.wicket.model.models.ModelAbstract;
@@ -58,7 +61,13 @@ public class ExceptionModel extends ModelAbstract<List<StackTraceDetail>> {
this.mainMessage = recognizedMessageIfAny;
} else {
this.recognized =false;
- this.mainMessage = MAIN_MESSAGE_IF_NOT_RECOGNIZED;
+
+ // see if we can find a NonRecoverableException in the stack trace
+ Iterable<NonRecoverableException> appEx = Iterables.filter(Throwables.getCausalChain(ex), NonRecoverableException.class);
+ Iterator<NonRecoverableException> iterator = appEx.iterator();
+ NonRecoverableException nonRecoverableException = iterator.hasNext() ? iterator.next() : null;
+
+ this.mainMessage = nonRecoverableException != null? nonRecoverableException.getMessage() : MAIN_MESSAGE_IF_NOT_RECOGNIZED;
}
}
stackTraceDetailList = asStackTrace(ex);
http://git-wip-us.apache.org/repos/asf/isis/blob/d231d201/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
index 0fd9308..b36e330 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
@@ -46,7 +46,10 @@ import org.apache.isis.core.runtime.system.session.IsisSession;
import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
import static org.apache.isis.core.commons.ensure.Ensure.ensureThatState;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
public class IsisTransactionManager implements SessionScopedComponent {
@@ -139,8 +142,13 @@ public class IsisTransactionManager implements SessionScopedComponent {
* If a transaction is {@link IsisContext#inTransaction() in progress}, then
* uses that. Otherwise will {@link #startTransaction() start} a transaction
* before running the block and {@link #endTransaction() commit} it at the
- * end. If the closure throws an exception, then will
- * {@link #abortTransaction() abort} the transaction.
+ * end.
+ * </p>
+ *
+ * <p>
+ * If the closure throws an exception, then will {@link #abortTransaction() abort} the transaction if was
+ * started here, or will ensure that an already-in-progress transaction cannot commit.
+ * </p>
*/
public void executeWithinTransaction(final TransactionalClosure closure) {
final boolean initiallyInTransaction = inTransaction();
@@ -157,17 +165,15 @@ public class IsisTransactionManager implements SessionScopedComponent {
} catch (final RuntimeException ex) {
closure.onFailure();
if (!initiallyInTransaction) {
- // temp TODO fix swallowing of exception
- // System.out.println(ex.getMessage());
- // ex.printStackTrace();
try {
abortTransaction();
} catch (final Exception e) {
LOG.error("Abort failure after exception", e);
- // System.out.println(e.getMessage());
- // e.printStackTrace();
throw new IsisTransactionManagerException("Abort failure: " + e.getMessage(), ex);
}
+ } else {
+ // ensure that this xactn cannot be committed
+ getTransaction().setAbortCause(new IsisException(ex));
}
throw ex;
}
@@ -181,8 +187,13 @@ public class IsisTransactionManager implements SessionScopedComponent {
* If a transaction is {@link IsisContext#inTransaction() in progress}, then
* uses that. Otherwise will {@link #startTransaction() start} a transaction
* before running the block and {@link #endTransaction() commit} it at the
- * end. If the closure throws an exception, then will
- * {@link #abortTransaction() abort} the transaction.
+ * end.
+ * </p>
+ *
+ * <p>
+ * If the closure throws an exception, then will {@link #abortTransaction() abort} the transaction if was
+ * started here, or will ensure that an already-in-progress transaction cannot commit.
+ * </p>
*/
public <Q> Q executeWithinTransaction(final TransactionalClosureWithReturn<Q> closure) {
final boolean initiallyInTransaction = inTransaction();
@@ -201,6 +212,9 @@ public class IsisTransactionManager implements SessionScopedComponent {
closure.onFailure();
if (!initiallyInTransaction) {
abortTransaction();
+ } else {
+ // ensure that this xactn cannot be committed
+ getTransaction().setAbortCause(new IsisException(ex));
}
throw ex;
}