incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1030308 [1/8] - in /incubator/isis/trunk: alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ alternatives/remoting/common/src/test/ja...
Date Wed, 03 Nov 2010 01:24:23 GMT
Author: danhaywood
Date: Wed Nov  3 01:24:18 2010
New Revision: 1030308

URL: http://svn.apache.org/viewvc?rev=1030308&view=rev
Log:
first cut of support/prototype app running, with launch configs in quickrun/ide/eclipse/launch; also removed all of the [[NAME]] and updated splash screens for DnD and (nastily) the HTML viewer

Added:
    incubator/isis/trunk/core/runtime/src/main/resources/images/nof-small-logo.png   (with props)
    incubator/isis/trunk/core/runtime/src/main/resources/images/nof-splash-logo.png   (with props)
    incubator/isis/trunk/core/runtime/src/main/resources/images/powered-by.pdn   (with props)
    incubator/isis/trunk/support/prototype/quickrun/ide/eclipse/launch/prototype_quickrun_html.launch
    incubator/isis/trunk/support/prototype/quickrun/ide/eclipse/launch/prototype_quickrun_restful.launch
      - copied, changed from r1030297, incubator/isis/trunk/support/prototype/quickrun/ide/eclipse/launch/exploration-jetty (restful).launch
Removed:
    incubator/isis/trunk/support/prototype/quickrun/ide/eclipse/launch/exploration-jetty (restful).launch
    incubator/isis/trunk/viewer/html/src/main/resources/default-images/poweredby-logo.png
Modified:
    incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ServerFacadeImpl.java
    incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnection.java
    incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/ProxyPersistorTest.java
    incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
    incubator/isis/trunk/applib/src/main/src-archived/old-valueholders/BusinessValueHolder.java
    incubator/isis/trunk/applib/src/main/src-archived/old-valueholders/RtfValue.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectAdapter.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectMetaModel.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/exceptions/ModelException.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/naming/describedas/DescribedAsFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/naming/named/NamedFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/aggregated/AggregatedFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/bounded/BoundedFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/cached/CachedFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedCallbackFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadingCallbackFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedCallbackFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingCallbackFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovedCallbackFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingCallbackFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedCallbackFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/value/ValueFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propcoll/access/PropertyAccessorFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propcoll/notpersisted/NotPersistedFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/businesskey/BusinessKeyFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/PropertyChoicesFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/PropertyDefaultFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertyClearFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertyInitializationFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertySetterFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/searchable/SearchableFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/multiline/MultiLineFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/typicallength/TypicalLengthFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/validate/mandatory/MandatoryFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/propparam/validate/maxlength/MaxLengthFacet.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecificationException.java
    incubator/isis/trunk/core/metamodel/src/main/test-archived/org.nakedobjects.nof.reflect.java.reflect/JavaActionTest.java
    incubator/isis/trunk/core/metamodel/src/main/test-archived/org.nakedobjects.nof.reflect.java.reflect/JavaIntrospectorTest.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionChoicesFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/choices/ActionParameterChoicesFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/debug/DebugFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionDefaultsFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/defaults/ActionParameterDefaultsFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/invoke/ActionInvocationFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/actions/validate/ActionValidationFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionAddToFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionClearFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/modify/CollectionRemoveFromFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateAddToFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/collections/validate/CollectionValidateRemoveFromFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForContextFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisableForSessionFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/disable/DisabledFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HiddenFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForContextFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/hide/HideForSessionFacetAbstract.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/ignore/IgnoreFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/naming/describedas/DescribedAsFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/naming/named/NamedFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/aggregated/AggregatedFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/bounded/BoundedFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/CreatedCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadedCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/LoadingCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistedCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/PersistingCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovedCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/RemovingCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatedCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/callbacks/UpdatingCallbackFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/ClearDirtyObjectFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/DirtyObjectFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/IsDirtyObjectFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/dirty/MarkDirtyObjectFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ebc/EqualByContentFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/validate/ValidateObjectFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/object/value/ValueFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/ordering/actionorder/ActionOrderFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/ordering/fieldorder/FieldOrderFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/ordering/memberorder/MemberOrderFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/propcoll/access/PropertyAccessorFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/propcoll/notpersisted/NotPersistedFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/properties/choices/PropertyChoicesFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/PropertyDefaultFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertyClearFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertyInitializationFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/properties/modify/PropertySetterFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/properties/validate/PropertyValidateFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/propparam/multiline/MultiLineFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/propparam/typicallength/TypicalLengthFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/propparam/validate/mandatory/MandatoryFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/propparam/validate/mandatory/MandatoryFacetDefault.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/propparam/validate/mask/MaskFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/propparam/validate/maxlength/MaxLengthFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/facets/propparam/validate/regex/RegExFacet.java
    incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/java5/FallbackFacetFactory.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/about/AboutIsis.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextPipe.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContextThreadLocal.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Memento.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionContainer.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/package-info.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerDefault.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStorePersistence.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/PersistenceSessionObjectStore.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/package-info.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/InitialisationException.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionDefault.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/SplashWindow.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/console/AWTConsole.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/console/TerminalConsole.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/SystemPrinter.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileLoaderDefault.java
    incubator/isis/trunk/core/runtime/src/main/resources/images/poweredby-logo.png
    incubator/isis/trunk/core/runtime/src/main/resources/images/small-logo.png
    incubator/isis/trunk/core/runtime/src/main/resources/images/splash-logo.png
    incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyAction.java
    incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyOneToManyAssociation.java
    incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyOneToOneAssociation.java
    incubator/isis/trunk/core/runtime/src/test-archived/org.nakedobjects.nof.reflect.remote.spec/DummyValueAssociation.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAdapter.java
    incubator/isis/trunk/defaults/security/pom.xml
    incubator/isis/trunk/support/prototype/quickrun/pom.xml
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/DebugFrame.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/LoginDialog.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/ShutdownDialog.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/ViewerFrame.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/FieldErrorView.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/collection/AbstractCollectionContent.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/CollectionElementBuilder.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspaceBuilder.java
    incubator/isis/trunk/viewer/dnd/src/main/src-archived/dnd/example/field/TextFieldExample.java
    incubator/isis/trunk/viewer/dnd/src/main/src-archived/views/BarSpecification.java
    incubator/isis/trunk/viewer/dnd/src/main/src-archived/views/BarchartSpecification.java
    incubator/isis/trunk/viewer/dnd/src/main/src-archived/views/GridColumnSpecification.java
    incubator/isis/trunk/viewer/dnd/src/main/src-archived/views/GridLayout.java
    incubator/isis/trunk/viewer/dnd/src/main/src-archived/views/GridSpecification.java
    incubator/isis/trunk/viewer/dnd/src/main/src-archived/views/OptionFieldSpecification.java
    incubator/isis/trunk/viewer/dnd/src/main/src-archived/views/OptionSelectionField.java
    incubator/isis/trunk/viewer/dnd/src/main/src-archived/views/OptionSelectionFieldOverlay.java
    incubator/isis/trunk/viewer/dnd/src/main/src-archived/views/PercentageBarField.java
    incubator/isis/trunk/viewer/dnd/src/main/src-archived/views/ScheduleBlockSpecification.java
    incubator/isis/trunk/viewer/dnd/src/main/src-archived/views/ScheduleBlockView.java
    incubator/isis/trunk/viewer/dnd/src/main/src-archived/views/ScheduleLayout.java
    incubator/isis/trunk/viewer/dnd/src/main/src-archived/views/ScheduleSpecification.java
    incubator/isis/trunk/viewer/dnd/src/main/src-archived/views/TimePeriodBarField.java
    incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/TextFieldContentTest.java
    incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ActionFieldBuilderTest.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Welcome.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/AbstractHtmlPage.java
    incubator/isis/trunk/viewer/html/src/main/resources/images/banner.png
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/IndirectObjectMapping.java

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ServerFacadeImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ServerFacadeImpl.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ServerFacadeImpl.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ServerFacadeImpl.java Wed Nov  3 01:24:18 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.remoting.facade.impl;
 
 import java.util.ArrayList;
