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 2012/09/17 22:28:40 UTC
svn commit: r1386814 [2/2] - in /incubator/isis/trunk/framework:
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/
core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/
core/metamodel/src/main...
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java Mon Sep 17 20:28:37 2012
@@ -25,7 +25,7 @@ import java.util.Locale;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.util.convert.IConverter;
-import org.apache.wicket.util.convert.converters.AbstractIntegerConverter;
+import org.apache.wicket.util.convert.converter.AbstractIntegerConverter;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumeric;
@@ -60,9 +60,26 @@ public class JavaMathBigIntegerPanel ext
return new TextField<BigInteger>(ID_SCALAR_VALUE, new TextFieldValueModel<BigInteger>(this), BigInteger.class) {
private static final long serialVersionUID = 1L;
+// @Override
+// public IConverter getConverter(Class<?> type) {
+// return type == BigInteger.class? CONVERTER: super.getConverter(type);
+// }
+
@Override
- public IConverter getConverter(Class<?> type) {
- return type == BigInteger.class? CONVERTER: super.getConverter(type);
+ public <C> IConverter<C> getConverter(Class<C> type) {
+ @SuppressWarnings("unchecked")
+ final IConverter<C> converter = (IConverter<C>) new AbstractIntegerConverter<BigInteger>() {
+ private static final long serialVersionUID = 1L;
+ @Override
+ public BigInteger convertToObject(String value, Locale locale) {
+ return new BigInteger(value);
+ }
+ @Override
+ protected Class<BigInteger> getTargetType() {
+ return BigInteger.class;
+ }
+ };
+ return type == BigInteger.class? converter: super.getConverter(type);
}
};
}
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java Mon Sep 17 20:28:37 2012
@@ -15,7 +15,7 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars.string;
-import org.apache.wicket.behavior.SimpleAttributeModifier;
+import org.apache.wicket.AttributeModifier;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.model.Model;
@@ -57,7 +57,8 @@ public class MultiLineStringPanel extend
}
}
});
- textField.add(new SimpleAttributeModifier("rows", Integer.toString(numberOfLines)));
+ //textField.add(new SimpleAttributeModifier("rows", Integer.toString(numberOfLines)));
+ textField.add(AttributeModifier.replace("rows", Integer.toString(numberOfLines)));
return textField;
}
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java Mon Sep 17 20:28:37 2012
@@ -19,8 +19,6 @@
package org.apache.isis.viewer.wicket.ui.components.unknown;
-import com.google.common.base.Objects;
-
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButton.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButton.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButton.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButton.java Mon Sep 17 20:28:37 2012
@@ -64,7 +64,8 @@ public class ContainedButton extends Pan
ContainedButton.this.onSubmit();
if (target != null) {
for (final Component component : componentsToRerender) {
- target.addComponent(component);
+ //target.addComponent(component);
+ target.add(component);
}
}
}
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java Mon Sep 17 20:28:37 2012
@@ -80,7 +80,8 @@ public class CssMenuBuilder {
* Protected so can be overridden in testing if required.
*/
protected boolean isExplorationMode() {
- return Application.get().getConfigurationType().equalsIgnoreCase(Application.DEVELOPMENT);
+ //return Application.get().getConfigurationType().equalsIgnoreCase(Application.DEVELOPMENT);
+ return Application.get().usesDeploymentConfig();
}
/**
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java Mon Sep 17 20:28:37 2012
@@ -32,9 +32,6 @@ import org.apache.wicket.model.Model;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
-import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet;
-import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.util.Mementos;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css Mon Sep 17 20:28:37 2012
@@ -20,8 +20,8 @@
#header {
width: 100%;
- height: 125px;
- background: url(banner.png) left no-repeat;
+ height: 25px;
+ /*background: url(banner.png) left no-repeat;*/
}
#header h1 {
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java Mon Sep 17 20:28:37 2012
@@ -23,13 +23,13 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
@@ -50,6 +50,8 @@ import org.apache.isis.viewer.wicket.ui.
*/
public abstract class PageAbstract extends WebPage {
+ private static final long serialVersionUID = 1L;
+
public static final String ID_MENU_LINK = "menuLink";
public static final String ID_LOGOUT_LINK = "logoutLink";
public static final String ID_ABOUT_LINK = "aboutLink";
@@ -130,10 +132,6 @@ public abstract class PageAbstract exten
getComponentFactoryRegistry().addOrReplaceComponent(this, componentType, model);
}
- @Override
- protected void onRender(final MarkupStream markupStream) {
- super.onRender(markupStream);
- }
/**
* Renders the application-supplied CSS, if any.
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.java Mon Sep 17 20:28:37 2012
@@ -19,8 +19,8 @@
package org.apache.isis.viewer.wicket.ui.pages.about;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.viewer.wicket.model.models.AboutModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/action/ActionPage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/action/ActionPage.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/action/ActionPage.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/action/ActionPage.java Mon Sep 17 20:28:37 2012
@@ -19,9 +19,9 @@
package org.apache.isis.viewer.wicket.ui.pages.action;
-import org.apache.wicket.PageParameters;
-import org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java Mon Sep 17 20:28:37 2012
@@ -19,8 +19,8 @@
package org.apache.isis.viewer.wicket.ui.pages.entity;
-import org.apache.wicket.PageParameters;
-import org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java Mon Sep 17 20:28:37 2012
@@ -19,9 +19,9 @@
package org.apache.isis.viewer.wicket.ui.pages.home;
-import org.apache.wicket.PageParameters;
-import org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.viewer.wicket.model.models.WelcomeModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java Mon Sep 17 20:28:37 2012
@@ -19,9 +19,9 @@
package org.apache.isis.viewer.wicket.ui.pages.login;
-import org.apache.wicket.PageParameters;
-import org.apache.wicket.authentication.pages.SignInPage;
+import org.apache.wicket.authroles.authentication.pages.SignInPage;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.viewer.wicket.ui.app.cssrenderer.ApplicationCssRenderer;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/AjaxButtonWithPreSubmitHook.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/AjaxButtonWithPreSubmitHook.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/AjaxButtonWithPreSubmitHook.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/AjaxButtonWithPreSubmitHook.java Mon Sep 17 20:28:37 2012
@@ -3,7 +3,7 @@ package org.apache.isis.viewer.wicket.ui
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.model.IModel;
-public abstract class AjaxButtonWithPreSubmitHook extends AjaxButton implements IFormSubmittingComponentWithPreSubmitHook {
+public abstract class AjaxButtonWithPreSubmitHook extends AjaxButton implements IFormSubmitterWithPreSubmitHook {
private static final long serialVersionUID = 1L;
public AjaxButtonWithPreSubmitHook(String id, IModel<String> model) {
super(id, model);
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ButtonWithPreSubmitHook.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ButtonWithPreSubmitHook.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ButtonWithPreSubmitHook.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ButtonWithPreSubmitHook.java Mon Sep 17 20:28:37 2012
@@ -3,7 +3,7 @@ package org.apache.isis.viewer.wicket.ui
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.model.IModel;
-public abstract class ButtonWithPreSubmitHook extends Button implements IFormSubmittingComponentWithPreSubmitHook {
+public abstract class ButtonWithPreSubmitHook extends Button implements IFormSubmitterWithPreSubmitHook {
private static final long serialVersionUID = 1L;
public ButtonWithPreSubmitHook(String id, IModel<String> model) {
super(id, model);
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java Mon Sep 17 20:28:37 2012
@@ -21,12 +21,14 @@ package org.apache.isis.viewer.wicket.ui
import java.util.List;
-import org.apache.wicket.ResourceReference;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.IHeaderContributor;
-import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.IFormSubmitter;
import org.apache.wicket.markup.html.form.IFormSubmittingComponent;
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;
@@ -71,7 +73,8 @@ public abstract class FormAbstract<T> ex
*/
protected void renderHead(final IHeaderResponse response, final Class<?> cls) {
final String url = cls.getSimpleName() + ".css";
- response.renderCSSReference(new ResourceReference(cls, url));
+ //response.renderCSSReference(new PackageResourceReference(cls, url));
+ response.render(CssHeaderItem.forReference(new CssResourceReference(cls, url)));
}
@@ -80,9 +83,9 @@ public abstract class FormAbstract<T> ex
// ///////////////////////////////////////////////////////////////////
@Override
- public void process(IFormSubmittingComponent submittingComponent) {
- if(submittingComponent instanceof IFormSubmittingComponentWithPreSubmitHook) {
- IFormSubmittingComponentWithPreSubmitHook componentWithPreSubmitHook = (IFormSubmittingComponentWithPreSubmitHook) submittingComponent;
+ public void process(IFormSubmitter submittingComponent) {
+ if(submittingComponent instanceof IFormSubmitterWithPreSubmitHook) {
+ IFormSubmitterWithPreSubmitHook componentWithPreSubmitHook = (IFormSubmitterWithPreSubmitHook) submittingComponent;
componentWithPreSubmitHook.preSubmit();
}
super.process(submittingComponent);
Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmitterWithPreSubmitHook.java (from r1386804, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmittingComponentWithPreSubmitHook.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmitterWithPreSubmitHook.java?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmitterWithPreSubmitHook.java&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmittingComponentWithPreSubmitHook.java&r1=1386804&r2=1386814&rev=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmittingComponentWithPreSubmitHook.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/IFormSubmitterWithPreSubmitHook.java Mon Sep 17 20:28:37 2012
@@ -1,5 +1,5 @@
package org.apache.isis.viewer.wicket.ui.panels;
-public interface IFormSubmittingComponentWithPreSubmitHook {
+public interface IFormSubmitterWithPreSubmitHook {
void preSubmit();
}
\ No newline at end of file
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java Mon Sep 17 20:28:37 2012
@@ -24,12 +24,13 @@ import java.util.List;
import com.google.inject.Inject;
import org.apache.wicket.Component;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.Session;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.IHeaderContributor;
-import org.apache.wicket.markup.html.IHeaderResponse;
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;
@@ -57,6 +58,8 @@ public abstract class PanelAbstract<T ex
*
* @see #setComponentFactoryRegistry(ComponentFactoryRegistry)
*/
+ @javax.inject.Inject
+ @Inject
private ComponentFactoryRegistry componentFactoryRegistry;
public PanelAbstract(final ComponentType componentType) {
@@ -129,7 +132,8 @@ public abstract class PanelAbstract<T ex
*/
protected void renderHead(final IHeaderResponse response, final Class<?> cls) {
final String url = cls.getSimpleName() + ".css";
- response.renderCSSReference(new ResourceReference(cls, url));
+ //response.renderCSSReference(new ResourceReference(cls, url));
+ response.render(CssHeaderItem.forReference(new CssResourceReference(cls, url)));
}
// ///////////////////////////////////////////////////////////////////
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java Mon Sep 17 20:28:37 2012
@@ -29,7 +29,7 @@ import com.google.common.collect.Collect
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
-import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.java Mon Sep 17 20:28:37 2012
@@ -19,7 +19,7 @@
package org.apache.isis.viewer.wicket.ui.tabs;
-import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.model.IModel;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/EvenOrOddCssClassAppenderFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/EvenOrOddCssClassAppenderFactory.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/EvenOrOddCssClassAppenderFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/EvenOrOddCssClassAppenderFactory.java Mon Sep 17 20:28:37 2012
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.wicket.ui.util;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
+
public class EvenOrOddCssClassAppenderFactory {
@@ -36,7 +37,8 @@ public class EvenOrOddCssClassAppenderFa
private EvenOrOddCssClassAppenderFactory.EvenOrOdd eo = EvenOrOdd.EVEN;
- public IBehavior nextClass() {
+ //public IBehavior nextClass() {
+ public Behavior nextClass() {
final String className = eo.className();
eo = eo.next();
return new CssClassAppender(className);
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Links.java Mon Sep 17 20:28:37 2012
@@ -1,11 +1,11 @@
package org.apache.isis.viewer.wicket.ui.util;
import org.apache.wicket.Page;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.form.SubmitLink;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
public final class Links {
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/zzz/cssplaytime/CssPlaytimePage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/zzz/cssplaytime/CssPlaytimePage.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/zzz/cssplaytime/CssPlaytimePage.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/zzz/cssplaytime/CssPlaytimePage.java Mon Sep 17 20:28:37 2012
@@ -19,7 +19,7 @@
package org.apache.isis.viewer.wicket.ui.zzz.cssplaytime;
-import org.apache.wicket.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/pom.xml?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/pom.xml Mon Sep 17 20:28:37 2012
@@ -92,10 +92,12 @@
<artifactId>wicket-auth-roles</artifactId>
</dependency>
+<!--
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>scriptaculous</artifactId>
</dependency>
+-->
<dependency>
<groupId>com.google.guava</groupId>
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/images/Images.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/images/Images.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/images/Images.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/images/Images.java Mon Sep 17 20:28:37 2012
@@ -19,7 +19,7 @@
package images;
-import org.apache.wicket.markup.html.PackageResource;
+import org.apache.wicket.request.resource.PackageResource;
/**
* This is a bit of a hack, but the Isis convention is to plonk all the images
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java Mon Sep 17 20:28:37 2012
@@ -30,23 +30,21 @@ import com.google.inject.Injector;
import com.google.inject.Module;
import org.apache.wicket.Application;
+import org.apache.wicket.ConverterLocator;
import org.apache.wicket.IConverterLocator;
import org.apache.wicket.Page;
-import org.apache.wicket.Request;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.Response;
-import org.apache.wicket.authentication.AuthenticatedWebApplication;
-import org.apache.wicket.authentication.AuthenticatedWebSession;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.guice.GuiceComponentInjector;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.IHeaderContributor;
-import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
-import org.apache.wicket.protocol.http.WebRequest;
-import org.apache.wicket.settings.IApplicationSettings;
-import org.apache.wicket.settings.IRequestCycleSettings;
+import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Response;
+import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
-import org.apache.wicket.util.convert.ConverterLocator;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
@@ -127,7 +125,7 @@ public class IsisWicketApplication exten
private static final long serialVersionUID = 1L;
- private static final String WICKET_CONFIGURATION_TYPE_DEVELOPMENT = Application.DEVELOPMENT;
+ //private static final String WICKET_CONFIGURATION_TYPE_DEVELOPMENT = Application.DEVELOPMENT;
/**
* Convenience locator, downcasts inherited functionality.
@@ -183,6 +181,13 @@ public class IsisWicketApplication exten
@Override
protected void init() {
super.init();
+
+ // 6.0.0 rather than overriding getRequestCycleSettings
+ getRequestCycleSettings().setRenderStrategy(RenderStrategy.REDIRECT_TO_RENDER);
+ // 6.0.0 instead of subclassing newRequestCycle
+ getRequestCycleListeners().add(new WebRequestCycleForIsis());
+
+
getResourceSettings().setParentFolderPlaceholder("$up$");
final DeploymentType deploymentType = determineDeploymentType();
@@ -192,6 +197,7 @@ public class IsisWicketApplication exten
final IsisModule isisModule = newIsisModule(deploymentType, isisConfigurationBuilder);
final Injector injector = Guice.createInjector(isisModule, newIsisWicketModule());
injector.injectMembers(this);
+
initWicketComponentInjection(injector);
}
@@ -201,7 +207,8 @@ public class IsisWicketApplication exten
}
private DeploymentType determineDeploymentType() {
- if (getConfigurationType().equalsIgnoreCase(WICKET_CONFIGURATION_TYPE_DEVELOPMENT)) {
+ if (usesDevelopmentConfig()) {
+ //if (getConfigurationType().equalsIgnoreCase(WICKET_CONFIGURATION_TYPE_DEVELOPMENT)) {
return new WicketServerPrototype();
} else {
return new WicketServer();
@@ -229,7 +236,7 @@ public class IsisWicketApplication exten
}
protected void initWicketComponentInjection(final Injector injector) {
- addComponentInstantiationListener(new GuiceComponentInjector(this, injector));
+ getComponentInstantiationListeners().add(new GuiceComponentInjector(this, injector));
}
/**
@@ -243,12 +250,12 @@ public class IsisWicketApplication exten
// Wicket Hooks
// /////////////////////////////////////////////////
- @Override
- public IRequestCycleSettings getRequestCycleSettings() {
- final IRequestCycleSettings requestCycleSettings = super.getRequestCycleSettings();
- requestCycleSettings.setRenderStrategy(IRequestCycleSettings.REDIRECT_TO_RENDER);
- return requestCycleSettings;
- }
+// @Override
+// public IRequestCycleSettings getRequestCycleSettings() {
+// final IRequestCycleSettings requestCycleSettings = super.getRequestCycleSettings();
+// requestCycleSettings.setRenderStrategy(IRequestCycleSettings.REDIRECT_TO_RENDER);
+// return requestCycleSettings;
+// }
/**
* Installs a {@link AuthenticatedWebSessionForIsis custom implementation}
@@ -263,19 +270,19 @@ public class IsisWicketApplication exten
return AuthenticatedWebSessionForIsis.class;
}
- /**
- * Installs a {@link WebRequestCycleForIsis custom implementation} of
- * Wicket's own {@link RequestCycle}, hooking in to provide session and
- * transaction management across potentially multiple concurrent requests
- * for the same Wicket session.
- *
- * <p>
- * In general, it shouldn't be necessary to override this method.
- */
- @Override
- public RequestCycle newRequestCycle(final Request request, final Response response) {
- return new WebRequestCycleForIsis(this, (WebRequest) request, response);
- }
+// /**
+// * Installs a {@link WebRequestCycleForIsis custom implementation} of
+// * Wicket's own {@link RequestCycle}, hooking in to provide session and
+// * transaction management across potentially multiple concurrent requests
+// * for the same Wicket session.
+// *
+// * <p>
+// * In general, it shouldn't be necessary to override this method.
+// */
+// @Override
+// public RequestCycle newRequestCycle(final Request request, final Response response) {
+// return new WebRequestCycleForIsis(this, (WebRequest) request, response);
+// }
/**
* Installs a {@link ConverterLocator} preconfigured with a number of
@@ -317,8 +324,9 @@ public class IsisWicketApplication exten
if (cssUrl == null) {
return;
}
- final IHeaderResponse headerResponse = container.getHeaderResponse();
- headerResponse.renderCSSReference(cssUrl);
+ final IHeaderResponse response = container.getHeaderResponse();
+ //headerResponse.renderCSSReference(cssUrl);
+ response.render(CssHeaderItem.forReference(new CssResourceReference(this.getClass(), cssUrl)));
}
// /////////////////////////////////////////////////
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java Mon Sep 17 20:28:37 2012
@@ -19,25 +19,30 @@
package org.apache.isis.viewer.wicket.viewer;
+import images.Images;
+
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Module;
import org.apache.wicket.Application;
+import org.apache.wicket.ConverterLocator;
import org.apache.wicket.IConverterLocator;
import org.apache.wicket.Page;
-import org.apache.wicket.Request;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.Response;
import org.apache.wicket.Session;
import org.apache.wicket.guice.GuiceComponentInjector;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.IHeaderContributor;
-import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.WebRequest;
-import org.apache.wicket.util.convert.ConverterLocator;
+import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Response;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.request.resource.CssResourceReference;
+import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
@@ -79,7 +84,7 @@ public class IsisWicketUnsecuredApplicat
private static final long serialVersionUID = 1L;
- private static final String WICKET_CONFIGURATION_TYPE_DEVELOPMENT = Application.DEVELOPMENT;
+ //private static final String WICKET_CONFIGURATION_TYPE_DEVELOPMENT = Application.DEVELOPMENT;
/**
* Convenience locator, downcasts inherited functionality.
@@ -135,8 +140,15 @@ public class IsisWicketUnsecuredApplicat
@Override
protected void init() {
super.init();
- getResourceSettings().setParentFolderPlaceholder("$up$");
+ // 6.0.0 rather than overriding getRequestCycleSettings
+ getRequestCycleSettings().setRenderStrategy(RenderStrategy.REDIRECT_TO_RENDER);
+ // 6.0.0 instead of subclassing newRequestCycle
+ getRequestCycleListeners().add(new WebRequestCycleForIsis());
+
+
+
+ getResourceSettings().setParentFolderPlaceholder("$up$");
final DeploymentType deploymentType = determineDeploymentType();
final IsisConfigurationBuilder isisConfigurationBuilder = createConfigBuilder();
@@ -149,7 +161,8 @@ public class IsisWicketUnsecuredApplicat
}
private DeploymentType determineDeploymentType() {
- if (getConfigurationType().equalsIgnoreCase(WICKET_CONFIGURATION_TYPE_DEVELOPMENT)) {
+ if(usesDevelopmentConfig()) {
+ //if (getConfigurationType().equalsIgnoreCase(WICKET_CONFIGURATION_TYPE_DEVELOPMENT)) {
return new WicketServerPrototype();
} else {
return new WicketServer();
@@ -165,7 +178,7 @@ public class IsisWicketUnsecuredApplicat
}
protected void initWicketComponentInjection(final Injector injector) {
- addComponentInstantiationListener(new GuiceComponentInjector(this, injector));
+ getComponentInstantiationListeners().add(new GuiceComponentInjector(this, injector));
}
/**
@@ -215,19 +228,19 @@ public class IsisWicketUnsecuredApplicat
return authenticationManager;
}
- /**
- * Installs a {@link WebRequestCycleForIsis custom implementation} of
- * Wicket's own {@link RequestCycle}, hooking in to provide session and
- * transaction management across potentially multiple concurrent requests
- * for the same Wicket session.
- *
- * <p>
- * In general, it shouldn't be necessary to override this method.
- */
- @Override
- public RequestCycle newRequestCycle(final Request request, final Response response) {
- return new WebRequestCycleForIsis(this, (WebRequest) request, response);
- }
+// /**
+// * Installs a {@link WebRequestCycleForIsis custom implementation} of
+// * Wicket's own {@link RequestCycle}, hooking in to provide session and
+// * transaction management across potentially multiple concurrent requests
+// * for the same Wicket session.
+// *
+// * <p>
+// * In general, it shouldn't be necessary to override this method.
+// */
+// @Override
+// public RequestCycle newRequestCycle(final Request request, final Response response) {
+// return new WebRequestCycleForIsis(this, (WebRequest) request, response);
+// }
/**
* Installs a {@link ConverterLocator} preconfigured with a number of
@@ -269,8 +282,9 @@ public class IsisWicketUnsecuredApplicat
if (cssUrl == null) {
return;
}
- final IHeaderResponse headerResponse = container.getHeaderResponse();
- headerResponse.renderCSSReference(cssUrl);
+ final IHeaderResponse response = container.getHeaderResponse();
+ //response.renderCSSReference(cssUrl);
+ response.render(CssHeaderItem.forReference(new CssResourceReference(this.getClass(), cssUrl)));
}
// /////////////////////////////////////////////////
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java Mon Sep 17 20:28:37 2012
@@ -28,7 +28,8 @@ import java.util.Map;
import com.google.common.collect.Maps;
import com.google.inject.Singleton;
-import org.apache.wicket.markup.html.PackageResource;
+import org.apache.wicket.request.resource.PackageResource;
+import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
@@ -77,12 +78,12 @@ public class ImageCacheClassPath impleme
}
private PackageResource findImageSuffixed(final String imageName) {
- for (final String imageSuffix : IMAGE_SUFFICES) {
- final String path = buildImagePath(imageName, imageSuffix);
- if (PackageResource.exists(Images.class, path, null, null)) {
- return PackageResource.get(Images.class, path);
- }
- }
+// for (final String imageSuffix : IMAGE_SUFFICES) {
+// final String path = buildImagePath(imageName, imageSuffix);
+// if (PackageResource.exists(Images.class, path, null, null, null)) {
+// return PackageResource.get(Images.class, path);
+// }
+// }
return null;
}
@@ -93,26 +94,27 @@ public class ImageCacheClassPath impleme
}
private PackageResource findImageSearchUpHierarchy(final ObjectSpecification noSpec) {
- for (final String imageSuffix : IMAGE_SUFFICES) {
- final String fullName = noSpec.getFullIdentifier();
- final String path = buildImagePath(fullName, imageSuffix);
- if (PackageResource.exists(Images.class, path, null, null)) {
- return PackageResource.get(Images.class, path);
- }
- }
- for (final String imageSuffix : IMAGE_SUFFICES) {
- final String shortName = noSpec.getShortIdentifier();
- final String path = buildImagePath(shortName, imageSuffix);
- if (PackageResource.exists(Images.class, path, null, null)) {
- return PackageResource.get(Images.class, path);
- }
- }
+// for (final String imageSuffix : IMAGE_SUFFICES) {
+// final String fullName = noSpec.getFullIdentifier();
+// final String path = buildImagePath(fullName, imageSuffix);
+// if (PackageResource.exists(Images.class, path, null, null, null)) {
+// return PackageResource.get(Images.class, path);
+// }
+// }
+// for (final String imageSuffix : IMAGE_SUFFICES) {
+// final String shortName = noSpec.getShortIdentifier();
+// final String path = buildImagePath(shortName, imageSuffix);
+// if (PackageResource.exists(Images.class, path, null, null, null)) {
+// return PackageResource.get(Images.class, path);
+// }
+// }
final ObjectSpecification superSpec = noSpec.superclass();
if (superSpec != null) {
return findAndCacheImage(superSpec);
}
// fallback
- return PackageResource.get(Images.class, "Default.png");
+// return PackageResource.get(Images.class, "Default.png");
+ return null;
}
private String buildImagePath(final String name, final String imageSuffix) {
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/IsisContextForWicket.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/IsisContextForWicket.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/IsisContextForWicket.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/IsisContextForWicket.java Mon Sep 17 20:28:37 2012
@@ -27,6 +27,7 @@ import com.google.common.base.Function;
import com.google.common.collect.Collections2;
import com.google.common.collect.Maps;
+import org.apache.log4j.Logger;
import org.apache.wicket.Session;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
@@ -49,6 +50,8 @@ import org.apache.isis.viewer.wicket.vie
*/
public class IsisContextForWicket extends IsisContext {
+ private static final Logger LOG = Logger.getLogger(IsisContextForWicket.class);
+
public static class WicketContextCategory extends ContextCategory {
@Override
@@ -131,18 +134,30 @@ public class IsisContextForWicket extend
// there could be multiple threads using a session.
final AuthenticatedWebSessionForIsis webSession = (AuthenticatedWebSessionForIsis) Session.get();
- webSession.registerUseByThread();
-
- IsisSession isisSession = sessionMap.get(webSession);
- if (isisSession == null) {
- isisSession = getSessionFactoryInstance().openSession(authSession);
- // put into map prior to opening, so that subsequent calls to
- // getSessionInstance() will find this new session.
- sessionMap.put(webSession, isisSession);
- isisSession.open();
+ synchronized (webSession) {
+ final String webSessionId = webSession.getId();
+
+ final int before = webSession.getThreadUsage();
+ webSession.registerUseByThread();
+ final int after = webSession.getThreadUsage();
+
+ final String logMsg;
+ IsisSession isisSession = sessionMap.get(webSession);
+ if (isisSession == null) {
+ isisSession = getSessionFactoryInstance().openSession(authSession);
+ // put into map prior to opening, so that subsequent calls to
+ // getSessionInstance() will find this new session.
+ sessionMap.put(webSession, isisSession);
+ isisSession.open();
+
+ logMsg = "NEW ";
+ } else {
+ logMsg = "BUMP_UP";
+ }
+ LOG.debug(String.format("webSession: %s OPEN %d -> %d %s %s", webSessionId, before, after, logMsg, isisSession.getId()));
+
+ return isisSession;
}
-
- return isisSession;
}
@Override
@@ -161,21 +176,33 @@ public class IsisContextForWicket extend
private synchronized void closeSessionOrDeregisterUsageOnExisting() {
final AuthenticatedWebSessionForIsis webSession = (AuthenticatedWebSessionForIsis) Session.get();
- final boolean shouldClose = webSession.deregisterUseByThread();
+ synchronized (webSession) {
+ final String webSessionId = webSession.getId();
+
+ final int before = webSession.getThreadUsage();
+ final boolean shouldClose = webSession.deregisterUseByThread();
+ final int after = webSession.getThreadUsage();
+
+ final IsisSession isisSession = sessionMap.get(webSession);
+
+ final String logMsg;
+ if (isisSession == null) {
+ // nothing to be done !?!?
+ logMsg = "NO_SESSION";
+ } else {
+ if (shouldClose) {
+ isisSession.close();
+ // remove after closing, so that any calls to getSessionInstance()
+ // made while closing will still find this session
+ sessionMap.remove(webSession);
+ logMsg = "DISCARDING";
+ } else {
+ logMsg = "BUMP_DOWN ";
+ }
+ }
- final IsisSession isisSession = sessionMap.get(webSession);
- if (isisSession == null) {
- // nothing to be done
- return;
+ LOG.debug(String.format("webSession: %s CLOSE %d -> %d %s %s", webSessionId, before, after, logMsg, (isisSession != null? isisSession.getId(): "[null]")));
}
-
- if (shouldClose) {
- isisSession.close();
- // remove after closing, so that any calls to getSessionInstance()
- // made while closing will still find this session
- sessionMap.remove(webSession);
- }
-
}
@Override
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java Mon Sep 17 20:28:37 2012
@@ -19,8 +19,8 @@
package org.apache.isis.viewer.wicket.viewer.integration.wicket;
-import org.apache.wicket.Request;
import org.apache.wicket.Session;
+import org.apache.wicket.request.Request;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java Mon Sep 17 20:28:37 2012
@@ -26,11 +26,11 @@ import static org.hamcrest.Matchers.null
import java.util.Arrays;
import java.util.List;
-import org.apache.wicket.Request;
import org.apache.wicket.Session;
-import org.apache.wicket.authentication.AuthenticatedWebSession;
-import org.apache.wicket.authorization.strategies.role.Roles;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
+import org.apache.wicket.authroles.authorization.strategies.role.Roles;
import org.apache.wicket.protocol.http.request.WebClientInfo;
+import org.apache.wicket.request.Request;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
@@ -107,11 +107,13 @@ public class AuthenticatedWebSessionForI
* Session; for example to obtain img resources for entities. This counter
* keeps track of one of these threadUsages, when it gets back down to zero
* then we can close the thread.
+ * @return
*
* @see #deregisterUseByThread()
*/
- public void registerUseByThread() {
+ public int registerUseByThread() {
threadUsages++;
+ return getThreadUsage();
}
/**
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java Mon Sep 17 20:28:37 2012
@@ -21,15 +21,14 @@ package org.apache.isis.viewer.wicket.vi
import java.util.Locale;
+import org.apache.wicket.util.convert.IConverter;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
-import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
-import org.apache.wicket.util.convert.IConverter;
/**
* Implementation of a Wicket {@link IConverter} for {@link ObjectAdapter}s,
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java Mon Sep 17 20:28:37 2012
@@ -22,6 +22,8 @@ package org.apache.isis.viewer.wicket.vi
import java.util.Locale;
import org.apache.commons.lang.StringUtils;
+import org.apache.wicket.util.convert.IConverter;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
@@ -32,7 +34,6 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.wicket.util.convert.IConverter;
/**
* Implementation of a Wicket {@link IConverter} for
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java Mon Sep 17 20:28:37 2012
@@ -20,11 +20,9 @@
package org.apache.isis.viewer.wicket.viewer.integration.wicket;
import org.apache.log4j.Logger;
-import org.apache.wicket.Response;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.WebRequest;
-import org.apache.wicket.protocol.http.WebRequestCycle;
-import org.apache.wicket.protocol.http.request.WebClientInfo;
+import org.apache.wicket.protocol.http.WebSession;
+import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
@@ -37,25 +35,29 @@ import org.apache.isis.runtimes.dflt.run
* automatically opening a {@link IsisSession} at the beginning of the request
* and committing the transaction and closing the session at the end.
*/
-public class WebRequestCycleForIsis extends WebRequestCycle {
+public class WebRequestCycleForIsis /*extends WebRequestCycle*/ extends AbstractRequestCycleListener {
private static final Logger LOG = Logger.getLogger(WebRequestCycleForIsis.class);
- public WebRequestCycleForIsis(final WebApplication application, final WebRequest request, final Response response) {
- super(application, request, response);
- }
-
- /**
- * Convenience, downcasts.
- */
- @Override
- public AuthenticatedWebSessionForIsis getWebSession() {
- return (AuthenticatedWebSessionForIsis) super.getWebSession();
- }
+// public WebRequestCycleForIsis(final WebApplication application, final WebRequest request, final Response response) {
+// super(application, request, response);
+// }
+//
+// /**
+// * Convenience, downcasts.
+// */
+// @Override
+// public AuthenticatedWebSessionForIsis getWebSession() {
+// return (AuthenticatedWebSessionForIsis) super.getWebSession();
+// }
+
+ private AuthenticatedWebSessionForIsis getWebSession() {
+ return (AuthenticatedWebSessionForIsis) WebSession.get();
+ }
@Override
- protected synchronized void onBeginRequest() {
- super.onBeginRequest();
+ public synchronized void onBeginRequest(RequestCycle requestCycle) {
+ //super.onBeginRequest();
final AuthenticatedWebSessionForIsis wicketSession = getWebSession();
if (wicketSession == null) {
return;
@@ -73,14 +75,14 @@ public class WebRequestCycleForIsis exte
}
@Override
- protected synchronized void onEndRequest() {
+ public synchronized void onEndRequest(RequestCycle requestCycle) {
final IsisSession session = getIsisContext().getSessionInstance();
if (session != null) {
// in session
commitTransactionIfAny();
getIsisContext().closeSessionInstance();
}
- super.onEndRequest();
+ //super.onEndRequest();
}
private void commitTransactionIfAny() {
@@ -101,13 +103,13 @@ public class WebRequestCycleForIsis exte
return IsisContext.getInstance();
}
- /**
- * Simply downcasts superclass' implementation, for convenience of callers.
- */
- @Override
- protected WebClientInfo newClientInfo() {
- return (WebClientInfo) super.newClientInfo();
- }
+// /**
+// * Simply downcasts superclass' implementation, for convenience of callers.
+// */
+// @Override
+// protected WebClientInfo newClientInfo() {
+// return (WebClientInfo) super.newClientInfo();
+// }
protected IsisTransactionManager getTransactionManager() {
return IsisContext.getTransactionManager();
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java Mon Sep 17 20:28:37 2012
@@ -37,14 +37,13 @@ import org.apache.isis.viewer.wicket.ui.
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.unresolved.CollectionContentsAsUnresolvedFactory;
import org.apache.isis.viewer.wicket.ui.components.empty.EmptyCollectionPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.blocks.icontitle.EntityIconAndTitlePanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.entity.blocks.propcoll.EntityCollectionsReadOnlyFormPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.blocks.propcoll.EntityCollectionsPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.blocks.propcoll.EntityCollectionsReadOnlyFormPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.blocks.propcoll.EntityPropertiesAndCollectionsPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.blocks.propcoll.EntityPropertiesPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.blocks.summary.EntitySummaryPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.combined.EntityCombinedPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.selector.EntitySelectorFactory;
-import org.apache.isis.viewer.wicket.ui.components.entity.tabbed.EntityTabbedPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisColorPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisDatePanelFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisDateTimePanelFactory;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java Mon Sep 17 20:28:37 2012
@@ -19,7 +19,6 @@
package org.apache.isis.viewer.wicket.viewer.registries.components;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Defaults.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Defaults.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Defaults.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Defaults.java Mon Sep 17 20:28:37 2012
@@ -25,12 +25,13 @@ import static org.hamcrest.Matchers.null
import static org.junit.Assert.assertThat;
import org.apache.wicket.IConverterLocator;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.Response;
-import org.apache.wicket.authentication.AuthenticatedWebSession;
-import org.apache.wicket.protocol.http.WebRequest;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
+import org.apache.wicket.request.Response;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebRequest;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -63,12 +64,13 @@ public class IsisWicketApplication_Defau
assertThat(webSessionClass.equals(AuthenticatedWebSessionForIsis.class), is(true));
}
+ @Ignore // 6.0.0 does it differently
@Test
public void providesCustomRequestCycle() {
- final WebRequest mockRequest = context.mock(WebRequest.class);
- final Response mockResponse = context.mock(Response.class);
- final RequestCycle newRequestCycle = application.newRequestCycle(mockRequest, mockResponse);
- assertThat(newRequestCycle, is(WebRequestCycleForIsis.class));
+// final WebRequest mockRequest = context.mock(WebRequest.class);
+// final Response mockResponse = context.mock(Response.class);
+// final RequestCycle newRequestCycle = application.newRequestCycle(mockRequest, mockResponse);
+// assertThat(newRequestCycle, is(WebRequestCycleForIsis.class));
}
@Test
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java Mon Sep 17 20:28:37 2012
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertTha
import java.util.Locale;
-import org.apache.wicket.Request;
+import org.apache.wicket.request.Request;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java Mon Sep 17 20:28:37 2012
@@ -21,7 +21,7 @@ package org.apache.isis.viewer.wicket.vi
import java.util.Locale;
-import org.apache.wicket.Request;
+import org.apache.wicket.request.Request;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Rule;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java Mon Sep 17 20:28:37 2012
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertTha
import java.util.Locale;
-import org.apache.wicket.Request;
+import org.apache.wicket.request.Request;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_ThreadManagement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_ThreadManagement.java?rev=1386814&r1=1386813&r2=1386814&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_ThreadManagement.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_ThreadManagement.java Mon Sep 17 20:28:37 2012
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertTha
import java.util.Locale;
-import org.apache.wicket.Request;
+import org.apache.wicket.request.Request;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;