incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1101841 [1/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 GMT
Author: danhaywood
Date: Wed May 11 11:47:45 2011
New Revision: 1101841

URL: http://svn.apache.org/viewvc?rev=1101841&view=rev
Log:
ISIS-39 completed restful doc guide, fix for URLs on home page of restful viewer

Added:
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/maxlen/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/maxlen/MaxLengthFacet.java
      - copied, changed from r1098134, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlength/MaxLengthFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/maxlen/MaxLengthFacetAbstract.java
      - copied, changed from r1098134, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlength/MaxLengthFacetAbstract.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/MemberOrderFacet.java
      - copied, changed from r1098134, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/member/ordering/MemberOrderFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallen/
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallen/TypicalLengthFacet.java
      - copied, changed from r1098134, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallength/TypicalLengthFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallen/TypicalLengthFacetAbstract.java
      - copied, changed from r1098134, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallength/TypicalLengthFacetAbstract.java
    incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/content/ResourceCachingFilter.java
      - copied, changed from r1098134, incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/content/StaticContentFilter.java
Removed:
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/member/ordering/MemberOrderFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlength/MaxLengthFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlength/MaxLengthFacetAbstract.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallength/TypicalLengthFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallength/TypicalLengthFacetAbstract.java
    incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/content/StaticContentFilter.java
    incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/filters/
Modified:
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderactions/ActionOrderFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderfields/FieldOrderFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/DeweyOrderSet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberOrderComparator.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/MaxLengthFacetUnlimited.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderAnnotationFacetFactory.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthFacetAnnotationForType.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthAnnotationOnTypeFacetFactory.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthFacetAnnotationOnType.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/TypicalLengthFacetUsingParser.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/annotation/TypicalLengthAnnotationOnParameterFacetFactory.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/annotation/TypicalLengthFacetAnnotationOnParameter.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/fromtype/TypicalLengthFacetForParameterDerivedFromType.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/fromtype/TypicalLengthFacetForParameterDerivedFromTypeFacetFactory.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/validate/maxlenannot/MaxLengthAnnotationForParameterFacetFactory.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/validate/maxlenannot/MaxLengthFacetAnnotationForParameter.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/annotation/TypicalLengthAnnotationOnPropertyFacetFactory.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/annotation/TypicalLengthFacetAnnotationOnProperty.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/fromtype/TypicalLengthFacetForPropertyDerivedFromType.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/fromtype/TypicalLengthFacetForPropertyDerivedFromTypeFacetFactory.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/maxlenannot/MaxLengthAnnotationForPropertyFacetFactory.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/maxlenannot/MaxLengthFacetAnnotationForProperty.java
    incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/value/ValueFacetFactoryTest.java
    incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java
    incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java
    incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/web.xml
    incubator/isis/trunk/examples/groovy-testapp/claims/webapp/src/main/webapp/WEB-INF/web.xml
    incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisSessionFilter.java
    incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionLookupStrategyDefault.java
    incubator/isis/trunk/src/site/apt/quickstart-app.apt
    incubator/isis/trunk/src/site/apt/where-to-start.apt
    incubator/isis/trunk/src/site/resources/archetype-catalog.xml
    incubator/isis/trunk/src/site/site.xml
    incubator/isis/trunk/support/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml
    incubator/isis/trunk/support/quickstart/viewer-restful/ide/eclipse/launch/quickstart-viewer-restful.launch
    incubator/isis/trunk/support/quickstart/viewer-restful/src/main/webapp/WEB-INF/web.xml
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/TextParseableFieldImpl.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java
    incubator/isis/trunk/viewer/restful/src/docbkx/guide/isis-restful-viewer.xml
    incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyParams.java
    incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java
    incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
    incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/maxlen/MaxLengthFacet.java (from r1098134, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlength/MaxLengthFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/maxlen/MaxLengthFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/maxlen/MaxLengthFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlength/MaxLengthFacet.java&r1=1098134&r2=1101841&rev=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlength/MaxLengthFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/maxlen/MaxLengthFacet.java Wed May 11 11:47:45 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.propparam.maxlength;
+package org.apache.isis.core.metamodel.facets.maxlen;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.SingleIntValueFacet;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/maxlen/MaxLengthFacetAbstract.java (from r1098134, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlength/MaxLengthFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/maxlen/MaxLengthFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/maxlen/MaxLengthFacetAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlength/MaxLengthFacetAbstract.java&r1=1098134&r2=1101841&rev=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/propparam/maxlength/MaxLengthFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/maxlen/MaxLengthFacetAbstract.java Wed May 11 11:47:45 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.propparam.maxlength;
+package org.apache.isis.core.metamodel.facets.maxlen;
 
 import org.apache.isis.applib.events.ValidityEvent;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/MemberOrderFacet.java (from r1098134, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/member/ordering/MemberOrderFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/MemberOrderFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/MemberOrderFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/member/ordering/MemberOrderFacet.java&r1=1098134&r2=1101841&rev=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/member/ordering/MemberOrderFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/MemberOrderFacet.java Wed May 11 11:47:45 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.member.ordering;
+package org.apache.isis.core.metamodel.facets.members.order;
 
 import org.apache.isis.core.metamodel.facets.MultipleValueFacet;
 import org.apache.isis.core.metamodel.facets.object.orderactions.ActionOrderFacet;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderactions/ActionOrderFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderactions/ActionOrderFacet.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderactions/ActionOrderFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderactions/ActionOrderFacet.java Wed May 11 11:47:45 2011
@@ -20,7 +20,7 @@
 package org.apache.isis.core.metamodel.facets.object.orderactions;
 
 import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
-import org.apache.isis.core.metamodel.facets.member.ordering.MemberOrderFacet;
+import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
 import org.apache.isis.core.metamodel.facets.object.orderfields.FieldOrderFacet;
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderfields/FieldOrderFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderfields/FieldOrderFacet.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderfields/FieldOrderFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/orderfields/FieldOrderFacet.java Wed May 11 11:47:45 2011
@@ -20,7 +20,7 @@
 package org.apache.isis.core.metamodel.facets.object.orderfields;
 
 import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
-import org.apache.isis.core.metamodel.facets.member.ordering.MemberOrderFacet;
+import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
 import org.apache.isis.core.metamodel.facets.object.orderactions.ActionOrderFacet;
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallen/TypicalLengthFacet.java (from r1098134, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallength/TypicalLengthFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallen/TypicalLengthFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallen/TypicalLengthFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallength/TypicalLengthFacet.java&r1=1098134&r2=1101841&rev=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallength/TypicalLengthFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallen/TypicalLengthFacet.java Wed May 11 11:47:45 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.typicallength;
+package org.apache.isis.core.metamodel.facets.typicallen;
 
 import org.apache.isis.core.metamodel.facets.SingleIntValueFacet;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallen/TypicalLengthFacetAbstract.java (from r1098134, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallength/TypicalLengthFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallen/TypicalLengthFacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallen/TypicalLengthFacetAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallength/TypicalLengthFacetAbstract.java&r1=1098134&r2=1101841&rev=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallength/TypicalLengthFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/typicallen/TypicalLengthFacetAbstract.java Wed May 11 11:47:45 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.facets.typicallength;
+package org.apache.isis.core.metamodel.facets.typicallen;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/DeweyOrderSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/DeweyOrderSet.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/DeweyOrderSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/DeweyOrderSet.java Wed May 11 11:47:45 2011
@@ -28,7 +28,7 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 
 import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.member.ordering.MemberOrderFacet;
+import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
 import org.apache.isis.core.metamodel.layout.OrderSet;
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberOrderComparator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberOrderComparator.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberOrderComparator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberOrderComparator.java Wed May 11 11:47:45 2011
@@ -24,7 +24,7 @@ import java.util.StringTokenizer;
 
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.member.ordering.MemberOrderFacet;
+import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
 import org.apache.isis.core.metamodel.layout.OrderSet;
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java Wed May 11 11:47:45 2011
@@ -25,10 +25,10 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.consent.InteractionResultSet;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.TypedHolder;
+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.interactions.InteractionUtils;
 import org.apache.isis.core.metamodel.interactions.ValidityContext;
 import org.apache.isis.core.metamodel.spec.Instance;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/MaxLengthFacetUnlimited.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/MaxLengthFacetUnlimited.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/MaxLengthFacetUnlimited.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/MaxLengthFacetUnlimited.java Wed May 11 11:47:45 2011
@@ -21,7 +21,7 @@ package org.apache.isis.core.progmodel.f
 
 import org.apache.isis.applib.events.ValidityEvent;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacetAbstract;
+import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacetAbstract;
 import org.apache.isis.core.metamodel.interactions.ValidityContext;
 
 public class MaxLengthFacetUnlimited extends MaxLengthFacetAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderAnnotationFacetFactory.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderAnnotationFacetFactory.java Wed May 11 11:47:45 2011
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.member.ordering.MemberOrderFacet;
+import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
 
 public class MemberOrderAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderFacetAbstract.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/order/MemberOrderFacetAbstract.java Wed May 11 11:47:45 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.progmodel.f
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MultipleValueFacetAbstract;
-import org.apache.isis.core.metamodel.facets.member.ordering.MemberOrderFacet;
+import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
 
 public abstract class MemberOrderFacetAbstract extends MultipleValueFacetAbstract implements MemberOrderFacet {
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.java Wed May 11 11:47:45 2011
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacet;
+import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet;
 
 public class MaxLengthAnnotationForTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthFacetAnnotationForType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthFacetAnnotationForType.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthFacetAnnotationForType.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthFacetAnnotationForType.java Wed May 11 11:47:45 2011
@@ -20,7 +20,7 @@
 package org.apache.isis.core.progmodel.facets.object.maxlen.annotation;
 
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacetAbstract;
+import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacetAbstract;
 
 public class MaxLengthFacetAnnotationForType extends MaxLengthFacetAbstract {
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthAnnotationOnTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthAnnotationOnTypeFacetFactory.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthAnnotationOnTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthAnnotationOnTypeFacetFactory.java Wed May 11 11:47:45 2011
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet;
 
 public class TypicalLengthAnnotationOnTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthFacetAnnotationOnType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthFacetAnnotationOnType.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthFacetAnnotationOnType.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthFacetAnnotationOnType.java Wed May 11 11:47:45 2011
@@ -20,7 +20,7 @@
 package org.apache.isis.core.progmodel.facets.object.typicallen.annotation;
 
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacetAbstract;
+import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacetAbstract;
 
 public class TypicalLengthFacetAnnotationOnType extends TypicalLengthFacetAbstract {
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/TypicalLengthFacetUsingParser.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/TypicalLengthFacetUsingParser.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/TypicalLengthFacetUsingParser.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/TypicalLengthFacetUsingParser.java Wed May 11 11:47:45 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.progmodel.f
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet;
 import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
 
 public class TypicalLengthFacetUsingParser extends FacetAbstract implements TypicalLengthFacet {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/annotation/TypicalLengthAnnotationOnParameterFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/annotation/TypicalLengthAnnotationOnParameterFacetFactory.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/annotation/TypicalLengthAnnotationOnParameterFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/annotation/TypicalLengthAnnotationOnParameterFacetFactory.java Wed May 11 11:47:45 2011
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet;
 
 public class TypicalLengthAnnotationOnParameterFacetFactory extends AnnotationBasedFacetFactoryAbstract {
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/annotation/TypicalLengthFacetAnnotationOnParameter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/annotation/TypicalLengthFacetAnnotationOnParameter.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/annotation/TypicalLengthFacetAnnotationOnParameter.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/annotation/TypicalLengthFacetAnnotationOnParameter.java Wed May 11 11:47:45 2011
@@ -20,7 +20,7 @@
 package org.apache.isis.core.progmodel.facets.param.typicallen.annotation;
 
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacetAbstract;
+import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacetAbstract;
 
 public class TypicalLengthFacetAnnotationOnParameter extends TypicalLengthFacetAbstract {
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/fromtype/TypicalLengthFacetForParameterDerivedFromType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/fromtype/TypicalLengthFacetForParameterDerivedFromType.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/fromtype/TypicalLengthFacetForParameterDerivedFromType.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/fromtype/TypicalLengthFacetForParameterDerivedFromType.java Wed May 11 11:47:45 2011
@@ -21,8 +21,8 @@ package org.apache.isis.core.progmodel.f
 
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.multiline.MultiLineFacet;
-import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacet;
-import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacetAbstract;
+import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacetAbstract;
 
 public class TypicalLengthFacetForParameterDerivedFromType extends TypicalLengthFacetAbstract {
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/fromtype/TypicalLengthFacetForParameterDerivedFromTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/fromtype/TypicalLengthFacetForParameterDerivedFromTypeFacetFactory.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/fromtype/TypicalLengthFacetForParameterDerivedFromTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/typicallen/fromtype/TypicalLengthFacetForParameterDerivedFromTypeFacetFactory.java Wed May 11 11:47:45 2011
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
-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;
 
 public class TypicalLengthFacetForParameterDerivedFromTypeFacetFactory extends FacetFactoryAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/validate/maxlenannot/MaxLengthAnnotationForParameterFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/validate/maxlenannot/MaxLengthAnnotationForParameterFacetFactory.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/validate/maxlenannot/MaxLengthAnnotationForParameterFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/validate/maxlenannot/MaxLengthAnnotationForParameterFacetFactory.java Wed May 11 11:47:45 2011
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacet;
+import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet;
 
 public class MaxLengthAnnotationForParameterFacetFactory extends AnnotationBasedFacetFactoryAbstract {
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/validate/maxlenannot/MaxLengthFacetAnnotationForParameter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/validate/maxlenannot/MaxLengthFacetAnnotationForParameter.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/validate/maxlenannot/MaxLengthFacetAnnotationForParameter.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/param/validate/maxlenannot/MaxLengthFacetAnnotationForParameter.java Wed May 11 11:47:45 2011
@@ -20,7 +20,7 @@
 package org.apache.isis.core.progmodel.facets.param.validate.maxlenannot;
 
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacetAbstract;
+import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacetAbstract;
 
 public class MaxLengthFacetAnnotationForParameter extends MaxLengthFacetAbstract {
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/annotation/TypicalLengthAnnotationOnPropertyFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/annotation/TypicalLengthAnnotationOnPropertyFacetFactory.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/annotation/TypicalLengthAnnotationOnPropertyFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/annotation/TypicalLengthAnnotationOnPropertyFacetFactory.java Wed May 11 11:47:45 2011
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet;
 
 public class TypicalLengthAnnotationOnPropertyFacetFactory extends AnnotationBasedFacetFactoryAbstract {
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/annotation/TypicalLengthFacetAnnotationOnProperty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/annotation/TypicalLengthFacetAnnotationOnProperty.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/annotation/TypicalLengthFacetAnnotationOnProperty.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/annotation/TypicalLengthFacetAnnotationOnProperty.java Wed May 11 11:47:45 2011
@@ -20,7 +20,7 @@
 package org.apache.isis.core.progmodel.facets.properties.typicallen.annotation;
 
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacetAbstract;
+import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacetAbstract;
 
 public class TypicalLengthFacetAnnotationOnProperty extends TypicalLengthFacetAbstract {
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/fromtype/TypicalLengthFacetForPropertyDerivedFromType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/fromtype/TypicalLengthFacetForPropertyDerivedFromType.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/fromtype/TypicalLengthFacetForPropertyDerivedFromType.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/fromtype/TypicalLengthFacetForPropertyDerivedFromType.java Wed May 11 11:47:45 2011
@@ -21,8 +21,8 @@ package org.apache.isis.core.progmodel.f
 
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.multiline.MultiLineFacet;
-import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacet;
-import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacetAbstract;
+import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacetAbstract;
 
 public class TypicalLengthFacetForPropertyDerivedFromType extends TypicalLengthFacetAbstract {
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/fromtype/TypicalLengthFacetForPropertyDerivedFromTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/fromtype/TypicalLengthFacetForPropertyDerivedFromTypeFacetFactory.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/fromtype/TypicalLengthFacetForPropertyDerivedFromTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/typicallen/fromtype/TypicalLengthFacetForPropertyDerivedFromTypeFacetFactory.java Wed May 11 11:47:45 2011
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.facets.FacetedMethod;
-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;
 
 public class TypicalLengthFacetForPropertyDerivedFromTypeFacetFactory extends FacetFactoryAbstract {

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/maxlenannot/MaxLengthAnnotationForPropertyFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/maxlenannot/MaxLengthAnnotationForPropertyFacetFactory.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/maxlenannot/MaxLengthAnnotationForPropertyFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/maxlenannot/MaxLengthAnnotationForPropertyFacetFactory.java Wed May 11 11:47:45 2011
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacet;
+import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet;
 
 public class MaxLengthAnnotationForPropertyFacetFactory extends AnnotationBasedFacetFactoryAbstract {
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/maxlenannot/MaxLengthFacetAnnotationForProperty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/maxlenannot/MaxLengthFacetAnnotationForProperty.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/maxlenannot/MaxLengthFacetAnnotationForProperty.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/maxlenannot/MaxLengthFacetAnnotationForProperty.java Wed May 11 11:47:45 2011
@@ -20,7 +20,7 @@
 package org.apache.isis.core.progmodel.facets.properties.validate.maxlenannot;
 
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacetAbstract;
+import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacetAbstract;
 
 public class MaxLengthFacetAnnotationForProperty extends MaxLengthFacetAbstract {
 

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/value/ValueFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/value/ValueFacetFactoryTest.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/value/ValueFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/value/ValueFacetFactoryTest.java Wed May 11 11:47:45 2011
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
 import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.core.progmodel.facets.object.defaults.DefaultedFacet;

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java Wed May 11 11:47:45 2011
@@ -26,7 +26,7 @@ import java.util.Collection;
 import org.apache.isis.applib.annotation.MemberOrder;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.member.ordering.MemberOrderFacet;
+import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
 import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.core.progmodel.facets.members.order.MemberOrderAnnotationFacetFactory;
 import org.apache.isis.core.progmodel.facets.members.order.MemberOrderFacetAnnotation;

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java Wed May 11 11:47:45 2011
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
 import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessParameterContext;
-import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.facets.typicallen.TypicalLengthFacet;
 import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.core.progmodel.facets.param.typicallen.annotation.TypicalLengthAnnotationOnParameterFacetFactory;
 import org.apache.isis.core.progmodel.facets.param.typicallen.annotation.TypicalLengthFacetAnnotationOnParameter;

Copied: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/content/ResourceCachingFilter.java (from r1098134, incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/content/StaticContentFilter.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/content/ResourceCachingFilter.java?p2=incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/content/ResourceCachingFilter.java&p1=incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/content/StaticContentFilter.java&r1=1098134&r2=1101841&rev=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/content/StaticContentFilter.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/content/ResourceCachingFilter.java Wed May 11 11:47:45 2011
@@ -43,8 +43,8 @@ import javax.servlet.http.HttpServletRes
  * Usage:
  * <pre>
  * &lt;filter>
- *   &lt;filter-name>StaticContentFilter&lt;/filter-name>
- *   &lt;filter-class>org.apache.isis.core.webapp.content.StaticContentFilter&lt;/filter-class>
+ *   &lt;filter-name>ResourceCachingFilter&lt;/filter-name>
+ *   &lt;filter-class>org.apache.isis.core.webapp.content.ResourceCachingFilter&lt;/filter-class>
  *   &lt;init-param>
  *     &lt;param-name>CacheTime&lt;/param-name>
  *     &lt;param-value>86400&lt;/param-value>
@@ -52,28 +52,28 @@ import javax.servlet.http.HttpServletRes
  * &lt;/filter>
  * ...
  * &lt;filter-mapping>
- *   &lt;filter-name>StaticContentFilter&lt;/filter-name>
+ *   &lt;filter-name>ResourceCachingFilter&lt;/filter-name>
  *   &lt;url-pattern>*.js&lt;/url-pattern>
  * &lt;/filter-mapping>
  * &lt;filter-mapping>
- *   &lt;filter-name>StaticContentFilter&lt;/filter-name>
+ *   &lt;filter-name>ResourceCachingFilter&lt;/filter-name>
  *   &lt;url-pattern>*.css&lt;/url-pattern>
  * &lt;/filter-mapping>
  * &lt;filter-mapping>
- *   &lt;filter-name>StaticContentFilter&lt;/filter-name>
+ *   &lt;filter-name>ResourceCachingFilter&lt;/filter-name>
  *   &lt;url-pattern>*.jpg&lt;/url-pattern>
  * &lt;/filter-mapping>
  * &lt;filter-mapping>
- *   &lt;filter-name>StaticContentFilter&lt;/filter-name>
+ *   &lt;filter-name>ResourceCachingFilter&lt;/filter-name>
  *   &lt;url-pattern>*.png&lt;/url-pattern>
  * &lt;/filter-mapping>
  * &lt;filter-mapping>
- *   &lt;filter-name>StaticContentFilter&lt;/filter-name>
+ *   &lt;filter-name>ResourceCachingFilter&lt;/filter-name>
  *   &lt;url-pattern>*.gif&lt;/url-pattern>
  * &lt;/filter-mapping>
  * </pre>
  */
-public class StaticContentFilter implements Filter {
+public class ResourceCachingFilter implements Filter {
 
     /**
      * The Constant MILLISECONDS_IN_SECOND.

Modified: incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/web.xml?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/web.xml Wed May 11 11:47:45 2011
@@ -14,8 +14,8 @@
 	</filter>
 
 	<filter>
-		<filter-name>StaticContentFilter</filter-name>
-		<filter-class>org.apache.isis.core.webapp.content.StaticContentFilter</filter-class>
+		<filter-name>ResourceCachingFilter</filter-name>
+		<filter-class>org.apache.isis.core.webapp.content.ResourceCachingFilter</filter-class>
 		<init-param>
 			<param-name>CacheTime</param-name>
 			<param-value>86400</param-value>
@@ -23,19 +23,19 @@
 	</filter>
 
 	<filter-mapping>
-		<filter-name>StaticContentFilter</filter-name>
+		<filter-name>ResourceCachingFilter</filter-name>
 		<url-pattern>*.css</url-pattern>
 	</filter-mapping>
 	<filter-mapping>
-		<filter-name>StaticContentFilter</filter-name>
+		<filter-name>ResourceCachingFilter</filter-name>
 		<url-pattern>*.png</url-pattern>
 	</filter-mapping>
 	<filter-mapping>
-		<filter-name>StaticContentFilter</filter-name>
+		<filter-name>ResourceCachingFilter</filter-name>
 		<url-pattern>*.jpg</url-pattern>
 	</filter-mapping>
 	<filter-mapping>
-		<filter-name>StaticContentFilter</filter-name>
+		<filter-name>ResourceCachingFilter</filter-name>
 		<url-pattern>*.gif</url-pattern>
 	</filter-mapping>
     

Modified: incubator/isis/trunk/examples/groovy-testapp/claims/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/groovy-testapp/claims/webapp/src/main/webapp/WEB-INF/web.xml?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/examples/groovy-testapp/claims/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/groovy-testapp/claims/webapp/src/main/webapp/WEB-INF/web.xml Wed May 11 11:47:45 2011
@@ -3,11 +3,11 @@
  "http://java.sun.com/dtd/web-app_2_3.dtd" >
 
 <web-app>
-    <display-name>Naked Objects HTML Viewer</display-name>
+    <display-name>Apache Isis HTML Viewer</display-name>
 
 	<filter>
-		<filter-name>NakedObjectsSessionFilter</filter-name>
-		<filter-class>org.nakedobjects.webapp.NakedObjectsSessionFilter</filter-class>
+		<filter-name>IsisSessionFilter</filter-name>
+		<filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
 		<init-param>
 			<param-name>logonPage</param-name>
 			<param-value>/logon.app</param-value>
@@ -15,8 +15,8 @@
 	</filter>
 
 	<filter>
-		<filter-name>StaticContentFilter</filter-name>
-		<filter-class>org.nakedobjects.webapp.StaticContentFilter</filter-class>
+		<filter-name>ResourceCachingFilter</filter-name>
+		<filter-class>org.apache.isis.core.webapp.content.ResourceCachingFilter</filter-class>
 		<init-param>
 			<param-name>CacheTime</param-name>
 			<param-value>86400</param-value>
@@ -24,44 +24,44 @@
 	</filter>
 
 	<filter-mapping>
-		<filter-name>StaticContentFilter</filter-name>
+		<filter-name>ResourceCachingFilter</filter-name>
 		<url-pattern>*.css</url-pattern>
 	</filter-mapping>
 	<filter-mapping>
-		<filter-name>StaticContentFilter</filter-name>
+		<filter-name>ResourceCachingFilter</filter-name>
 		<url-pattern>*.png</url-pattern>
 	</filter-mapping>
 	<filter-mapping>
-		<filter-name>StaticContentFilter</filter-name>
+		<filter-name>ResourceCachingFilter</filter-name>
 		<url-pattern>*.jpg</url-pattern>
 	</filter-mapping>
 	<filter-mapping>
-		<filter-name>StaticContentFilter</filter-name>
+		<filter-name>ResourceCachingFilter</filter-name>
 		<url-pattern>*.gif</url-pattern>
 	</filter-mapping>
     
     <filter-mapping>
-    	<filter-name>NakedObjectsSessionFilter</filter-name>
+    	<filter-name>IsisSessionFilter</filter-name>
     	<url-pattern>*.app</url-pattern>
     </filter-mapping>
 
     <listener>
-        <listener-class>org.nakedobjects.webapp.NakedObjectsWebAppBootstrapper</listener-class>
+        <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
     </listener>
 
     <servlet>
         <servlet-name>Logon</servlet-name>
-        <servlet-class>org.nakedobjects.plugins.html.servlet.LogonServlet</servlet-class>
+        <servlet-class>org.apache.isis.viewer.html.servlet.LogonServlet</servlet-class>
     </servlet>
 
     <servlet>
         <servlet-name>Controller</servlet-name>
-        <servlet-class>org.nakedobjects.plugins.html.servlet.ControllerServlet</servlet-class>
+        <servlet-class>org.apache.isis.viewer.html.servlet.ControllerServlet</servlet-class>
     </servlet>
 
     <servlet>
         <servlet-name>Resource</servlet-name>
-        <servlet-class>org.nakedobjects.webapp.servlets.ResourceServlet</servlet-class>
+        <servlet-class>org.apache.isis.core.webapp.content.ResourceServlet</servlet-class>
     </servlet>
 
     <servlet-mapping>

Modified: incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisSessionFilter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisSessionFilter.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisSessionFilter.java (original)
+++ incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisSessionFilter.java Wed May 11 11:47:45 2011
@@ -57,7 +57,7 @@ public class IsisSessionFilter implement
     public static final String LOGON_PAGE_KEY = "logonPage";
 
     private AuthenticationSessionLookupStrategy authSessionLookupStrategy;
-    private String redirectResourceIfNoSession;
+    private String logonPageIfNoSession;
 
     // /////////////////////////////////////////////////////////////////
     // init, destroy
@@ -79,7 +79,7 @@ public class IsisSessionFilter implement
     }
 
     private void lookupRedirectIfNoSessionKey(final FilterConfig config) {
-        redirectResourceIfNoSession = config.getInitParameter(LOGON_PAGE_KEY);
+        logonPageIfNoSession = config.getInitParameter(LOGON_PAGE_KEY);
     }
 
     @Override
@@ -100,9 +100,9 @@ public class IsisSessionFilter implement
         // forward/redirect as required
         final AuthenticationSession authSession = authSessionLookupStrategy.lookup(request, response);
         if (!isValid(authSession)) {
-            if (redirectResourceIfNoSession != null
-                && !redirectResourceIfNoSession.equals(httpRequest.getServletPath())) {
-                httpResponse.sendRedirect(redirectResourceIfNoSession);
+            if (logonPageIfNoSession != null
+                && !logonPageIfNoSession.equals(httpRequest.getServletPath())) {
+                httpResponse.sendRedirect(logonPageIfNoSession);
             } else {
                 // the destination servlet is expected to know that there
                 // will be no open context

Modified: incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionLookupStrategyDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionLookupStrategyDefault.java?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionLookupStrategyDefault.java (original)
+++ incubator/isis/trunk/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionLookupStrategyDefault.java Wed May 11 11:47:45 2011
@@ -27,22 +27,31 @@ import javax.servlet.http.HttpSession;
 import org.apache.isis.applib.fixtures.LogonFixture;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
 import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.AuthenticationRequestExploration;
 import org.apache.isis.runtimes.dflt.runtime.fixtures.authentication.AuthenticationRequestLogonFixture;
 import org.apache.isis.runtimes.dflt.runtime.system.IsisSystem;
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
 import org.apache.isis.runtimes.dflt.webapp.WebAppConstants;
 
+import com.google.common.base.Strings;
+
 /**
- * Looks up from the {@link HttpSession}, failing that attempts to logon using a {@link LogonFixture} (if available and
- * not already used) or in exploration mode.
+ * Returns a valid AuthenticationSession through a number of mechanisms.
  * 
  * <p>
- * The {@link AuthenticationSession} is looked up from the {@link HttpSession} using the value
- * {@value WebAppConstants#HTTP_SESSION_AUTHENTICATION_SESSION_KEY}. Because we only want to use the
- * {@link LogonFixture} once, the {@link HttpSession} also stores the value
- * {@value WebAppConstants#HTTP_SESSION_LOGGED_ON_PREVIOUSLY_USING_LOGON_FIXTURE_KEY} once a logon has occurred
- * implicitly.
+ * Specifically:
+ * <ul>
+ * <li>it looks up from the {@link HttpSession} using the value
+ * {@value WebAppConstants#HTTP_SESSION_AUTHENTICATION_SESSION_KEY}</li>
+ * <li>failing that, if in exploration mode, then returns an exploration session</li>
+ * <li>failing that, if a {@link LogonFixture} has been provided and not already used,
+ * will provide an session for that fixture.  The {@link HttpSession} also stores the value
+ * {@value WebAppConstants#HTTP_SESSION_LOGGED_ON_PREVIOUSLY_USING_LOGON_FIXTURE_KEY} in the session
+ * to track whether this has been done</li>
+ * </ul> 
+ * <p>
  */
 public class AuthenticationSessionLookupStrategyDefault extends AuthenticationSessionLookupStrategyAbstract {
 
@@ -83,7 +92,7 @@ public class AuthenticationSessionLookup
             httpSession.setAttribute(WebAppConstants.HTTP_SESSION_LOGGED_ON_PREVIOUSLY_USING_LOGON_FIXTURE_KEY, true);
             return getAuthenticationManager().authenticate(new AuthenticationRequestLogonFixture(logonFixture));
         }
-
+        
         return null;
     }
 

Modified: incubator/isis/trunk/src/site/apt/quickstart-app.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/site/apt/quickstart-app.apt?rev=1101841&r1=1101840&r2=1101841&view=diff
==============================================================================
--- incubator/isis/trunk/src/site/apt/quickstart-app.apt (original)
+++ incubator/isis/trunk/src/site/apt/quickstart-app.apt Wed May 11 11:47:45 2011
@@ -26,24 +26,26 @@ QuickStart App
 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
 
 +------------------------------------------------------------
 
+  where:
+  
+  * groupId represents your own organization, and
+  
+  * artifactId is a unique identifier for this app within your organization.
+
+  []
+
   Note: <currently the archetype is only available from the Apache snapshot
   repository; hence the need to specify the archetypeCatalog property to pick 
   it up.>
-
-  You'll prompted for some properties:
   
-  * enter a groupId
+  You'll then be prompted for some further properties:
   
-    * eg com.mycompany.mygroup
-    
-  * enter an artifactId
-  
-    * eg myapp
-    
   * enter a version
   
     * eg 1.0-SNAPSHOT
@@ -54,8 +56,6 @@ mvn archetype:generate  \
     
   * enter a package
   
-    * eg com.mycompany.mygroup
-    
     * can generally leave as default
     
   * Confirm the entry
@@ -130,7 +130,7 @@ App Structure
   configured only to support the default in-memory object store.  What this
   means is that any changes you make to objects will not be persisted between
   runs.  Isis does provide several 
-  {{{./alternatives/objectstore/index.html}alternative object store}}
+  {{{./runtimes/dflt/objectstores/index.html}alternative object store}}
   implementations which you are free to start configuring for yourself as
   you gain more experience.  
 
@@ -146,151 +146,131 @@ mvn clean install
   while for the first time as modules are brought down from the remote
   repo.  
 
-Import into an IDE
+Running the app using the DnD viewer
 
-  You can use any IDE that supports Maven; the Isis developers tend to use
-  Eclipse but NetBeans and IntelliJ are equally as good. 
-
-  In Eclipse, use File > Import > Maven > Existing Maven Project, and navigate
-  to the root (myapp) directory.
+  It's possible to run the application from the command line in a number of ways,
+  each of which configuring a different user interface (what we call 'viewers'). 
 
-Exploring the App
-
-  As already noted, the application consists of a very simple domain model
-  consisting for a task manager app, consisting of a single domain object,
-  ToDoItem, and a single repository, ToDoItemRepository.
-  
-  * open up ToDoItem and ToDoItemRepository (in the dom module)
+  The {{{./viewer/dnd/index.html}DnD viewer}} runs the application a Java client app,
+  with a user interface that provides a desktop, "drag-n-drop" metaphor.
+   
+  To run the app using this viewer, use:
   
-  * open up ToDoItemsFixture (in the fixture module)
+  * <<<cd quickrun; mvn antrun:run -D exec=dnd>>>
   
-    This is used to initialize the in-memory object store between runs.
+  []
+
+  The app runs from a self-contained JAR (the artifact of the <<<quickrun>>> module). 
+  The app is configured to run standalone (not client/server), and using the
+  in-memory object store (meaning that changes to objects are not persisted between
+  runs).  This makes it appropriate for 'exploratory' prototyping work, but obviously could
+  not be deployed in this form without reconfiguring to use a different persistence
+  mechanism.   
+
+Running the app using the HTML viewer
+
+  The application can also be run using the {{{./viewer/html/index.html}HTML viewer}},
+  which provides a basic, non-customizable web view.  There are two ways to run the 
+  application with this viewer (again each time configured to use with the in-memory object store):
     
-  * open up ToDoItemRepositoryDefault (in the objstore-dflt module)
+  * <<<cd quickrun; mvn antrun:run -D exec=html>>>
   
-    This is an implementation of the repository that delegates to the in-memory 
-    object store
+    like the DnD viewer, this runs the application from a self-contained JAR, 
+    but with the app hosted by an embedded Jetty webserver.  This is intended for prototyping only,
+    (eg the JAR can be distributed to stakeholders for feedback with only a minimal set of dependencies).  
     
-  * open up the isis.properties file, used to bootstrap Isis.
+    The app can be accessed using {{{http://localhost:8080/logon.app}http://localhost:8080/logon.app}}.
+
+  * <<<cd viewer-html ; mvn jetty:run>>>
   
-    You'll find this file either in config/ directory (for the quickrun module)
-    or in the WEB-INF directory (for the webapp viewers).
-    
-    The two most important items in this file are the isis.services key and the 
-    isis.fixtures keys; the former points to the repository(s) implementation, 
-    the latter to the fixture(s) data.
+    runs the same application, but this time from a regular WAR archive, and uses
+    Maven's jetty plugin to host the WAR.  This WAR could be in theory be deployed into
+    production (though in practice a different object store would need to be configured).
+     
+    The app can be accessed using {{{http://localhost:8080/myapp-quickviewer-html}http://localhost:8080/myapp-quickviewer-html}}
+    (where 'myapp' is the artifactId that you entered when generating the app).
 
   []
-    
-Running the app using the DnD viewer (quickrun module)
 
-  To run the application using the {{{./viewer/dnd/index.html}DnD viewer}}, go 
-  to the quickrun/ide/eclipse/launch directory and then use
-  Run As > quickstart_quickrun_dnd.launch.
-  
-  Note: <the archetype currently does not provide an out-of-the-box launch
-  configuration for other IDEs.  However, if you open the Eclipse .launch file 
-  you'll see that all we are doing is running org.apache.isis.Isis with some 
-  command line arguments, so hopefully this is easy enough to reproduce in
-  other IDEs>. 
+Running the app using the Restful viewer
 
-Running the app using the HTML viewer (quickrun / viewer-html modules)
+  The application can also be run using the {{{./viewer/restful/index.html}RESTful viewer}}.
+  This exposes the domain model as a set of resources, in XHTML format.  This
+  means that the RESTful resources can be consumed directly by a browser as
+  well as by a custom RESTful client.
 
-  The application can also be run using the {{{./viewer/html/index.html}HTML viewer}},
-  which provides a basic, non-customizable web view.  This can be run either:
-  
-  * from the quickrun module's ide/eclipse/launch directory, using 
-    Run As > quickstart_quickrun_html.launch.
-    
-    Then browse to {{{http://localhost:8080/logon.app}http://localhost:8080/logon.app}}
-    
-  * from the viewer-html module, using the configured web.xml.  The app can
-    then be run using any of the following:
+  As for the HTML viewer, there are two ways to run the same application with the Restful viewer:
+
+  * <<<cd quickrun; mvn antrun:run -D exec=restful>>>
   
-    * using viewer-html/ide/eclipse/launch/quickstart-viewer-html.launch.  Note
-      that this isn't the same as the quickrun module's, because it invokes
-      a different class (org.apache.isis.WebServer rather than 
-      org.apache.isis.Isis).
+    also runs the application within an embedded Jetty webserver, but using the Restful viewer.
+    The app can be accessed using {{{http://localhost:8080/}http://localhost:8080/}}.
     
-    * mvn jetty:run 
+    Note: <only firefox is currently supported as a RESTful client.  HTTP PUTs
+    and DELETEs are supported using a small amount of Javascript>.
     
-    * using your IDE's webmodule support (eg Eclipse's WTP support lets the 
-      application be run using Run As > Run On Server)
-      
-    []
+  * <<<cd viewer-restful; mvn jetty:run>>>
   
-    Then browse to {{{http://localhost:8080/myapp-quickviewer-html}http://localhost:8080/myapp-quickviewer-html}}
+    runs the same application, but this time from a regular WAR archive, and uses
+    Maven's jetty plugin to host the WAR.  The app is configured with the in-memory object store.
+
+    The app can be accessed using {{{http://localhost:8080/myapp-quickviewer-restful}http://localhost:8080/myapp-quickviewer-restful}} 
     (where 'myapp' is the artifactId that you entered when generating the app).
 
-Running the app using the Scimpi viewer (viewer-scimpi module)
+  []
+      
+Running the app using the Scimpi viewer
 
   The application can also be run using the {{{./viewer/scimpi/index.html}Scimpi viewer}}.
   This exposes the domain model as a webapp.  Like all Isis viewers, a default
   view is provided but each object's view can be customized using a set of tags
   if required.  
 
-  The Scimpi viewer is run from the viewer-scimpi module, using the configured 
-  web.xml.  As for the other webapps, it can be run using the Eclipse .launch 
-  file, using jetty:run or using your IDE's webmodule support (eg Eclipse WTP).
-    
-  When started, browse to {{{http://localhost:8080/myapp-quickviewer-scimpi}http://localhost:8080/myapp-quickviewer-scimpi}}
-  (where 'myapp' is the artifactId that you entered when generating the app).
+  The Scimpi viewer can be run using:
+  
+  * <<<cd viewer-scimpi ; mvn jetty:run>>>
+
+    which runs the application from a regular WAR archive, and uses
+    Maven's jetty plugin to host the WAR.  The app is configured with the in-memory object store.
 
-Running the app using the Wicket viewer (viewer-wicket module)
+    The app can be accessed using {{{http://localhost:8080/myapp-quickviewer-scimpi}http://localhost:8080/myapp-quickviewer-scimpi}}
+    (where 'myapp' is the artifactId that you entered when generating the app).
+  
+  []
+  
+Running the app using the Wicket viewer
 
   The application can also be run using the {{{./viewer/wicket/index.html}Wicket viewer}}.
   This exposes the domain model as a webapp, using 
-  {{{http://wicket.apache.org}Apache Wicket}} as the enabling web framework.  
+  {{{http://wicket.apache.org}Apache Wicket}} as the enabling web framework.
+    
   Like all Isis viewers, a default view is provided, but each object's view can
   be customized using custom Wicket components if required.  
 
-  The Wicket viewer is run from the viewer-wicket module, using the configured 
-  web.xml.  As for the other webapps, it can be run using the Eclipse .launch 
-  file, using jetty:run or using your IDE's webmodule support (eg Eclipse WTP).
-    
-  When started, browse to http://localhost:8080/myapp-quickviewer-wicket (where 
-  'myapp' is the artifactId that you entered when generating the app).
-  
-Running the app using the RESTful viewer (quickrun / viewer-restful modules)
+  The Wicket viewer can be run using:
 
-  The application can also be run using the {{{./viewer/restful/index.html}RESTful viewer}}.
-  This exposes the domain model as a set of resources, in XHTML format.  This
-  means that the RESTful resources can be consumed directly by a browser as
-  well as by a custom RESTful client.
+  * <<<cd viewer-wicket ; mvn jetty:run>>>
 
-  The RESTful viewer can be run either:
-  
-  * from the quickrun module's ide/eclipse/launch directory, using 
-    Run As > quickstart_quickrun_html.launch.
-    
-    Then browse to {{{http://localhost:8080/}http://localhost:8080/}}
-    
-  * from the viewer-restful module, using the configured web.xml.  
-  
-    As for the other webapps, it can be run using the Eclipse .launch file,
-    using jetty:run or using your IDE's webmodule support (eg Eclipse WTP).
-    
-    Then browse to {{{http://localhost:8080/myapp-quickviewer-restful}http://localhost:8080/myapp-quickviewer-restful}} (where 
-    'myapp' is the artifactId that you entered when generating the app).
-    
-    []
+    which runs the application from a regular WAR archive, and uses
+    Maven's jetty plugin to host the WAR.  The app is configured with the in-memory object store.
+
+    The app can be accessed using {{{http://localhost:8080/myapp-quickviewer-wicket}http://localhost:8080/myapp-quickviewer-wicket}}
+    (where 'myapp' is the artifactId that you entered when generating the app).
   
   []
-  
-  Note: <only firefox is currently supported as a RESTful client.  HTTP PUTs
-  and DELETEs are supported using a small amount of Javascript>.
-  
 
-Running the domain object tests under JUnit (tests-junit module)
+Running the app's JUnit tests
 
   Isis provides the means to test domain object logic using a 
   {{{./viewer/junit/index.html}custom runner}} for {{{http://junit.org}JUnit}}.
+
+  To run the tests, use:
+
+  * <<<cd tests-junit ; mvn test>>>
   
-  The tests are in the tests-junit module and can be run using your IDE's
-  JUnit support.  Alternatively, use 'mvn test'.
-  
+  []
 
-Running the domain object tests under Concordion (tests-bdd module)
+Running the app's BDD (Concordion) tests
 
   Isis provides the means to test domain object logic using an 
   {{{./viewer/bdd/index.html}integration}} with the
@@ -299,7 +279,7 @@ Running the domain object tests under Co
   Concordion tests are written as XHTML; the Concordion framework then uses
   annotations within the XHTML to call into (what Concordion calls) "fixture" 
   code, written in Java.  The tests can be found in 
-  src/test/resources/viewer/bdd/stories (in the tests-bdd module).   
+  <<<src/test/resources/viewer/bdd/stories>>> (in the tests-bdd module).   
   
   Normally the developer would need to write the fixtures called by Concordion.  
   The Isis integration however provides these fixtures already, so using
@@ -307,10 +287,163 @@ Running the domain object tests under Co
   pre-defined fixtures (eg to invoke an action or check the value of a 
   property). 
   
-  Concordion itself integrates with JUnit, so the tests are run just by
-  using your IDE's JUnit support.  Alternatively, use 'mvn test'.
+  To run the tests, use:
+  
+  * <<<cd tests-bdd ; mvn test>>>
+
+    Concordion itself integrates with JUnit, so as you can see the tests 
+    are run in the usual way.
+  
+  []
+
+  As a byproduct of running the tests, Concordion generates output HTML which
+  are marked up versions of the the original scenarios.  The idea is to make it easy 
+  for a (non-technical) stakeholder to view the outcome of the tests.
+  The location of this output HTML should be printed to the console; the default
+  location is <<</tmp/concordion/viewer/bdd/stories>>>.  
+
+
+Import into an IDE
+
+  You can use any IDE that supports Maven; the Isis developers tend to use
+  Eclipse but NetBeans and IntelliJ are equally as good. 
+
+  In Eclipse, use File > Import > Maven > Existing Maven Project, and navigate
+  to the root (myapp) directory.
+
+Exploring the App
+
+  As already noted, the application consists of a very simple domain model
+  consisting for a task manager app, consisting of a single domain object,
+  ToDoItem, and a single repository, <<<ToDoItemRepository>>>.
+  
+  * open up <<<ToDoItem>>> and <<<ToDoItemRepository>>> (in the dom module)
+  
+  * open up <<<ToDoItemsFixture>>> (in the fixture module)
   
-  Once the tests have run output for the tests will be generated in 
-  /tmp/concordion/viewer/bdd/stories.  These will be marked up versions of the 
-  the original scenarios.
+    This is used to initialize the in-memory object store between runs.
+    
+  * open up <<<ToDoItemRepositoryDefault>>> (in the objstore-dflt module)
+  
+    This is an implementation of the repository that delegates to the in-memory 
+    object store
+    
+  * open up the <<<isis.properties>>> file, used to bootstrap Isis.
+  
+    You'll find this file either in <<<src/main/resources>>> directory (for the quickrun module)
+    or in the <<<WEB-INF>>> directory (for the webapp viewers).
+    
+    The two most important items in this file are the <isis.services> key and the 
+    <isis.fixtures> keys; the former points to the repository(s) implementation, 
+    the latter to the fixture(s) data.
+
+  []
+    
+Running the app from the IDE
+
+  The archetype provides a number of <<<.launch>>> configuration files for Eclipse, making it
+  easy to launch the application - with different viewers.
+  using the DnD viewer (quickrun module)
+
+  The archetype currently does not provide equivalent configuration for other IDEs.  
+  However, if you open the Eclipse .launch file 
+  you'll see that all we are doing is running <<<org.apache.isis.Isis>>> with some 
+  command line arguments, so hopefully this is easy enough to reproduce in
+  other IDEs.  Alternatively, you can use those IDE's in-built support for Maven
+  and have them execute the same Maven goals as documented above for running from
+  the command-line.  
+
+  To run each of the viewers in Eclipse:
+  
+  * to run the DnD viewer,
+  
+    go to the <<<quickrun/ide/eclipse/launch>>> directory and then use
+    Run As > quickstart_quickrun_dnd.launch.
+  
+  * to run the HTML viewer,
+  
+    either:
+
+    * go to the quickrun module's ide/eclipse/launch directory, and then use 
+      Run As > quickstart_quickrun_html.launch.
+    
+      Then browse to {{{http://localhost:8080/logon.app}http://localhost:8080/logon.app}}
+    
+    * go to the viewer-html module's ide/eclipse/launch directory, and then use
+      Run As > quickstart-viewer-html.launch.
+      
+      Note that this isn't the same as the quickrun module's, because it invokes
+      a different class (<<<org.apache.isis.WebServer>>> rather than 
+      org.apache.isis.Isis).
+    
+    * go to the viewer-html module, and use Eclipse's WTP support to run using Run As > Run On Server.
+
+    * go to the viewer-html module, and run the <<<mvn jetty:run>>> goal (as provided by the M2Eclipse plugin)
+      
+    []
+  
+  * to run the Restful viewer,
+
+    either:
+
+    * go to the quickrun module's ide/eclipse/launch directory, and then use 
+      Run As > quickstart_quickrun_restful.launch.
+    
+      Then browse to {{{http://localhost:8080}http://localhost:8080/}}
+    
+    * go to the viewer-restful module's ide/eclipse/launch directory, and then use
+      Run As > quickstart-viewer-restful.launch.
+      
+    * go to the viewer-restful module, and use Eclipse's WTP support to run using Run As > Run On Server.
+
+    * go to the viewer-restful module, and run the <<<mvn jetty:run>>> goal 
+      
+    []
+  
+  * to run the Scimpi viewer,
+
+    either:
+
+    * go to the viewer-scimpi module's ide/eclipse/launch directory, and then use
+      Run As > quickstart-viewer-scimpi.launch.
+      
+    * go to the viewer-scimpi module, and use Eclipse's WTP support to run using Run As > Run On Server.
+
+    * go to the viewer-scimpi module, and run the <<<mvn jetty:run>>> goal
+      
+    []
+  
+  * to run the Wicket viewer,
+
+    either:
+
+    * go to the viewer-wicket module's ide/eclipse/launch directory, and then use
+      Run As > quickstart-viewer-wicket.launch.
+      
+    * go to the viewer-wicket module, and use Eclipse's WTP support to run using Run As > Run On Server.
+
+    * go to the viewer-wicket module, and run the <<<mvn jetty:run>>> goal
+      
+    []
+
+  * to run the JUnit tests,
+  
+    either:
+    
+    * go to the tests-junit module and use Eclipse's built-in JUnit support to run the tests
+
+    * go to the tests-junit module and run the <<<mvn test goal>>>
+  
+  * to run the BDD (Concordion) tests,
+  
+    either:
+    
+    * go to the tests-bdd module and use Eclipse's built-in JUnit support to run the tests
+    
+      open the console view to see the location of the generated HTML.
+
+    * go to the tests-bdd module and run the <<<mvn test goal>>>
+  
+    []
     
+  []
\ No newline at end of file



Mime
View raw message