@@ -25,7 +24,6 @@ import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.log4j.Logger;
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.commons.ensure.Assert;
 import org.apache.isis.commons.exceptions.IsisException;
@@ -62,30 +60,30 @@ import org.apache.isis.remoting.data.com
 import org.apache.isis.remoting.data.query.PersistenceQueryData;
 import org.apache.isis.remoting.exchange.AuthorizationRequestUsability;
 import org.apache.isis.remoting.exchange.AuthorizationRequestVisibility;
+import org.apache.isis.remoting.exchange.AuthorizationResponse;
 import org.apache.isis.remoting.exchange.ClearAssociationRequest;
+import org.apache.isis.remoting.exchange.ClearAssociationResponse;
 import org.apache.isis.remoting.exchange.ClearValueRequest;
+import org.apache.isis.remoting.exchange.ClearValueResponse;
 import org.apache.isis.remoting.exchange.CloseSessionRequest;
+import org.apache.isis.remoting.exchange.CloseSessionResponse;
 import org.apache.isis.remoting.exchange.ExecuteClientActionRequest;
+import org.apache.isis.remoting.exchange.ExecuteClientActionResponse;
 import org.apache.isis.remoting.exchange.ExecuteServerActionRequest;
+import org.apache.isis.remoting.exchange.ExecuteServerActionResponse;
 import org.apache.isis.remoting.exchange.FindInstancesRequest;
+import org.apache.isis.remoting.exchange.FindInstancesResponse;
 import org.apache.isis.remoting.exchange.GetObjectRequest;
+import org.apache.isis.remoting.exchange.GetObjectResponse;
 import org.apache.isis.remoting.exchange.GetPropertiesRequest;
 import org.apache.isis.remoting.exchange.GetPropertiesResponse;
 import org.apache.isis.remoting.exchange.HasInstancesRequest;
