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/05/06 08:27:19 UTC
[1/2] git commit: ISIS-774: removing unused imports ... ... of
IsisWicketUnsecuredApplication
Repository: isis
Updated Branches:
refs/heads/master 58fa0b87d -> 31acb0fcd
ISIS-774: removing unused imports ...
... of IsisWicketUnsecuredApplication
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/88d881c9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/88d881c9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/88d881c9
Branch: refs/heads/master
Commit: 88d881c93e52e9d0c14b4ce8e2a0fba9ad996fd1
Parents: 58fa0b8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue May 6 07:17:28 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue May 6 07:17:28 2014 +0100
----------------------------------------------------------------------
.../integration/isis/DeploymentTypeWicketAbstract.java | 8 +++-----
.../wicket/viewer/integration/isis/WicketServer.java | 10 ++++------
.../viewer/integration/isis/WicketServerPrototype.java | 8 +++-----
3 files changed, 10 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/88d881c9/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/DeploymentTypeWicketAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/DeploymentTypeWicketAbstract.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/DeploymentTypeWicketAbstract.java
index 0993a41..dcefd4c 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/DeploymentTypeWicketAbstract.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/DeploymentTypeWicketAbstract.java
@@ -25,16 +25,14 @@ import org.apache.wicket.RuntimeConfigurationType;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
-import org.apache.isis.viewer.wicket.viewer.IsisWicketUnsecuredApplication;
/**
* {@link DeploymentType} for production usage.
*
* <p>
- * In {@link IsisWicketApplication} and {@link IsisWicketUnsecuredApplication} there
- * is logic to select either this {@link DeploymentType} or {@link WicketServerPrototype}
- * depending on the value of Wicket's own
- * {@link Application#getConfigurationType() configuration mode}.
+ * In {@link IsisWicketApplication} there is logic to select either this
+ * {@link DeploymentType} or {@link WicketServerPrototype} depending on the
+ * value of Wicket's own {@link Application#getConfigurationType() configuration mode}.
*/
public class DeploymentTypeWicketAbstract extends DeploymentTypeAbstract {
http://git-wip-us.apache.org/repos/asf/isis/blob/88d881c9/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServer.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServer.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServer.java
index ae3f929..da1cf7a 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServer.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServer.java
@@ -19,21 +19,19 @@
package org.apache.isis.viewer.wicket.viewer.integration.isis;
-import org.apache.wicket.settings.def.ApplicationSettings;
+import org.apache.wicket.Application;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
-import org.apache.isis.viewer.wicket.viewer.IsisWicketUnsecuredApplication;
/**
* {@link DeploymentType} for production usage.
*
* <p>
- * In {@link IsisWicketApplication} and {@link IsisWicketUnsecuredApplication} there
- * is logic to select either this {@link DeploymentType} or {@link WicketServerPrototype}
- * depending on the value of Wicket's own
- * {@link Application#getConfigurationType() configuration mode}.
+ * In {@link IsisWicketApplication} there is logic to select either this
+ * {@link DeploymentType} or {@link WicketServerPrototype} depending on the value
+ * of Wicket's own {@link Application#getConfigurationType() configuration mode}.
*/
public class WicketServer extends DeploymentTypeWicketAbstract {
http://git-wip-us.apache.org/repos/asf/isis/blob/88d881c9/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java
index c3bef4e..42fcdb1 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java
@@ -22,16 +22,14 @@ package org.apache.isis.viewer.wicket.viewer.integration.isis;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
-import org.apache.isis.viewer.wicket.viewer.IsisWicketUnsecuredApplication;
/**
* {@link DeploymentType} for prototype usage.
*
* <p>
- * In {@link IsisWicketApplication} and {@link IsisWicketUnsecuredApplication} there
- * is logic to select either this {@link DeploymentType} or {@link WicketServer}
- * depending on the value of Wicket's own
- * {@link Application#getConfigurationType() configuration mode}.
+ * In {@link IsisWicketApplication} there is logic to select either this
+ * {@link DeploymentType} or {@link WicketServer} depending on the value of
+ * Wicket's own {@link Application#getConfigurationType() configuration mode}.
*/
public class WicketServerPrototype extends DeploymentTypeWicketAbstract {
[2/2] git commit: ISIS-719: updating comment, also use
Posted by da...@apache.org.
ISIS-719: updating comment, also use
... current rather than explicit version (per martin-g's suggestion).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/31acb0fc
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/31acb0fc
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/31acb0fc
Branch: refs/heads/master
Commit: 31acb0fcd5019b0c4f836761499e15566516dc28
Parents: 88d881c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue May 6 07:27:03 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue May 6 07:27:03 2014 +0100
----------------------------------------------------------------------
.../apache/isis/viewer/wicket/ui/pages/PageAbstract.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/31acb0fc/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 11a4400..68aee49 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -253,11 +253,14 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference())));
response.render(new PriorityHeaderItem(CssReferenceHeaderItem.forReference(new CssResourceReference(PageAbstract.class, "cssreset.css"))));
- // this works, but renders slightly differently (even though rendered in same place as own copy)
+ // the following line, using wicket-webjars, does work, but renders slightly differently
+ // (even though the link is rendered in same place as when having the link directly in PageAbstract.html)
// I'm guessing that our bootstrap is customized (was not a 'vanilla' installation).
- // have therefore left in
+ // Am therefore continuing to use our own copy, linked from PageAbstract.html, and have commented the line below out.
+ //
+ // NB: the use of 'current' in the link means to use the version referenced in the pom.xml.
- //response.render(new PriorityHeaderItem(CssHeaderItem.forReference(new WebjarsCssResourceReference("bootstrap/2.3.2/css/bootstrap.css"))));
+ //response.render(new PriorityHeaderItem(CssHeaderItem.forReference(new WebjarsCssResourceReference("bootstrap/current/css/bootstrap.css"))));
response.render(JavaScriptReferenceHeaderItem.forReference(JQUERY_JGROWL_JS));
response.render(JavaScriptReferenceHeaderItem.forReference(JQUERY_LIVEQUERY_JS));