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 2013/03/04 22:58:55 UTC
[11/35] git commit: ISIS-354: minor edits to get the tck demos to
work again
ISIS-354: minor edits to get the tck demos to work again
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b652f274
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b652f274
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b652f274
Branch: refs/heads/dan/ISIS-233-ro
Commit: b652f2741b93a0bf0a7865e446aaf7831ace96a5
Parents: 70111da
Author: Kevin Meyer <ke...@apache.org>
Authored: Sat Mar 2 18:48:47 2013 +0100
Committer: Kevin Meyer <ke...@apache.org>
Committed: Sat Mar 2 18:48:47 2013 +0100
----------------------------------------------------------------------
.../viewer/IsisWicketUnsecuredApplication.java | 13 ++++++++++++-
.../ide/eclipse/launch/viewer-wicket-tck.launch | 2 +-
.../tck/src/main/webapp/WEB-INF/isis.properties | 3 ++-
3 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b652f274/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java
index b4c1eb2..e22ca86 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java
@@ -60,10 +60,12 @@ import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.webapp.WebAppConstants;
import org.apache.isis.core.webapp.config.ResourceStreamSourceForWebInf;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
+import org.apache.isis.viewer.wicket.model.models.BookmarkedPagesModel;
import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
+import org.apache.isis.viewer.wicket.ui.pages.BookmarkedPagesModelProvider;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.isis.viewer.wicket.viewer.integration.isis.WicketServer;
@@ -73,7 +75,7 @@ import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjec
import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjectAdapterMemento;
import org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleForIsis;
-public class IsisWicketUnsecuredApplication extends WebApplication implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, AuthenticationSessionProvider {
+public class IsisWicketUnsecuredApplication extends WebApplication implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, AuthenticationSessionProvider, BookmarkedPagesModelProvider {
private static final long serialVersionUID = 1L;
@@ -108,6 +110,8 @@ public class IsisWicketUnsecuredApplication extends WebApplication implements Co
@Inject
private IsisSystem system;
+ private BookmarkedPagesModel bookmarkedPagesModel;
+
// /////////////////////////////////////////////////
// constructor, init
// /////////////////////////////////////////////////
@@ -141,6 +145,8 @@ public class IsisWicketUnsecuredApplication extends WebApplication implements Co
final Injector injector = Guice.createInjector(isisModule, newIsisWicketModule());
injector.injectMembers(this);
+ this.bookmarkedPagesModel = new BookmarkedPagesModel();
+
initWicketComponentInjection(injector);
}
@@ -312,4 +318,9 @@ public class IsisWicketUnsecuredApplication extends WebApplication implements Co
}
}
+ @Override
+ public BookmarkedPagesModel getBookmarkedPagesModel() {
+ return bookmarkedPagesModel;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b652f274/component/viewer/wicket/tck/ide/eclipse/launch/viewer-wicket-tck.launch
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/ide/eclipse/launch/viewer-wicket-tck.launch b/component/viewer/wicket/tck/ide/eclipse/launch/viewer-wicket-tck.launch
index 0d64b48..a50d466 100644
--- a/component/viewer/wicket/tck/ide/eclipse/launch/viewer-wicket-tck.launch
+++ b/component/viewer/wicket/tck/ide/eclipse/launch/viewer-wicket-tck.launch
@@ -14,6 +14,6 @@
<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.wicket-tck"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="isis-viewer-wicket-tck"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
</launchConfiguration>
http://git-wip-us.apache.org/repos/asf/isis/blob/b652f274/component/viewer/wicket/tck/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/isis.properties b/component/viewer/wicket/tck/src/main/webapp/WEB-INF/isis.properties
index 87193f7..dd19d22 100644
--- a/component/viewer/wicket/tck/src/main/webapp/WEB-INF/isis.properties
+++ b/component/viewer/wicket/tck/src/main/webapp/WEB-INF/isis.properties
@@ -56,8 +56,9 @@ isis.user-profile-store=in-memory
isis.persistor=in-memory
#isis.xmlos.dir=/tmp/xml
+isis.authentication=bypass
###############################
# wicket-viewer specific
###############################
-isis.reflector.facets.include=org.apache.isis.viewer.wicket.metamodel.wizardpagedesc.WizardPageDescriptionAnnotationFacetFactory
+#isis.reflector.facets.include=org.apache.isis.viewer.wicket.metamodel.wizardpagedesc.WizardPageDescriptionAnnotationFacetFactory