-import org.apache.isis.remoting.exchange.OidForServiceRequest;
-import org.apache.isis.remoting.exchange.OpenSessionRequest;
-import org.apache.isis.remoting.exchange.OpenSessionResponse;
-import org.apache.isis.remoting.exchange.AuthorizationResponse;
-import org.apache.isis.remoting.exchange.ClearAssociationResponse;
-import org.apache.isis.remoting.exchange.ClearValueResponse;
-import org.apache.isis.remoting.exchange.CloseSessionResponse;
-import org.apache.isis.remoting.exchange.ExecuteClientActionResponse;
-import org.apache.isis.remoting.exchange.ExecuteServerActionResponse;
-import org.apache.isis.remoting.exchange.FindInstancesResponse;
-import org.apache.isis.remoting.exchange.GetObjectResponse;
 import org.apache.isis.remoting.exchange.HasInstancesResponse;
 import org.apache.isis.remoting.exchange.KnownObjectsRequest;
+import org.apache.isis.remoting.exchange.OidForServiceRequest;
 import org.apache.isis.remoting.exchange.OidForServiceResponse;
+import org.apache.isis.remoting.exchange.OpenSessionRequest;
+import org.apache.isis.remoting.exchange.OpenSessionResponse;
 import org.apache.isis.remoting.exchange.ResolveFieldRequest;
 import org.apache.isis.remoting.exchange.ResolveFieldResponse;
 import org.apache.isis.remoting.exchange.ResolveObjectRequest;
@@ -105,7 +103,7 @@ import org.apache.isis.runtime.persisten
 import org.apache.isis.runtime.transaction.IsisTransactionManager;
 import org.apache.isis.runtime.transaction.messagebroker.MessageBroker;
 import org.apache.isis.runtime.transaction.updatenotifier.UpdateNotifier;
-
+import org.apache.log4j.Logger;
 
 /**
  * previously called <tt>ServerDistribution</tt>.
@@ -117,51 +115,54 @@ public class ServerFacadeImpl implements
     private final AuthenticationManager authenticationManager;
     private ObjectEncoderDecoder encoderDecoder;
 
-
-
     public ServerFacadeImpl(final AuthenticationManager authenticationManager) {
         this.authenticationManager = authenticationManager;
     }
 
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // init, shutdown
-    ////////////////////////////////////////////////////////////////
-
-    public void init() {}
+    // //////////////////////////////////////////////////////////////
 
-    public void shutdown() {}
+    @Override
+    public void init() {
+    }
 
+    @Override
+    public void shutdown() {
+    }
 
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // Authentication
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
 
+    @Override
     public OpenSessionResponse openSession(OpenSessionRequest request2) {
-        final AuthenticationRequestPassword request = new AuthenticationRequestPassword(request2.getUsername(), request2.getPassword());
+        final AuthenticationRequestPassword request =
+            new AuthenticationRequestPassword(request2.getUsername(), request2.getPassword());
         final AuthenticationSession session = authenticationManager.authenticate(request);
-		return new OpenSessionResponse(session);
+        return new OpenSessionResponse(session);
     }
 
+    @Override
     public CloseSessionResponse closeSession(CloseSessionRequest request) {
         authenticationManager.closeSession(request.getSession());
         return new CloseSessionResponse();
     }
 
-
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // Authorization
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
 
-    public AuthorizationResponse authorizeVisibility(
-    		AuthorizationRequestVisibility request) {
-    	ObjectAdapter targetAdapter = encoderDecoder.decode(request.getTarget());
+    @Override
+    public AuthorizationResponse authorizeVisibility(AuthorizationRequestVisibility request) {
+        ObjectAdapter targetAdapter = encoderDecoder.decode(request.getTarget());
         boolean allowed = getMember(request.getIdentifier()).isVisible(request.getSession(), targetAdapter).isAllowed();
-		return encoderDecoder.encodeAuthorizeResponse(allowed);
+        return encoderDecoder.encodeAuthorizeResponse(allowed);
     }
 
-    public AuthorizationResponse authorizeUsability(
-    		AuthorizationRequestUsability request) {
-    	ObjectAdapter targetAdapter = encoderDecoder.decode(request.getTarget());
+    @Override
+    public AuthorizationResponse authorizeUsability(AuthorizationRequestUsability request) {
+        ObjectAdapter targetAdapter = encoderDecoder.decode(request.getTarget());
         boolean allowed = getMember(request.getIdentifier()).isUsable(request.getSession(), targetAdapter).isAllowed();
         return encoderDecoder.encodeAuthorizeResponse(allowed);
     }
@@ -178,8 +179,8 @@ public class ServerFacadeImpl implements
 
     private ObjectMember getActionElseThrowException(final Identifier id, final ObjectSpecification specification) {
         ObjectMember member =
-            specification.getObjectAction(
-                    ObjectActionType.USER, id.getMemberName(), getMemberParameterSpecifications(id));
+            specification.getObjectAction(ObjectActionType.USER, id.getMemberName(),
+                getMemberParameterSpecifications(id));
         if (member == null) {
             throw new IsisException("No user action found for id " + id);
         }
@@ -203,18 +204,19 @@ public class ServerFacadeImpl implements
         return specifications;
     }
 
-
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // Misc
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
 
+    @Override
     public GetPropertiesResponse getProperties(GetPropertiesRequest request) {
         final Properties properties = new Properties();
         properties.put("test-client", "true");
 
         // pass over services
         final IsisConfiguration configuration = IsisContext.getConfiguration();
-        final IsisConfiguration serviceProperties = configuration.getProperties(ConfigurationConstants.ROOT + "services");
+        final IsisConfiguration serviceProperties =
+            configuration.getProperties(ConfigurationConstants.ROOT + "services");
         final Enumeration e = serviceProperties.propertyNames();
         while (e.hasMoreElements()) {
             final String name = (String) e.nextElement();
@@ -231,24 +233,24 @@ public class ServerFacadeImpl implements
         return new GetPropertiesResponse(properties);
     }
 
-
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // setAssociation, setValue, clearAssociation, clearValue
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
 
     /**
      * Applies to both {@link OneToOneAssociation}s and {@link OneToManyAssociation}s.
      */
