Return-Path: X-Original-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 593124E36 for ; Wed, 11 May 2011 11:48:11 +0000 (UTC) Received: (qmail 45070 invoked by uid 500); 11 May 2011 11:48:11 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 45054 invoked by uid 500); 11 May 2011 11:48:11 -0000 Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: isis-dev@incubator.apache.org Delivered-To: mailing list isis-commits@incubator.apache.org Received: (qmail 45047 invoked by uid 99); 11 May 2011 11:48:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 May 2011 11:48:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 May 2011 11:48:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2D6F123889E7; Wed, 11 May 2011 11:47:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1101841 [2/2] - in /incubator/isis/trunk: core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/maxlen/ core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/member/ordering/ core/metamodel/src/main/java/org/apach... Date: Wed, 11 May 2011 11:47:47 -0000 To: isis-commits@incubator.apache.org From: danhaywood@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110511114748.2D6F123889E7@eris.apache.org> Modified: incubator/isis/trunk/src/site/apt/where-to-start.apt URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/site/apt/where-to-start.apt?rev=1101841&r1=1101840&r2=1101841&view=diff ============================================================================== --- incubator/isis/trunk/src/site/apt/where-to-start.apt (original) +++ incubator/isis/trunk/src/site/apt/where-to-start.apt Wed May 11 11:47:45 2011 @@ -27,11 +27,13 @@ Where to Start? mvn archetype:generate \ -D archetypeCatalog=http://incubator.apache.org/isis \ -D archetypeGroupId=org.apache.isis.support \ - -D archetypeArtifactId=quickstart-archetype + -D archetypeArtifactId=quickstart-archetype \ + -D groupId=com.mycompany \ + -D artifactId=myapp +------------------------------------------------------------ - The {{{./quickstart-app.html}quickstart app}} page has an overview + The {{{./quickstart-app.html}quickstart app}} page has more detail of the generated application and how to run it. Note: + org.apache.isis.support quickstart-archetype 0.1.2-incubating-SNAPSHOT - https://repository.apache.org/content/groups/snapshots-group/ + http://repository.apache.org/content/groups/snapshots-group/ Isis Quickstart Archetype @@ -15,7 +13,7 @@ hetype-catalog/1.0.0 http://maven.apache org.apache.isis.support quickstart-archetype 0.1.1-incubating-SNAPSHOT - https://repository.apache.org/content/groups/snapshots-group/ + http://repository.apache.org/content/groups/snapshots-group/ Isis Quickstart Archetype @@ -23,7 +21,7 @@ hetype-catalog/1.0.0 http://maven.apache org.apache.isis.support quickstart-archetype 0.1.0-incubating-SNAPSHOT - https://repository.apache.org/content/groups/snapshots-group/ + http://repository.apache.org/content/groups/snapshots-group/ Isis Quickstart Archetype Modified: incubator/isis/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/site/site.xml?rev=1101841&r1=1101840&r2=1101841&view=diff ============================================================================== --- incubator/isis/trunk/src/site/site.xml (original) +++ incubator/isis/trunk/src/site/site.xml Wed May 11 11:47:45 2011 @@ -78,13 +78,17 @@ href="http://mail-archives.apache.org/mod_mbox/incubator-isis-dev/" /> + + - + Modified: incubator/isis/trunk/support/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml?rev=1101841&r1=1101840&r2=1101841&view=diff ============================================================================== --- incubator/isis/trunk/support/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml (original) +++ incubator/isis/trunk/support/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml Wed May 11 11:47:45 2011 @@ -24,8 +24,8 @@ - StaticContentFilter - org.apache.isis.core.webapp.content.StaticContentFilter + ResourceCachingFilter + org.apache.isis.core.webapp.content.ResourceCachingFilter CacheTime 86400 @@ -33,19 +33,19 @@ - StaticContentFilter + ResourceCachingFilter *.css - StaticContentFilter + ResourceCachingFilter *.png - StaticContentFilter + ResourceCachingFilter *.jpg - StaticContentFilter + ResourceCachingFilter *.gif Modified: incubator/isis/trunk/support/quickstart/viewer-restful/ide/eclipse/launch/quickstart-viewer-restful.launch URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/quickstart/viewer-restful/ide/eclipse/launch/quickstart-viewer-restful.launch?rev=1101841&r1=1101840&r2=1101841&view=diff ============================================================================== --- incubator/isis/trunk/support/quickstart/viewer-restful/ide/eclipse/launch/quickstart-viewer-restful.launch (original) +++ incubator/isis/trunk/support/quickstart/viewer-restful/ide/eclipse/launch/quickstart-viewer-restful.launch Wed May 11 11:47:45 2011 @@ -1,10 +1,10 @@ - + - + Modified: incubator/isis/trunk/support/quickstart/viewer-restful/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/quickstart/viewer-restful/src/main/webapp/WEB-INF/web.xml?rev=1101841&r1=1101840&r2=1101841&view=diff ============================================================================== --- incubator/isis/trunk/support/quickstart/viewer-restful/src/main/webapp/WEB-INF/web.xml (original) +++ incubator/isis/trunk/support/quickstart/viewer-restful/src/main/webapp/WEB-INF/web.xml Wed May 11 11:47:45 2011 @@ -1,18 +1,18 @@ + xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - Restful Claims + Restful Claims - - org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper - - - - isis.viewers - restful - + + org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper + + + + isis.viewers + restful + javax.ws.rs.Application @@ -22,48 +22,78 @@ IsisSessionFilter org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter - - - authenticationSessionLookupStrategy - org.apache.isis.viewer.restful.viewer.authentication.AuthenticationSessionLookupStrategyTrusted - + + + authenticationSessionLookupStrategy + org.apache.isis.viewer.restful.viewer.authentication.AuthenticationSessionLookupStrategyTrusted + + + + + ResourceCachingFilter + org.apache.isis.core.webapp.content.ResourceCachingFilter + + CacheTime + 86400 + - - IsisSessionFilter - * - - - - org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap - - - - RestEasy - org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher - - - - Resource - org.apache.isis.core.webapp.content.ResourceServlet - - - - RestEasy - / - - - - Resource - *.js - - - Resource - *.gif - - - Resource - *.png - + + IsisSessionFilter + * + + + + ResourceCachingFilter + *.js + + + ResourceCachingFilter + *.css + + + ResourceCachingFilter + *.jpg + + + ResourceCachingFilter + *.png + + + ResourceCachingFilter + *.gif + + + + org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap + + + + RestEasy + org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher + + + + Resource + org.apache.isis.core.webapp.content.ResourceServlet + + + + RestEasy + / + + + + Resource + *.js + + + Resource + *.gif + + + Resource + *.png + Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/TextParseableFieldImpl.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/TextParseableFieldImpl.java?rev=1101841&r1=1101840&r2=1101841&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/TextParseableFieldImpl.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/TextParseableFieldImpl.java Wed May 11 11:47:45 2011 @@ -24,11 +24,11 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.consent.Allow; import org.apache.isis.core.metamodel.consent.Consent; import org.apache.isis.core.metamodel.consent.Veto; +import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet; import org.apache.isis.core.metamodel.facets.multiline.MultiLineFacet; import org.apache.isis.core.metamodel.facets.object.parseable.InvalidEntryException; import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet; -import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacet; -import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacet; +import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation; import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java?rev=1101841&r1=1101840&r2=1101841&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java Wed May 11 11:47:45 2011 @@ -21,7 +21,7 @@ package org.apache.isis.viewer.html; import org.apache.isis.core.commons.lang.MapUtils; import org.apache.isis.core.webapp.content.ResourceServlet; -import org.apache.isis.core.webapp.content.StaticContentFilter; +import org.apache.isis.core.webapp.content.ResourceCachingFilter; import org.apache.isis.runtimes.dflt.runtime.Isis; import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.IsisViewerInstallerAbstract; import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewer; @@ -71,7 +71,7 @@ public class HtmlViewerInstaller extends webAppSpec.addServletSpecification(LogonServlet.class, LOGON_PAGE_MAPPED); webAppSpec.addServletSpecification(ControllerServlet.class, DYNAMIC_CONTENT); - webAppSpec.addFilterSpecification(StaticContentFilter.class, MapUtils.asMap("CacheTime", "86400"), + webAppSpec.addFilterSpecification(ResourceCachingFilter.class, MapUtils.asMap("CacheTime", "86400"), STATIC_CONTENT); webAppSpec.addServletSpecification(ResourceServlet.class, STATIC_CONTENT); Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java?rev=1101841&r1=1101840&r2=1101841&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java Wed May 11 11:47:45 2011 @@ -25,9 +25,9 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.adapter.ResolveState; import org.apache.isis.core.metamodel.adapter.util.AdapterUtils; import org.apache.isis.core.metamodel.consent.Consent; +import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet; import org.apache.isis.core.metamodel.facets.multiline.MultiLineFacet; -import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacet; -import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacet; +import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet; import org.apache.isis.core.metamodel.spec.ActionType; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.core.metamodel.spec.feature.ObjectAction; Modified: incubator/isis/trunk/viewer/restful/src/docbkx/guide/isis-restful-viewer.xml URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/src/docbkx/guide/isis-restful-viewer.xml?rev=1101841&r1=1101840&r2=1101841&view=diff ============================================================================== --- incubator/isis/trunk/viewer/restful/src/docbkx/guide/isis-restful-viewer.xml (original) +++ incubator/isis/trunk/viewer/restful/src/docbkx/guide/isis-restful-viewer.xml Wed May 11 11:47:45 2011 @@ -542,7 +542,7 @@ above. - + The Viewer-Restful Module Although the quickrun module is convenient @@ -608,9 +608,21 @@ An Isis session is required in order for the restful viewer to interact with the Isis runtime and interrogate the - metamodel/retrieve domain objects. This is accomplished through the - IsisSessionFilter (defined in the default - runtime, [oai.runtimes.dflt:webapp]): + metamodel/retrieve domain objects. + + The first part of the required configuration is to set up an + Isis "context"; basically a set of factories + that are used to create a session for each subsequent request. This + is done using a context listener (defined in the default + runtime, + [oai.runtimes.dflt:webapp]): + + <listener> + <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class> +</listener> + + The session is created for each request using the + IsisSessionFilter: <filter> <filter-name>IsisSessionFilter</filter-name> @@ -2693,19 +2705,38 @@ public interface UserResource { At some point you'll presumably want to deploy your domain object using restful viewer as a webapp. The quickstart - archetype already sets up the viewer-restful module that will generate a - WAR file; however, you may want to adjust its configuration in terms of - two areas: authentication, and persistence. This chapter discusses these - points. - - - - *** hmmm... just discovered two versions of IsisSessionFilter... one - in - - - - + archetype already sets up the viewer-restful module + that will generate a WAR file; however, you may want to + adjust its configuration in terms of two areas: authentication, and + persistence. This chapter discusses these points. + + + These instructions assume that the restful viewer is being + deployed using the default runtime + (oai.runtimes:dflt). At the time of writing this is + the only runtime available; in the future there may be other runtimes + which will have their own specific deployment requirements + + + + Deployment Modes + + By default the IsisWebAppBootstrapper + context listener (described in ) will bootstrap Isis in the + "SERVER" deployment type. This means that an authentication is required, + that the sessions will be bound as thread-locals, and that the + persistence mechanism will be defaulted appropriately. + + The deployment type can be changed to other settings, though; most + notably you may wish to change to SERVER_EXPLORATION or + SERVER_PROTOTYPE. This is done using a context parameter: + + <context-param> + <param-name>deploymentType</param-name> + <param-value>SERVER_EXPLORATION</param-value> +</context-param> + Authentication @@ -2721,20 +2752,21 @@ public interface UserResource { The restful viewer therefore uses Isis' own authentication mechanism, with authentication performed for each RESTful call. What this means depends - on the deploymentType: + on the deployment type (see ): if running in SERVER_EXPLORATION mode, then authentication is - in effect switched off; no credentials are supplied, and Naked - Objects will use the first exploration user defined in - nakedobjects.properties, or a fallback "exploration" user - otherwise + in effect switched off; no credentials are supplied, and the + framework will use the first exploration user defined in + isis.properties, or a fallback "exploration" + user otherwise For example, if running in SERVER_EXPLORATION mode, then you can specify the user using: - nakedobjects.exploration.users=sven:role1, dick:role2, bob:role1|role2 + isis.exploration.users=sven:role1, dick:role2, bob:role1|role2 @@ -2750,8 +2782,8 @@ public interface UserResource { supports multiple concurrent users. - Calling Restful Objects in SERVER mode with no credentials will - result in an exception: + Running the Restful Objects in SERVER mode with no credentials + will result in an exception: Server mode, no credentials @@ -2782,44 +2814,87 @@ public interface UserResource { - NakedObjectsSessionFilter uses the + IsisSessionFilter uses the authenticationManagerLookupStrategy property to specify a strategy for both finding credentials and for validating - them against the Naked Objects authentication manager. + them against the Apache Isis authentication + manager. - The implementation provided by Restful - Objects - - AuthenticationSessionLookupStrategyExtended - in the package + The restful viewer provides two + additional implementations of this that you can use: + + + + The + oai.viewer.restful.viewer.authentication.AuthenticationSessionLookupStrategyParams + implementation extends the default behaviour by also looking up + credentials using the username and password parameters. Once + validated, it also binds the results to the + HttpSession so that future interactions + do not credentials. + + + + The + oai.viewer.restful.viewer.authentication.AuthenticationSessionLookupStrategyTrusted + implementation ensures that an (exploration) session is always + present (if a session isn't available from the default + implementation). + + + + - + AuthenticationSessionLookupStrategyParams in + the package org.starobjects.restful.viewer.authentication - - is responsible for looking up credentials using the username and - password parameters. Once validated, it also binds the results to - the HttpSession so that future interactions - do not credentials. + - + + In both cases these can be configured using: + + <filter> + <filter-name>IsisSessionFilter</filter-name> + <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class> + <init-param> + <param-name>authenticationSessionLookupStrategy</param-name> + <param-value>org.apache.isis.viewer.restful.viewer.authentication.AuthenticationSessionLookupStrategyTrusted</param-value> + </init-param> +</filter> - If you lookup strategy implementation delegates to the Naked - Objects authentication manager (recommended), you might also want to - change the Naked Objects' - AuthenticationManager implementation itself. - This is done using the - nakedobjects.authentication key in - nakedobjects.properties: + Alternatively, you can change the implementation of + AuthenticationManager that + Isis' delegates to. This is done using the + isis.authentication key in + isis.properties: - isis.authentication=com.mycompany.nakedobjects.authentication.MyAuthenticationManagerInstaller + isis.authentication=com.mycompany.isis.authentication.MyAuthenticationManagerInstaller In the future there will doubtless be standardized (WS-* style) approaches for RESTful authenticatication, but the above should provide enough flexibility in the meantime. + + + Note that the archetype explicitly specifies the authentication + mechanism as no-op. + Runtime / Persistence - + The persistence mechanism (aka object store) is determined using + isis.persistence key in isis.properties. For example, to use the XML + object store, you would specify: + + isis.persistor=xml + + + Note that the archetype explicitly specifies the object store + as in-memory. + Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyParams.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyParams.java?rev=1101841&r1=1101840&r2=1101841&view=diff ============================================================================== --- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyParams.java (original) +++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyParams.java Wed May 11 11:47:45 2011 @@ -27,6 +27,8 @@ import org.apache.isis.core.runtime.auth import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; import org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionLookupStrategyDefault; +import com.google.common.base.Strings; + public class AuthenticationSessionLookupStrategyParams extends AuthenticationSessionLookupStrategyDefault { @Override @@ -40,7 +42,7 @@ public class AuthenticationSessionLookup final String user = httpServletRequest.getParameter("user"); final String password = httpServletRequest.getParameter("password"); - if (user == null || password == null) { + if (Strings.isNullOrEmpty(user) || Strings.isNullOrEmpty(password)) { return null; } final AuthenticationRequestPassword request = new AuthenticationRequestPassword(user, password); Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java?rev=1101841&r1=1101840&r2=1101841&view=diff ============================================================================== --- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java (original) +++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java Wed May 11 11:47:45 2011 @@ -135,7 +135,7 @@ public abstract class ResourceAbstract { final Element div = xhtmlRenderer.div_p("Logged in as", null); final Element ul = xhtmlRenderer.ul(HtmlClass.SESSION); - ul.appendChild(xhtmlRenderer.li_a("/user", getSession().getUserName(), "user", "resource", HtmlClass.USER)); + ul.appendChild(xhtmlRenderer.li_a("user", getSession().getUserName(), "user", "resource", HtmlClass.USER)); div.appendChild(ul); return div; @@ -146,10 +146,10 @@ public abstract class ResourceAbstract { final Element ul = xhtmlRenderer.ul(HtmlClass.RESOURCES); - ul.appendChild(xhtmlRenderer.li_a("/services", "Services", "services", "resources", HtmlClass.RESOURCE)); - ul.appendChild(xhtmlRenderer.li_a("/specs", "Specifications (MetaModel)", "specs", "resources", + ul.appendChild(xhtmlRenderer.li_a("services", "Services", "services", "resources", HtmlClass.RESOURCE)); + ul.appendChild(xhtmlRenderer.li_a("specs", "Specifications (MetaModel)", "specs", "resources", HtmlClass.RESOURCE)); - ul.appendChild(xhtmlRenderer.li_a("/user", "User (Security)", "user", "resources", HtmlClass.RESOURCE)); + ul.appendChild(xhtmlRenderer.li_a("user", "User (Security)", "user", "resources", HtmlClass.RESOURCE)); div.appendChild(ul); return div; Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java?rev=1101841&r1=1101840&r2=1101841&view=diff ============================================================================== --- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java (original) +++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java Wed May 11 11:47:45 2011 @@ -21,10 +21,10 @@ package org.apache.isis.viewer.scimpi.di import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.facets.help.HelpFacet; +import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet; import org.apache.isis.core.metamodel.facets.multiline.MultiLineFacet; import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet; -import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacet; -import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacet; +import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.core.metamodel.spec.feature.ObjectFeature; import org.apache.isis.core.metamodel.spec.feature.ObjectMember; Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java?rev=1101841&r1=1101840&r2=1101841&view=diff ============================================================================== --- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java (original) +++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java Wed May 11 11:47:45 2011 @@ -19,8 +19,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars; -import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacet; -import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacet; +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.models.ScalarModel; import org.apache.wicket.AttributeModifier; Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java?rev=1101841&r1=1101840&r2=1101841&view=diff ============================================================================== --- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java (original) +++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java Wed May 11 11:47:45 2011 @@ -19,7 +19,7 @@ package org.apache.isis.viewer.wicket.ui.components.scalars; -import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacet; +import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.viewer.wicket.model.models.ScalarModel; import org.apache.wicket.markup.html.form.TextField;