-    public SetAssociationResponse setAssociation(
-            final SetAssociationRequest request) {
+    @Override
+    public SetAssociationResponse setAssociation(final SetAssociationRequest request) {
 
-    	AuthenticationSession session = request.getSession();
-    	String fieldIdentifier = request.getFieldIdentifier();
-    	IdentityData targetData = request.getTarget();
-    	IdentityData associateData = request.getAssociate();
+        AuthenticationSession session = request.getSession();
+        String fieldIdentifier = request.getFieldIdentifier();
+        IdentityData targetData = request.getTarget();
+        IdentityData associateData = request.getAssociate();
 
         if (LOG.isDebugEnabled()) {
-			LOG.debug("request setAssociation " + fieldIdentifier + " on " + targetData + " with " + associateData + " for " + session);
+            LOG.debug("request setAssociation " + fieldIdentifier + " on " + targetData + " with " + associateData
+                + " for " + session);
         }
 
         final ObjectAdapter targetAdapter = getPersistentObjectAdapter(session, targetData);
@@ -269,21 +271,23 @@ public class ServerFacadeImpl implements
     /**
      * Applies only for {@link OneToOneAssociation}s.
      */
-    public SetValueResponse setValue(
-            SetValueRequest request) {
+    @Override
+    public SetValueResponse setValue(SetValueRequest request) {
 
-    	AuthenticationSession session = request.getSession();
-    	String fieldIdentifier = request.getFieldIdentifier();
-    	IdentityData targetIdentityData = request.getTarget();
-    	EncodableObjectData encodeableObjectData = request.getValue();
+        AuthenticationSession session = request.getSession();
+        String fieldIdentifier = request.getFieldIdentifier();
+        IdentityData targetIdentityData = request.getTarget();
+        EncodableObjectData encodeableObjectData = request.getValue();
 
         Assert.assertNotNull(encodeableObjectData);
         if (LOG.isDebugEnabled()) {
-            LOG.debug("request setValue " + fieldIdentifier + " on " + targetIdentityData + " with " + encodeableObjectData + " for " + session);
+            LOG.debug("request setValue " + fieldIdentifier + " on " + targetIdentityData + " with "
+                + encodeableObjectData + " for " + session);
         }
 
         final ObjectAdapter targetAdapter = getPersistentObjectAdapter(session, targetIdentityData);
-        final OneToOneAssociation association = (OneToOneAssociation) targetAdapter.getSpecification().getAssociation(fieldIdentifier);
+        final OneToOneAssociation association =
+            (OneToOneAssociation) targetAdapter.getSpecification().getAssociation(fieldIdentifier);
 
         ensureAssociationModifiableElseThrowException(session, targetAdapter, association);
 
@@ -296,20 +300,20 @@ public class ServerFacadeImpl implements
         return new SetValueResponse(getUpdates());
     }
 
-
     /**
      * Applies to both {@link OneToOneAssociation}s and {@link OneToManyAssociation}s.
      */
-    public ClearAssociationResponse clearAssociation(
-            final ClearAssociationRequest request) {
+    @Override
+    public ClearAssociationResponse clearAssociation(final ClearAssociationRequest request) {
 
-    	AuthenticationSession session = request.getSession();
-    	String fieldIdentifier = request.getFieldIdentifier();
-    	IdentityData targetData = request.getTarget();
-    	IdentityData associateData = request.getAssociate();
+        AuthenticationSession session = request.getSession();
+        String fieldIdentifier = request.getFieldIdentifier();
+        IdentityData targetData = request.getTarget();
+        IdentityData associateData = request.getAssociate();
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("request clearAssociation " + fieldIdentifier + " on " + targetData + " of " + associateData + " for " + session);
+            LOG.debug("request clearAssociation " + fieldIdentifier + " on " + targetData + " of " + associateData
+                + " for " + session);
         }
 
         final ObjectAdapter targetAdapter = getPersistentObjectAdapter(session, targetData);
@@ -317,8 +321,8 @@ public class ServerFacadeImpl implements
         final ObjectSpecification specification = targetAdapter.getSpecification();
         final ObjectAssociation association = specification.getAssociation(fieldIdentifier);
 
-        if (!association.isVisible(session, targetAdapter).isAllowed() ||
-        	 association.isUsable(session, targetAdapter).isVetoed()) {
+        if (!association.isVisible(session, targetAdapter).isAllowed()
+            || association.isUsable(session, targetAdapter).isVetoed()) {
             throw new IsisException("can't modify field as not visible or editable");
         }
         ensureAssociationModifiableElseThrowException(session, targetAdapter, association);
@@ -334,19 +338,20 @@ public class ServerFacadeImpl implements
     /**
      * Applies only for {@link OneToOneAssociation}s.
      */
-    public ClearValueResponse clearValue(
-    		final ClearValueRequest request) {
+    @Override
+    public ClearValueResponse clearValue(final ClearValueRequest request) {
 
-    	AuthenticationSession session = request.getSession();
-    	String fieldIdentifier = request.getFieldIdentifier();
-    	IdentityData targetIdentityData = request.getTarget();
-
-    	if (LOG.isDebugEnabled()) {
-    		LOG.debug("request clearValue " + fieldIdentifier + " on " + targetIdentityData + " for " + session);
-    	}
+        AuthenticationSession session = request.getSession();
+        String fieldIdentifier = request.getFieldIdentifier();
+        IdentityData targetIdentityData = request.getTarget();
+
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("request clearValue " + fieldIdentifier + " on " + targetIdentityData + " for " + session);
+        }
 
         final ObjectAdapter targetAdapter = getPersistentObjectAdapter(session, targetIdentityData);
-        final OneToOneAssociation association = (OneToOneAssociation) targetAdapter.getSpecification().getAssociation(fieldIdentifier);
+        final OneToOneAssociation association =
+            (OneToOneAssociation) targetAdapter.getSpecification().getAssociation(fieldIdentifier);
 
         ensureAssociationModifiableElseThrowException(session, targetAdapter, association);
 
@@ -354,27 +359,24 @@ public class ServerFacadeImpl implements
         return new ClearValueResponse(getUpdates());
     }
 
-	private void ensureAssociationModifiableElseThrowException(
-			final AuthenticationSession session,
-			final ObjectAdapter targetAdapter,
-			final ObjectAssociation association) {
-		if (!association.isVisible(session, targetAdapter).isAllowed() ||
-        	 association.isUsable(session, targetAdapter).isVetoed()) {
+    private void ensureAssociationModifiableElseThrowException(final AuthenticationSession session,
+        final ObjectAdapter targetAdapter, final ObjectAssociation association) {
+        if (!association.isVisible(session, targetAdapter).isAllowed()
+            || association.isUsable(session, targetAdapter).isVetoed()) {
             throw new IsisException("can't modify field as not visible or editable");
         }
-	}
-
+    }
 
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // executeClientAction
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
 
-    public ExecuteClientActionResponse executeClientAction(
-    		ExecuteClientActionRequest request) {
+    @Override
+    public ExecuteClientActionResponse executeClientAction(ExecuteClientActionRequest request) {
 
-    	AuthenticationSession session = request.getSession();
-    	ReferenceData[] data = request.getData();
-    	int[] types = request.getTypes();
+        AuthenticationSession session = request.getSession();
+        ReferenceData[] data = request.getData();
+        int[] types = request.getTypes();
 
         if (LOG.isDebugEnabled()) {
             LOG.debug("execute client action for " + session);
@@ -393,40 +395,40 @@ public class ServerFacadeImpl implements
             for (int i = 0; i < data.length; i++) {
                 ObjectAdapter object;
                 switch (types[i]) {
-                case ClientTransactionEvent.ADD:
-                    object = encoderDecoder.decode(data[i], knownObjects);
-                    persistedObjects[i] = object;
-                    if (object.getOid().isTransient()) { // confirm that the graph has not been made
-                        // persistent earlier in this loop
-                        LOG.debug("  makePersistent " + data[i]);
-                        getPersistenceSession().makePersistent(object);
-                    }
-                    break;
-
-                case ClientTransactionEvent.CHANGE:
-                    final ObjectAdapter obj = getPersistentObjectAdapter(data[i]);
-                    obj.checkLock(data[i].getVersion());
-
-                    object = encoderDecoder.decode(data[i], knownObjects);
-                    LOG.debug("  objectChanged " + data[i]);
-                    getPersistenceSession().objectChanged(object);
-                    changedObjects[i] = object;
-                    break;
-
-                case ClientTransactionEvent.DELETE:
-                    final ObjectAdapter inObject = getPersistentObjectAdapter(data[i]);
-                    inObject.checkLock(data[i].getVersion());
-
-                    LOG.debug("  destroyObject " + data[i] + " for " + session);
-                    disposedObjects[i] = inObject;
-                    getPersistenceSession().destroyObject(inObject);
-                    break;
+                    case ClientTransactionEvent.ADD:
+                        object = encoderDecoder.decode(data[i], knownObjects);
+                        persistedObjects[i] = object;
+                        if (object.getOid().isTransient()) { // confirm that the graph has not been made
+                            // persistent earlier in this loop
+                            LOG.debug("  makePersistent " + data[i]);
+                            getPersistenceSession().makePersistent(object);
+                        }
+                        break;
+
+                    case ClientTransactionEvent.CHANGE:
+                        final ObjectAdapter obj = getPersistentObjectAdapter(data[i]);
+                        obj.checkLock(data[i].getVersion());
+
+                        object = encoderDecoder.decode(data[i], knownObjects);
+                        LOG.debug("  objectChanged " + data[i]);
+                        getPersistenceSession().objectChanged(object);
+                        changedObjects[i] = object;
+                        break;
+
+                    case ClientTransactionEvent.DELETE:
+                        final ObjectAdapter inObject = getPersistentObjectAdapter(data[i]);
+                        inObject.checkLock(data[i].getVersion());
+
+                        LOG.debug("  destroyObject " + data[i] + " for " + session);
+                        disposedObjects[i] = inObject;
+                        getPersistenceSession().destroyObject(inObject);
+                        break;
                 }
 
             }
 
             if (LOG.isDebugEnabled()) {
-            	LOG.debug("  end transaction");
+                LOG.debug("  end transaction");
             }
             getTransactionManager().endTransaction();
 
@@ -435,13 +437,13 @@ public class ServerFacadeImpl implements
 
             for (int i = 0; i < data.length; i++) {
                 switch (types[i]) {
-                case ClientTransactionEvent.ADD:
-                    madePersistent[i] = encoderDecoder.encodeIdentityData(persistedObjects[i]);
-                    break;
-
-                case ClientTransactionEvent.CHANGE:
-                    changedVersion[i] = changedObjects[i].getVersion();
-                    break;
+                    case ClientTransactionEvent.ADD:
+                        madePersistent[i] = encoderDecoder.encodeIdentityData(persistedObjects[i]);
+                        break;
+
+                    case ClientTransactionEvent.CHANGE:
+                        changedVersion[i] = changedObjects[i].getVersion();
+                        break;
 
                 }
             }
@@ -454,19 +456,18 @@ public class ServerFacadeImpl implements
         }
     }
 
-
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // executeServerAction
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
 
-    public ExecuteServerActionResponse executeServerAction(
-            ExecuteServerActionRequest request) {
+    @Override
+    public ExecuteServerActionResponse executeServerAction(ExecuteServerActionRequest request) {
 
-    	AuthenticationSession session = request.getSession();
-    	ObjectActionType actionType = request.getActionType();
-    	String actionIdentifier = request.getActionIdentifier();
-    	ReferenceData targetData = request.getTarget();
-    	Data[] parameterData = request.getParameters();
+        AuthenticationSession session = request.getSession();
+        ObjectActionType actionType = request.getActionType();
+        String actionIdentifier = request.getActionIdentifier();
+        ReferenceData targetData = request.getTarget();
+        Data[] parameterData = request.getParameters();
 
         if (LOG.isDebugEnabled()) {
             LOG.debug("request executeAction " + actionIdentifier + " on " + targetData + " for " + session);
@@ -476,8 +477,7 @@ public class ServerFacadeImpl implements
 
         ObjectAdapter targetAdapter = decodeTargetAdapter(session, targetData, knownObjects);
 
-        final ObjectAction action =
-        	targetAdapter.getSpecification().getObjectAction(actionType, actionIdentifier);
+        final ObjectAction action = targetAdapter.getSpecification().getObjectAction(actionType, actionIdentifier);
         final ObjectAdapter[] parameters = decodeParameters(session, parameterData, knownObjects);
 
         if (action == null) {
@@ -497,17 +497,18 @@ public class ServerFacadeImpl implements
 
         final ObjectData[] persistedParameterData = new ObjectData[parameterData.length];
         for (int i = 0; i < persistedParameterData.length; i++) {
-            if (action.getParameters()[i].getSpecification().isNotCollection() && parameterData[i] instanceof ObjectData) {
-                persistedParameterData[i] = encoderDecoder.encodeMadePersistentGraph((ObjectData) parameterData[i], parameters[i]);
+            if (action.getParameters()[i].getSpecification().isNotCollection()
+                && parameterData[i] instanceof ObjectData) {
+                persistedParameterData[i] =
+                    encoderDecoder.encodeMadePersistentGraph((ObjectData) parameterData[i], parameters[i]);
             }
         }
         final List<String> messages = getMessageBroker().getMessages();
         final List<String> warnings = getMessageBroker().getWarnings();
 
         // TODO for efficiency, need to remove the objects in the results graph from the updates set
-        return encoderDecoder.encodeServerActionResult(
-        		resultAdapter, getUpdates(), getDisposed(), persistedTargetData, persistedParameterData,
-                messages.toArray(new String[0]), warnings.toArray(new String[0]));
+        return encoderDecoder.encodeServerActionResult(resultAdapter, getUpdates(), getDisposed(), persistedTargetData,
+            persistedParameterData, messages.toArray(new String[0]), warnings.toArray(new String[0]));
     }
 
     private ObjectAdapter decodeTargetAdapter(AuthenticationSession session, ReferenceData targetData,
@@ -527,11 +528,8 @@ public class ServerFacadeImpl implements
     }
 
     @SuppressWarnings("unused")
-    private ObjectAction getActionMethod(
-            final String actionType,
-            final String actionIdentifier,
-            final Data[] parameterData,
-            final ObjectAdapter adapter) {
+    private ObjectAction getActionMethod(final String actionType, final String actionIdentifier,
+        final Data[] parameterData, final ObjectAdapter adapter) {
         final ObjectSpecification[] parameterSpecs = new ObjectSpecification[parameterData.length];
         for (int i = 0; i < parameterSpecs.length; i++) {
             parameterSpecs[i] = getSpecification(parameterData[i].getType());
@@ -549,7 +547,8 @@ public class ServerFacadeImpl implements
         return adapter.getSpecification().getObjectAction(type, methodName, parameterSpecs);
     }
 
-    private ObjectAdapter[] decodeParameters(final AuthenticationSession session, final Data[] parameterData, final KnownObjectsRequest knownObjects) {
+    private ObjectAdapter[] decodeParameters(final AuthenticationSession session, final Data[] parameterData,
+        final KnownObjectsRequest knownObjects) {
         final ObjectAdapter[] parameters = new ObjectAdapter[parameterData.length];
         for (int i = 0; i < parameters.length; i++) {
             final Data data = parameterData[i];
@@ -562,14 +561,13 @@ public class ServerFacadeImpl implements
             } else if (data instanceof ObjectData) {
                 parameters[i] = encoderDecoder.decode(data, knownObjects);
             } else if (data instanceof EncodableObjectData) {
-                final ObjectSpecification valueSpecification = getSpecificationLoader().loadSpecification(
-                        data.getType());
+                final ObjectSpecification valueSpecification =
+                    getSpecificationLoader().loadSpecification(data.getType());
                 final String valueData = ((EncodableObjectData) data).getEncodedObjectData();
 
                 final ObjectAdapter value = restoreLeafObject(valueData, valueSpecification);
                 /*
-                 * [[NAME]]Value value =
-                 * IsisContext.getObjectLoader().createValueInstance(valueSpecification);
+                 * ObjectAdapter value = IsisContext.getObjectLoader().createValueInstance(valueSpecification);
                  * value.restoreFromEncodedString(valueData);
                  */
                 parameters[i] = value;
@@ -581,23 +579,22 @@ public class ServerFacadeImpl implements
     }
 
     private ReferenceData[] getDisposed() {
-    	final List<ReferenceData> list = new ArrayList<ReferenceData>();
-        for(ObjectAdapter element: getUpdateNotifier().getDisposedObjects()) {
+        final List<ReferenceData> list = new ArrayList<ReferenceData>();
+        for (ObjectAdapter element : getUpdateNotifier().getDisposedObjects()) {
             list.add(encoderDecoder.encodeIdentityData(element));
         }
-        return (ReferenceData[]) list.toArray(new ReferenceData[list.size()]);
+        return list.toArray(new ReferenceData[list.size()]);
     }
 
-
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // getObject, resolve
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
 
-    public GetObjectResponse getObject(
-    		GetObjectRequest request) {
+    @Override
+    public GetObjectResponse getObject(GetObjectRequest request) {
 
-    	Oid oid = request.getOid();
-    	String specificationName = request.getSpecificationName();
+        Oid oid = request.getOid();
+        String specificationName = request.getSpecificationName();
 
         final ObjectSpecification specification = getSpecification(specificationName);
         final ObjectAdapter adapter = getPersistenceSession().loadObject(oid, specification);
@@ -605,12 +602,12 @@ public class ServerFacadeImpl implements
         return new GetObjectResponse(encoderDecoder.encodeForUpdate(adapter));
     }
 
-    public ResolveFieldResponse resolveField(
-    		ResolveFieldRequest request) {
+    @Override
+    public ResolveFieldResponse resolveField(ResolveFieldRequest request) {
 
-    	AuthenticationSession session = request.getSession();
-    	IdentityData targetData = request.getTarget();
-    	String fieldIdentifier = request.getFieldIdentifier();
+        AuthenticationSession session = request.getSession();
+        IdentityData targetData = request.getTarget();
+        String fieldIdentifier = request.getFieldIdentifier();
 
         if (LOG.isDebugEnabled()) {
             LOG.debug("request resolveField " + targetData + "/" + fieldIdentifier + " for " + session);
@@ -622,15 +619,14 @@ public class ServerFacadeImpl implements
 
         getPersistenceSession().resolveField(targetAdapter, field);
         Data data = encoderDecoder.encodeForResolveField(targetAdapter, fieldIdentifier);
-		return new ResolveFieldResponse(data);
+        return new ResolveFieldResponse(data);
     }
 
-    public ResolveObjectResponse resolveImmediately(
-    		ResolveObjectRequest request) {
-
-    	AuthenticationSession session = request.getSession();
-    	IdentityData targetData = request.getTarget();
+    @Override
+    public ResolveObjectResponse resolveImmediately(ResolveObjectRequest request) {
 
+        AuthenticationSession session = request.getSession();
+        IdentityData targetData = request.getTarget();
 
         if (LOG.isDebugEnabled()) {
             LOG.debug("request resolveImmediately " + targetData + " for " + session);
@@ -647,35 +643,34 @@ public class ServerFacadeImpl implements
         return new ResolveObjectResponse(encoderDecoder.encodeCompletePersistentGraph(object));
     }
 
-
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // findInstances, hasInstances
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
 
-    public FindInstancesResponse findInstances(
-    		final FindInstancesRequest request) {
+    @Override
+    public FindInstancesResponse findInstances(final FindInstancesRequest request) {
 
-    	AuthenticationSession session = request.getSession();
-    	PersistenceQueryData criteriaData = request.getCriteria();
+        AuthenticationSession session = request.getSession();
+        PersistenceQueryData criteriaData = request.getCriteria();
 
         final PersistenceQuery criteria = encoderDecoder.decodePersistenceQuery(criteriaData);
         LOG.debug("request findInstances " + criteria + " for " + session);
         final ObjectAdapter instances = getPersistenceSession().findInstances(criteria);
         ObjectData[] instancesData = convertToCollectionAdapter(instances);
-		return new FindInstancesResponse(instancesData);
+        return new FindInstancesResponse(instancesData);
     }
 
-    public HasInstancesResponse hasInstances(
-    		HasInstancesRequest request) {
+    @Override
+    public HasInstancesResponse hasInstances(HasInstancesRequest request) {
 
-    	AuthenticationSession session = request.getSession();
-    	String specificationName = request.getSpecificationName();
+        AuthenticationSession session = request.getSession();
+        String specificationName = request.getSpecificationName();
 
-    	if (LOG.isDebugEnabled()) {
-    		LOG.debug("request hasInstances of " + specificationName + " for " + session);
-    	}
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("request hasInstances of " + specificationName + " for " + session);
+        }
         boolean hasInstances = getPersistenceSession().hasInstances(getSpecification(specificationName));
-		return new HasInstancesResponse(hasInstances);
+        return new HasInstancesResponse(hasInstances);
     }
 
     private ObjectData[] convertToCollectionAdapter(final ObjectAdapter instances) {
@@ -690,27 +685,25 @@ public class ServerFacadeImpl implements
         return data;
     }
 
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // oidForService
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
 
-    public OidForServiceResponse oidForService(
-    		OidForServiceRequest request) {
+    @Override
+    public OidForServiceResponse oidForService(OidForServiceRequest request) {
 
-    	String serviceId = request.getServiceId();
+        String serviceId = request.getServiceId();
 
         final ObjectAdapter serviceAdapter = getPersistenceSession().getService(serviceId);
         if (serviceAdapter == null) {
             throw new IsisRemoteException("Failed to find service " + serviceId);
         }
-        return new OidForServiceResponse(
-        		encoderDecoder.encodeIdentityData(serviceAdapter));
+        return new OidForServiceResponse(encoderDecoder.encodeIdentityData(serviceAdapter));
     }
 
-
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // Helpers
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
 
     private ObjectSpecification getSpecification(final String fullName) {
         return getSpecificationLoader().loadSpecification(fullName);
@@ -742,26 +735,24 @@ public class ServerFacadeImpl implements
     }
 
     private ObjectData[] getUpdates() {
-    	final List<ObjectData> list = new ArrayList<ObjectData>();
-    	for(ObjectAdapter element: getUpdateNotifier().getChangedObjects()) {
-    		list.add(encoderDecoder.encodeForUpdate(element));
-    	}
-        return (ObjectData[]) list.toArray(new ObjectData[list.size()]);
+        final List<ObjectData> list = new ArrayList<ObjectData>();
+        for (ObjectAdapter element : getUpdateNotifier().getChangedObjects()) {
+            list.add(encoderDecoder.encodeForUpdate(element));
+        }
+        return list.toArray(new ObjectData[list.size()]);
     }
 
-
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // Dependencies (injected)
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
 
     public void setEncoder(final ObjectEncoderDecoder objectEncoder) {
         this.encoderDecoder = objectEncoder;
     }
 
-
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
     // Dependencies (from context)
-    ////////////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////////////
 
     private static SpecificationLoader getSpecificationLoader() {
         return IsisContext.getSpecificationLoader();
@@ -783,6 +774,4 @@ public class ServerFacadeImpl implements
         return IsisContext.getMessageBroker();
     }
 
-
-
 }

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnection.java?rev=1030308&r1=1030307&r2=1030308&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnection.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnection.java Wed Nov  3 01:24:18 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.remoting.server;
 
 import java.io.IOException;
@@ -29,17 +28,19 @@ import org.apache.isis.remoting.facade.S
 import org.apache.isis.remoting.protocol.ServerMarshaller;
 
 /**
- * Acts as the mediator between the {@link ServerMarshaller} (which pulls stuff off the
- * transport and pushes stuff on) and the {@link ServerFacade}, ie the rest of the [[NAME]] System.
+ * Acts as the mediator between the {@link ServerMarshaller} (which pulls stuff off the transport and pushes stuff on)
+ * and the {@link ServerFacade}, ie the rest of the Apache Isis System.
  * 
  * @see ClientConnection
  */
 public interface ServerConnection {
 
     ServerFacade getServerFacade();
-    
+
     Request readRequest() throws IOException;
+
     void sendResponse(Object response) throws IOException;
+
     void sendError(IsisException exception) throws IOException;
-    
+
 }



Mime
View raw message