polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject [05/28] zest-java git commit: ZEST-180, ZEST-186, ZEST-187, ZEST-188 Big Identity refactoring UnitOfWorkFactory is auto added to all modules that doesn't declare one IdentityGenerator is auto-added to all modules that deosn't declare one. Removed DCI/DDD
Date Sun, 23 Oct 2016 14:23:46 GMT
http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/java/org/apache/zest/sample/dcicargo/sample_b/infrastructure/wicket/tabs/TabsPanel.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/java/org/apache/zest/sample/dcicargo/sample_b/infrastructure/wicket/tabs/TabsPanel.java b/samples/dci-cargo/dcisample_b/src/main/java/org/apache/zest/sample/dcicargo/sample_b/infrastructure/wicket/tabs/TabsPanel.java
deleted file mode 100644
index 79df9e9..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/java/org/apache/zest/sample/dcicargo/sample_b/infrastructure/wicket/tabs/TabsPanel.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *
- */
-package org.apache.zest.sample.dcicargo.sample_b.infrastructure.wicket.tabs;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import org.apache.wicket.Application;
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.MetaDataKey;
-import org.apache.wicket.Page;
-import org.apache.wicket.devutils.stateless.StatelessComponent;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.RepeatingView;
-
-/**
- * TabsPanel
- *
- * Convenience panel that stores tab data as application meta data.
- */
-@StatelessComponent
-public class TabsPanel extends Panel
-{
-    public static final MetaDataKey<LinkedHashMap<Class, String[]>> TABS_PANEL_KEY = new MetaDataKey<LinkedHashMap<Class, String[]>>()
-    {
-        public static final long serialVersionUID = 1L;
-    };
-
-    public static <T extends Page> void registerTab( Application app, Class<T> clazz, String ref, String label )
-    {
-        registerTab( app, clazz, ref, label, null );
-    }
-
-    public static <T extends Page> void registerTab( Application app,
-                                                     Class<T> clazz,
-                                                     String ref,
-                                                     String label,
-                                                     String cssClass
-    )
-    {
-        Map<Class, String[]> tabsInfo = app.getMetaData( TABS_PANEL_KEY );
-
-        if( tabsInfo == null || tabsInfo.isEmpty() )
-        {
-            tabsInfo = new LinkedHashMap<Class, String[]>();
-        }
-
-        tabsInfo.put( clazz, new String[]{ ref, label } );
-        app.setMetaData( TABS_PANEL_KEY, tabsInfo );
-    }
-
-    @SuppressWarnings( "unchecked" )
-    public TabsPanel( String activeTab )
-    {
-        super( "tabsPanel" );
-
-        Map<Class, String[]> tabs = getApplication().getMetaData( TABS_PANEL_KEY );
-        if( tabs == null || tabs.isEmpty() )
-        {
-            throw new RuntimeException( "Please register one or more tabs." );
-        }
-
-        RepeatingView tabsView = new RepeatingView( "tabsView" );
-
-        // Loop "mounted" tabs
-        for( Map.Entry<Class, String[]> tab : tabs.entrySet() )
-        {
-            Class pageClass = tab.getKey();
-            String tabReference = tab.getValue()[ 0 ];
-            String tabLabel = tab.getValue()[ 1 ];
-
-            WebMarkupContainer tabView = new WebMarkupContainer( tabsView.newChildId() );
-            if( tabReference.equals( activeTab ) )
-            {
-                tabView.add( new AttributeModifier( "id", "current" ) );
-            }
-
-            BookmarkablePageLink link = new BookmarkablePageLink( "link", pageClass );  // unchecked
-
-            Label label = new Label( "label", tabLabel );
-
-            tabsView.add( tabView.add( link.add( label ) ) );
-        }
-        add( tabsView );
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/log4j.properties b/samples/dci-cargo/dcisample_b/src/main/resources/log4j.properties
deleted file mode 100644
index ee99a1a..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#
-#
-
-log4j.appender.Stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.Stdout.layout.conversionPattern=%-5p - %-36.36c{1} - %m\n
-
-log4j.rootLogger=INFO,Stdout
-#log4j.rootLogger=DEBUG,Stdout
-
-#log4j.logger.org.apache.wicket=DEBUG
-#log4j.logger.org.apache.wicket.protocol.http.HttpSessionStore=DEBUG
-#log4j.logger.org.apache.wicket.version=DEBUG
-#log4j.logger.org.apache.wicket.RequestCycle=DEBUG
-#log4j.logger.org.apache.wicket.util.resource=DEBUG
-
-#log4j.logger.org.apache.zest.index.rdf.query.internal.RdfQueryParserImpl=DEBUG, Stdout
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/BasePage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/BasePage.html b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/BasePage.html
deleted file mode 100644
index 0263cd1..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/BasePage.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!--
-  ~  Licensed to the Apache Software Foundation (ASF) under one
-  ~  or more contributor license agreements.  See the NOTICE file
-  ~  distributed with this work for additional information
-  ~  regarding copyright ownership.  The ASF licenses this file
-  ~  to you under the Apache License, Version 2.0 (the
-  ~  "License"); you may not use this file except in compliance
-  ~  with the License.  You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  ~
-  -->
-
-<html xmlns:wicket>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<head>
-    <title>DCI sample (version B)</title>
-    <link href="css/style.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
-
-<div class="left">
-    <div class="headline"><a href="/">DCI sample</a></div>
-    <div id="toggle">
-        <a href="#" class="closed" wicket:id="toggleLinks">Apache Zest/Wicket port of the DDD sample application to the DCI
-            paradigm.</a>
-    </div>
-
-    <div id="links" wicket:id="links"></div>
-    <wicket:fragment wicket:id="linksFragment">
-        <br>
-        <table>
-            <thead>
-            <tr>
-                <td>DCI</td>
-                <td>DDD</td>
-                <td>Apache Zest</td>
-                <td>Apache Wicket</td>
-                <td>Marc Grue blog</td>
-                <td>Books</td>
-            </tr>
-            </thead>
-            <tbody>
-            <tr>
-                <td valign="top">
-                    <a href="http://groups.google.com/group/object-composition/topics?hl=en"
-                       target="_blank">Forum</a><br>
-                    <a href="https://github.com/DCI/dci-sample" target="_blank">Github</a><br>
-                    <a href="http://en.wikipedia.org/wiki/Data,_Context,_and_Interaction" target="_blank">Wiki</a><br>
-                    <a href="http://folk.uio.no/trygver/2010/DCIExecutionModel.pdf" target="_blank">Execution Model</a>
-                </td>
-                <td valign="top">
-                    <a href="http://dddsample.sourceforge.net/" target="_blank">Sample</a><br>
-                    <a href="http://tech.groups.yahoo.com/group/domaindrivendesign/" target="_blank">Forum</a>
-                </td>
-                <td valign="top">
-                    <a href="https://zest.apache.org/" target="_blank">Website</a><br>
-                    <a href="https://zest.apache.org/community/get_help.html" target="_blank">Forum</a><br>
-                    <a href="https://zest.apache.org/download.html" target="_blank">Download</a><br>
-                    <a href="https://zest.apache.org/java/latest/howto-depend-on-zest.html" target="_blank">Maven</a><br>
-                    <a href="https://github.com/apache/zest-java" target="_blank">Github</a>
-                </td>
-                <td valign="top">
-                    <a href="http://wicket.apache.org/" target="_blank">Website</a><br>
-                    <a href="http://apache-wicket.1842946.n4.nabble.com/Users-forum-f1842947.html"
-                       target="_blank">Forum</a><br>
-                    <a href="http://wicketstuff.org/wicket/index.html" target="_blank">Examples</a><br>
-                    <a href="https://cwiki.apache.org/WICKET/" target="_blank">Wiki</a><br>
-                    <a href="http://apache.dataphone.se/wicket/1.5.1/" target="_blank">Download</a>
-                </td>
-                <td valign="top">
-                    <a href="http://marcgrue.com/" target="_blank">Overview</a><br>
-                    <a href="http://marcgrue.com/dci/dci-sample/what-the-system-is" target="_blank">What-the-system-is</a><br>
-                    <a href="http://marcgrue.com/dci/process-thinking" target="_blank">Process Thinking</a><br>
-                </td>
-                <td valign="top">
-                    <a href="http://www.amazon.co.uk/gp/product/0470684208/ref=as_li_ss_tl?ie=UTF8&tag=doubtrol-21&linkCode=as2&camp=1634&creative=19450&creativeASIN=0470684208"
-                       target="_blank">Lean Architecture</a><img
-                        src="http://www.assoc-amazon.co.uk/e/ir?t=&l=as2&o=2&a=0470684208" width="1" height="1"
-                        border="0" alt="" style="border:none !important; margin:0px !important;"/><br>
-                    <a href="http://www.amazon.co.uk/gp/product/0201702258/ref=as_li_ss_tl?ie=UTF8&tag=doubtrol-21&linkCode=as2&camp=1634&creative=19450&creativeASIN=0201702258"
-                       target="_blank">Writing Effective Use Cases</a><img
-                        src="http://www.assoc-amazon.co.uk/e/ir?t=doubtrol-21&l=as2&o=2&a=0201702258" width="1"
-                        height="1" border="0" alt="" style="border:none !important; margin:0px !important;"/>
-                </td>
-            </tr>
-            </tbody>
-        </table>
-    </wicket:fragment>
-</div>
-
-<div class="right">
-    <b>Java-Zest-Wicket<br>
-        Version <span wicket:id="version">[X.Y.Z]</span></b><br>
-    Created 2011-10-04<br>
-    Modified 2011-10-04<br>
-    by Marc Grue
-</div>
-
-<div wicket:id="tabsPanel">[tabs]</div>
-
-<!--Inherited pages go here-->
-<wicket:child/>
-
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/BookNewCargoPage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/BookNewCargoPage.html b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/BookNewCargoPage.html
deleted file mode 100644
index c9eb686..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/BookNewCargoPage.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!--
-  ~  Licensed to the Apache Software Foundation (ASF) under one
-  ~  or more contributor license agreements.  See the NOTICE file
-  ~  distributed with this work for additional information
-  ~  regarding copyright ownership.  The ASF licenses this file
-  ~  to you under the Apache License, Version 2.0 (the
-  ~  "License"); you may not use this file except in compliance
-  ~  with the License.  You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  ~
-  -->
-
-<html xmlns:wicket>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<wicket:extend>
-    <div class="headerMenu">
-        Book new cargo
-        <wicket:link><a href="CargoListPage.html">List of Cargos</a></wicket:link>
-    </div>
-
-    <form wicket:id="form">
-        <div wicket:id="feedback"></div>
-        <table>
-            <tbody>
-            <tr>
-                <td>Origin</td>
-                <td>
-                    <select wicket:id="originSelector">
-                        <option>Markup1</option>
-                        <option>Markup2</option>
-                    </select>
-                </td>
-                <td>
-                    <div wicket:id="originFeedback">&nbsp;</div>
-                </td>
-            </tr>
-            <tr>
-                <td>Destination</td>
-                <td>
-                    <select wicket:id="destinationSelector"></select>
-                </td>
-                <td>
-                    <div wicket:id="destinationFeedback">&nbsp;</div>
-                </td>
-            </tr>
-            <tr>
-                <td>Arrival deadline</td>
-                <td>
-                    <input type="text" wicket:id="deadline"/>
-                </td>
-                <td>
-                    <div wicket:id="deadlineFeedback">&nbsp;</div>
-                </td>
-            </tr>
-            </tbody>
-            <tfoot>
-            <tr>
-                <td></td>
-                <td>
-                    <input type="submit" value="Book" wicket:id="book"/>
-                </td>
-            </tr>
-            </tfoot>
-        </table>
-    </form>
-
-</wicket:extend>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/BookingBasePage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/BookingBasePage.html b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/BookingBasePage.html
deleted file mode 100644
index 6a4c159..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/BookingBasePage.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ~  Licensed to the Apache Software Foundation (ASF) under one
-  ~  or more contributor license agreements.  See the NOTICE file
-  ~  distributed with this work for additional information
-  ~  regarding copyright ownership.  The ASF licenses this file
-  ~  to you under the Apache License, Version 2.0 (the
-  ~  "License"); you may not use this file except in compliance
-  ~  with the License.  You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  ~
-  -->
-
-<html xmlns:wicket>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<wicket:extend>
-    <div id="box">
-        <wicket:child/>
-    </div>
-</wicket:extend>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/CargoDetailsPage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/CargoDetailsPage.html b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/CargoDetailsPage.html
deleted file mode 100644
index 0146e20..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/CargoDetailsPage.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<!--
-  ~  Licensed to the Apache Software Foundation (ASF) under one
-  ~  or more contributor license agreements.  See the NOTICE file
-  ~  distributed with this work for additional information
-  ~  regarding copyright ownership.  The ASF licenses this file
-  ~  to you under the Apache License, Version 2.0 (the
-  ~  "License"); you may not use this file except in compliance
-  ~  with the License.  You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  ~
-  -->
-
-<html xmlns:wicket>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<wicket:extend>
-
-    <div wicket:id="prevNext"></div>
-    <div class="headerMenu">
-        Details for cargo <span wicket:id="trackingId">[trackingId]</span>
-        <wicket:link>
-            <a href="CargoListPage.html">List of Cargos</a>
-            <a href="BookNewCargoPage.html">Book new cargo</a>
-        </wicket:link>
-    </div>
-
-    <table class="styleLeftColumn">
-
-        <wicket:container wicket:id="origin"></wicket:container>
-        <wicket:fragment wicket:id="originFragment">
-            <tr>
-                <td>Origin</td>
-                <td wicket:id="cargoOrigin"></td>
-            </tr>
-        </wicket:fragment>
-        <wicket:fragment wicket:id="re-routed-originFragment">
-            <tr>
-                <td>Origin (Cargo)</td>
-                <td wicket:id="cargoOrigin"></td>
-            </tr>
-            <tr>
-                <td>Origin (Route Spec)</td>
-                <td wicket:id="routeOrigin"></td>
-            </tr>
-        </wicket:fragment>
-
-        <tr>
-            <td>Destination</td>
-            <td wicket:id="destination"></td>
-            <td wicket:id="changeDestination"></td>
-        </tr>
-        <tr>
-            <td>Earliest departure</td>
-            <td wicket:id="departure"></td>
-        </tr>
-        <tr>
-            <td>Arrival deadline</td>
-            <td wicket:id="deadline"></td>
-        </tr>
-        <tr>
-            <td>Routing status</td>
-            <td wicket:id="routingStatus"></td>
-            <td wicket:id="routingAction"></td>
-        </tr>
-
-        <wicket:container wicket:id="delivery"></wicket:container>
-        <wicket:fragment wicket:id="deliveryFragment">
-            <tr>
-                <td>Transport status</td>
-                <td wicket:id="transportStatus"></td>
-            </tr>
-            <tr>
-                <td valign="top">Delivery status</td>
-                <td wicket:id="deliveryStatus"></td>
-            </tr>
-        </wicket:fragment>
-
-    </table>
-
-    <wicket:container wicket:id="itinerary"></wicket:container>
-    <wicket:fragment wicket:id="itineraryFragment">
-        <h4>Itinerary</h4>
-        <table>
-            <thead>
-            <tr>
-                <td>Voyage</td>
-                <td colspan="2">Load</td>
-                <td colspan="2">Unload</td>
-            </tr>
-            </thead>
-            <tbody>
-            <tr wicket:id="legs">
-                <td wicket:id="voyage"></td>
-                <td wicket:id="loadLocation"></td>
-                <td wicket:id="loadDate"></td>
-                <td wicket:id="unloadLocation"></td>
-                <td wicket:id="unloadDate"></td>
-            </tr>
-            </tbody>
-        </table>
-    </wicket:fragment>
-
-    <div wicket:id="handlingHistoryPanel"></div>
-
-    <div wicket:id="nextHandlingEventPanel"></div>
-
-</wicket:extend>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/CargoListPage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/CargoListPage.html b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/CargoListPage.html
deleted file mode 100644
index 276c015..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/CargoListPage.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--
-  ~  Licensed to the Apache Software Foundation (ASF) under one
-  ~  or more contributor license agreements.  See the NOTICE file
-  ~  distributed with this work for additional information
-  ~  regarding copyright ownership.  The ASF licenses this file
-  ~  to you under the Apache License, Version 2.0 (the
-  ~  "License"); you may not use this file except in compliance
-  ~  with the License.  You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  ~
-  -->
-
-<html xmlns:wicket>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<wicket:extend>
-    <div class="headerMenu">
-        List of Cargos
-        <wicket:link><a href="BookNewCargoPage.html">Book new cargo</a></wicket:link>
-    </div>
-
-    <table>
-        <thead>
-        <tr>
-            <td>Tracking Id</td>
-            <td>Origin</td>
-            <td>Destination</td>
-            <td>Arrival deadline</td>
-            <td>Routing status</td>
-            <td>Transport status</td>
-            <td>Delivery status</td>
-        </tr>
-        </thead>
-        <tbody>
-        <tr wicket:id="list">
-            <td wicket:id="trackingId"></td>
-            <td wicket:id="origin"></td>
-            <td align="center" wicket:id="destination"></td>
-            <td align="center" wicket:id="deadline"></td>
-            <td wicket:id="routingStatus"></td>
-            <td wicket:id="transportStatus"></td>
-            <td wicket:id="deliveryStatus"></td>
-        </tr>
-        </tbody>
-    </table>
-</wicket:extend>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/ChangeDestinationPage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/ChangeDestinationPage.html b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/ChangeDestinationPage.html
deleted file mode 100644
index a3815a3..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/ChangeDestinationPage.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!--
-  ~  Licensed to the Apache Software Foundation (ASF) under one
-  ~  or more contributor license agreements.  See the NOTICE file
-  ~  distributed with this work for additional information
-  ~  regarding copyright ownership.  The ASF licenses this file
-  ~  to you under the Apache License, Version 2.0 (the
-  ~  "License"); you may not use this file except in compliance
-  ~  with the License.  You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  ~
-  -->
-
-<html xmlns:wicket>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<wicket:extend>
-
-    <div class="headerMenu">
-        Change destination for cargo <span wicket:id="trackingId">[trackingId]</span>
-        <wicket:link>
-            <a href="CargoListPage.html">List of Cargos</a>
-            <a href="BookNewCargoPage.html">Book new cargo</a>
-        </wicket:link>
-    </div>
-
-    <form wicket:id="form">
-        <div wicket:id="usecaseFeedback"></div>
-        <table>
-            <tbody>
-            <tr>
-                <td>Origin</td>
-                <td wicket:id="origin"></td>
-            </tr>
-            <tr>
-                <td>Old destination</td>
-                <td wicket:id="destination"></td>
-            </tr>
-            <tr>
-                <td>New destination</td>
-                <td>
-                    <select wicket:id="destinationSelector"></select>
-                </td>
-                <td wicket:id="destinationFeedback"></td>
-            </tr>
-            </tbody>
-            <tfoot>
-            <tr>
-                <td></td>
-                <td>
-                    <input type="submit" value="Change destination" wicket:id="submit"/>
-                </td>
-            </tr>
-            </tfoot>
-        </table>
-    </form>
-
-</wicket:extend>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/ReRouteCargoPage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/ReRouteCargoPage.html b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/ReRouteCargoPage.html
deleted file mode 100644
index 98aa97f..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/ReRouteCargoPage.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-  ~  Licensed to the Apache Software Foundation (ASF) under one
-  ~  or more contributor license agreements.  See the NOTICE file
-  ~  distributed with this work for additional information
-  ~  regarding copyright ownership.  The ASF licenses this file
-  ~  to you under the Apache License, Version 2.0 (the
-  ~  "License"); you may not use this file except in compliance
-  ~  with the License.  You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  ~
-  -->
-
-<html xmlns:wicket>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<wicket:extend>
-
-    <div class="headerMenu">
-        Re-route cargo <span wicket:id="trackingId">[trackingId]</span>
-        <wicket:link>
-            <a href="CargoListPage.html">List of Cargos</a>
-            <a href="BookNewCargoPage.html">Book new cargo</a>
-        </wicket:link>
-    </div>
-
-    <span wicket:id="feedback"></span>
-
-    <span wicket:id="routes">
-        <span wicket:id="route"></span><br/>
-    </span>
-
-</wicket:extend>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/RouteCargoPage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/RouteCargoPage.html b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/RouteCargoPage.html
deleted file mode 100644
index 1b0968c..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/RouteCargoPage.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-  ~  Licensed to the Apache Software Foundation (ASF) under one
-  ~  or more contributor license agreements.  See the NOTICE file
-  ~  distributed with this work for additional information
-  ~  regarding copyright ownership.  The ASF licenses this file
-  ~  to you under the Apache License, Version 2.0 (the
-  ~  "License"); you may not use this file except in compliance
-  ~  with the License.  You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  ~
-  -->
-
-<html xmlns:wicket>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<wicket:extend>
-
-    <div class="headerMenu">
-        Assign cargo <span wicket:id="trackingId">[trackingId]</span> to a route
-        <wicket:link>
-            <a href="CargoListPage.html">List of Cargos</a>
-            <a href="BookNewCargoPage.html">Book new cargo</a>
-        </wicket:link>
-    </div>
-
-    <span wicket:id="feedback"></span>
-
-    <span wicket:id="routes">
-        <span wicket:id="route"></span><br/>
-    </span>
-
-</wicket:extend>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/RoutePanel.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/RoutePanel.html b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/RoutePanel.html
deleted file mode 100644
index 3cf259f..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/booking/RoutePanel.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--
-  ~  Licensed to the Apache Software Foundation (ASF) under one
-  ~  or more contributor license agreements.  See the NOTICE file
-  ~  distributed with this work for additional information
-  ~  regarding copyright ownership.  The ASF licenses this file
-  ~  to you under the Apache License, Version 2.0 (the
-  ~  "License"); you may not use this file except in compliance
-  ~  with the License.  You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  ~
-  -->
-
-<html xmlns:wicket>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<wicket:panel>
-    <h4 wicket:id="routeHeader"></h4>
-    <span wicket:id="routeFeedback"></span>
-
-    <table>
-        <thead>
-        <tr>
-            <td>Voyage</td>
-            <td colspan="2">From</td>
-            <td colspan="2">To</td>
-        </tr>
-        </thead>
-        <tbody>
-        <tr wicket:id="legs">
-            <td wicket:id="voyage"></td>
-            <td wicket:id="loadLocation"></td>
-            <td wicket:id="loadDate"></td>
-            <td wicket:id="unloadLocation"></td>
-            <td wicket:id="unloadDate"></td>
-        </tr>
-        </tbody>
-    </table>
-    <form wicket:id="form">
-        <input type="submit" value="Assign cargo to this route" wicket:id="assign"/>
-    </form>
-</wicket:panel>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/handling/IncidentLoggingApplicationMockupPage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/handling/IncidentLoggingApplicationMockupPage.html b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/handling/IncidentLoggingApplicationMockupPage.html
deleted file mode 100644
index a9fe9d4..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/handling/IncidentLoggingApplicationMockupPage.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!--
-  ~  Licensed to the Apache Software Foundation (ASF) under one
-  ~  or more contributor license agreements.  See the NOTICE file
-  ~  distributed with this work for additional information
-  ~  regarding copyright ownership.  The ASF licenses this file
-  ~  to you under the Apache License, Version 2.0 (the
-  ~  "License"); you may not use this file except in compliance
-  ~  with the License.  You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  ~
-  -->
-
-<html xmlns:wicket>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<wicket:extend>
-    <div id="box">
-
-        <div class="headerMenu" style="color:purple">Incident Logging Application mockup</div>
-        <h3 style="color:purple">Report Handling Event</h3>
-
-        <form wicket:id="form">
-            <table>
-                <tbody>
-                <tr>
-                    <td>Completion</td>
-                    <td nowrap><input type="text" wicket:id="completion"/></td>
-                    <!--<td rowspan="7" style="padding-left:30px">-->
-                          <!--<span style="font-style:italic;font-family: 'Lucida Sans', 'Helvetica'"> External cargo handling authorities (ports, shippers,-->
-                              <!--customs etc) continuously send handling event messages through incident logging-->
-                              <!--applications as they handle cargos in order to inform shippers (like us) of what-->
-                              <!--has happened to a certain cargo.<br>-->
-                              <!--<br>-->
-                              <!--It's outside the scope of our incident logging application mockup to validate the-->
-                              <!--data since our perspective is the booking application receiving raw data that we-->
-                              <!--have no control over.<br>-->
-                              <!--<br>-->
-                              <!--It's first when the data hit our booking application (below) that we can validate-->
-                              <!--and process it...-->
-                        <!--</span>-->
-                    <!--</td>-->
-                </tr>
-                <tr>
-                    <td nowrap>Cargo Tracking Id</td>
-                    <td nowrap>
-                        <input type="text" wicket:id="trackingIdInput"/> <select
-                            wicket:id="trackingIdSelector"></select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Event type</td>
-                    <td nowrap>
-                        <input type="text" wicket:id="eventTypeInput"/> <select wicket:id="eventTypeSelector"></select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Voyage</td>
-                    <td nowrap>
-                        <input type="text" wicket:id="voyageInput"/> <select wicket:id="voyageSelector"></select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Location</td>
-                    <td nowrap>
-                        <input type="text" wicket:id="locationInput"/> <select wicket:id="locationSelector"></select>
-                    </td>
-                </tr>
-                <tr>
-                    <td></td>
-                    <td>
-                        <input type="submit" value="Send" wicket:id="register"/>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-
-            <hr>
-
-            <div class="headerMenu">Booking Application</div>
-            <h3>Process Handling Event</h3>
-            <span style="font-style:italic">Result of our processing:
-            </span>
-
-            <div wicket:id="feedback"></div>
-        </form>
-
-    </div>
-</wicket:extend>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/handling/IncidentLoggingApplicationMockupPage.properties
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/handling/IncidentLoggingApplicationMockupPage.properties b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/handling/IncidentLoggingApplicationMockupPage.properties
deleted file mode 100644
index e39a035..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/handling/IncidentLoggingApplicationMockupPage.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#
-#
-
-handlingEvent.UNKNOWN=ERROR: *** UNKNOWN EVENT TYPE ***
-handlingEvent.RECEIVE=Received in ${location}.
-handlingEvent.LOAD=Loaded onto voyage ${voyage} in port ${location}.
-handlingEvent.UNLOAD=Unloaded from voyage ${voyage} in port ${location}.
-handlingEvent.CLAIM=Claimed in port ${location} by cargo owner.
-handlingEvent.CUSTOMS=In customs.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/HandlingHistoryPanel.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/HandlingHistoryPanel.html b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/HandlingHistoryPanel.html
deleted file mode 100644
index 00200a6..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/HandlingHistoryPanel.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
-  ~  Licensed to the Apache Software Foundation (ASF) under one
-  ~  or more contributor license agreements.  See the NOTICE file
-  ~  distributed with this work for additional information
-  ~  regarding copyright ownership.  The ASF licenses this file
-  ~  to you under the Apache License, Version 2.0 (the
-  ~  "License"); you may not use this file except in compliance
-  ~  with the License.  You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  ~
-  -->
-
-<html xmlns:wicket>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<wicket:panel>
-    <h4>Handling history</h4>
-    <table>
-        <tbody>
-        <tr wicket:id="handlingEvents">
-            <td><img src="/graphics/icon/" wicket:id="onTrackIcon"/></td>
-            <td wicket:id="completion"></td>
-            <td wicket:id="event"></td>
-        </tr>
-        </tbody>
-    </table>
-</wicket:panel>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/HandlingHistoryPanel.properties
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/HandlingHistoryPanel.properties b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/HandlingHistoryPanel.properties
deleted file mode 100644
index 5414a91..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/HandlingHistoryPanel.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#
-#
-
-handlingEvent.UNKNOWN=ERROR: *** UNKNOWN EVENT TYPE ***
-handlingEvent.RECEIVE=Received in ${location}
-handlingEvent.LOAD=Loaded onto voyage ${voyage} in ${location}
-handlingEvent.UNLOAD=Unloaded from voyage ${voyage} in ${location}
-handlingEvent.CLAIM=Claimed in ${location} by cargo owner
-handlingEvent.CUSTOMS=In customs
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/NextHandlingEventPanel.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/NextHandlingEventPanel.html b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/NextHandlingEventPanel.html
deleted file mode 100644
index b47d281..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/NextHandlingEventPanel.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-  ~  Licensed to the Apache Software Foundation (ASF) under one
-  ~  or more contributor license agreements.  See the NOTICE file
-  ~  distributed with this work for additional information
-  ~  regarding copyright ownership.  The ASF licenses this file
-  ~  to you under the Apache License, Version 2.0 (the
-  ~  "License"); you may not use this file except in compliance
-  ~  with the License.  You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  ~
-  -->
-
-<html xmlns:wicket>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<wicket:panel>
-    <p wicket:id="text" style="font-style:italic;font-weight: bold;"></p>
-</wicket:panel>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/NextHandlingEventPanel.properties
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/NextHandlingEventPanel.properties b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/NextHandlingEventPanel.properties
deleted file mode 100644
index a39ca2c..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/NextHandlingEventPanel.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#
-#
-
-nextEvent.UNKNOWN=Next expected activity: Unknown...
-nextEvent.ROUTE=Next expected activity: Routing of cargo
-nextEvent.RECEIVE=Next expected activity: Receipt of cargo in ${location}
-nextEvent.LOAD=Next expected activity: Load onto voyage ${voyage} in ${location} ${time}
-nextEvent.UNLOAD=Next expected activity: Unload off voyage ${voyage} in ${location} ${time}
-nextEvent.CLAIM=Next expected activity: Claim by cargo owner in destination port ${location} ${time}
-nextEvent.CUSTOMS=ERROR: CUSTOMS IS NOT AN EXPECTED EVENT
-nextEvent.END_OF_CYCLE=Cargo has successfully been claimed in ${location} by cargo owner

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/TrackCargoPage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/TrackCargoPage.html b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/TrackCargoPage.html
deleted file mode 100644
index a69b60e..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/TrackCargoPage.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!--
-  ~  Licensed to the Apache Software Foundation (ASF) under one
-  ~  or more contributor license agreements.  See the NOTICE file
-  ~  distributed with this work for additional information
-  ~  regarding copyright ownership.  The ASF licenses this file
-  ~  to you under the Apache License, Version 2.0 (the
-  ~  "License"); you may not use this file except in compliance
-  ~  with the License.  You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  ~
-  -->
-
-<html xmlns:wicket>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<wicket:extend>
-    <div id="box">
-
-        <div class="headerMenu">Tracking</div>
-
-        <form wicket:id="form">
-            Tracking number
-            <input type="text" wicket:id="trackingId"/>
-            <input type="submit" value="Track" wicket:id="track"/>
-            &nbsp;&nbsp;&nbsp;&nbsp;Pre-selection: <select wicket:id="selectedTrackingIdSelector"></select>
-
-            <div wicket:id="feedback"></div>
-
-            <div wicket:id="status"></div>
-            <wicket:fragment wicket:id="statusFragment">
-                <br/>
-                <span wicket:id="transportStatus" style="font-weight:bold">[Text]</span>
-
-                <p wicket:id="eta">eta </p>
-
-                <p wicket:id="isMisdirected" class="notifyError"><img src="../../graphics/icon/error.png"/>&nbsp;
-                    Cargo is misdirected. </p>
-
-                <p wicket:id="isClaimed" class="notifySuccess"><img src="../../graphics/icon/tick.png"/>&nbsp;
-                    Cargo succesfully delivered. </p>
-
-                <div wicket:id="handlingHistoryPanel"></div>
-            </wicket:fragment>
-        </form>
-
-    </div>
-</wicket:extend>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/TrackCargoPage.properties
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/TrackCargoPage.properties b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/TrackCargoPage.properties
deleted file mode 100644
index 5900518..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/communication/web/tracking/TrackCargoPage.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#
-#
-
-cargoDropDown.null=Track known cargo
-
-eta=Estimated time of arrival in {0}: {1}
-
-transportStatus.NOT_RECEIVED=Cargo ${trackingId} has not been received yet
-transportStatus.IN_PORT=Cargo ${trackingId} is now in ${location}
-transportStatus.ONBOARD_CARRIER=Cargo ${trackingId} is now onboard voyage ${voyage}
-transportStatus.CLAIMED=Cargo ${trackingId} is now claimed by cargo owner in ${location}
-transportStatus.UNKNOWN=Cargo ${trackingId} has an unknown transport status

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/_ShipCargo.txt
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/_ShipCargo.txt b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/_ShipCargo.txt
deleted file mode 100644
index ffd8a3d..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/_ShipCargo.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-
-USE CASE	    Ship Cargo [summary]
-===========================================================================
-A Cargo Owner asks a shipping company to ship a cargo.
-
-This is the overall view of our shipping domain.
-
-
-Primary actor.. Cargo Owner
-Scope.......... Shipping company
-Preconditions.. None
-Trigger........ Cargo Owner <books new cargo> shipment.
-
-
-Main Success Scenario
----------------------------------------------------------------------------
-1. Cargo Owner <books new cargo> shipment
-2. Cargo Owner <routes cargo>
-3. Shipper receives cargo at origin location
-4. Shipper sends cargo
-5. Cargo Owner can <change destination of cargo>
-6. Cargo Owner can <re-route cargo>
-7. Cargo Owner can track cargo
-8. Shipper delivers cargo at destination
-9. Cargo Owner claims cargo
-
-
-Deviations
----------------------------------------------------------------------------
-3-8a. Cargo is in an unexpected location (misdirected):
-    1. Shipper requests Cargo Owner to <re-route cargo>.
-
-5a. Cargo Owner changes destination:
-    1. Shipper requests Cargo Owner to <re-route cargo>.
-
-
----------------------------------------------------------------------------
-Success guarantees:
-    Shipper delivers cargo according to route specification.
-
-Minimal guarantees:
-    None (?).
-
-Stakeholders/Interests:
-    Cargo Owner - wants cargo shipped safely, fast and cheap.
-
-    Shipper:
-    Handling dep - wants overbooking of vessels to maximize profit.
-    Sales dep - wants Cargo Owner satisfaction.
-    Financial dep - wants payment settlement with Cargo Owner.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/BookNewCargo.txt
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/BookNewCargo.txt b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/BookNewCargo.txt
deleted file mode 100644
index 308defd..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/BookNewCargo.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-
-USE CASE	    Book New Cargo [user-goal]
-===========================================================================
-Cargo Owner wants to book a cargo shipment from A to B with an arrival deadline.
-
-
-Primary actor.. Cargo Owner (or Booking Clerk on behalf of Cargo Owner)
-Scope.......... Booking System in shipping application
-Preconditions.. None
-Trigger........ Cargo Owner wants to book a new cargo shipment.
-
-
-Main Success Scenario
----------------------------------------------------------------------------
-1. Cargo Owner provides origin/destination, arrival deadline and optionally a tracking id.
-2. Booking System creates route specification.
-3. Booking System derives initial delivery data.
-4. Booking System creates cargo.
-5. Booking System requests Cargo Owner to <route cargo>.
-
-
-Deviations
----------------------------------------------------------------------------
-2a. Origin location equals destination location:
-    1. Exit.
-
-2b. Arrival deadline is in the past or Today:
-    1. Exit.
-
-4a. Supplied tracking id doesn't match pattern:
-    1. Exit.
-
-4b. Supplied tracking id is not unique:
-    1. Exit.
-
-
----------------------------------------------------------------------------
-Success guarantees:
-    Booking is saved and awaits routing by Cargo Owner
-
-Minimal guarantees:
-    Data entered is logged.
-
-Stakeholders/Interests:
-    Cargo Owner - wants successful booking of shipment.
-
-    Shipper:
-    Handling dep - wants correct data and overbooking of vessels to maximize profit.
-    Sales dep - wants Cargo Owner satisfaction.
-    Financial dep - wants payment settlement with Cargo Owner.
-

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/ChangeDestinationOfCargo.txt
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/ChangeDestinationOfCargo.txt b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/ChangeDestinationOfCargo.txt
deleted file mode 100644
index 39680bd..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/ChangeDestinationOfCargo.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-
-USE CASE	    Change Destination of Cargo [user-goal]
-===========================================================================
-Cargo Owner wants to change destination of cargo.
-
-
-Primary actor.. Cargo Owner
-Scope.......... Booking System in shipping application
-Preconditions.. Cargo is not claimed yet.
-Trigger........ Cargo Owner requests to change destination of cargo.
-
-
-Main Success Scenario
----------------------------------------------------------------------------
-1. Booking System presents possible new destinations of cargo to cargo owner.
-2. Cargo Owner chooses a new destination.
-3. Booking System asks Cargo Inspector to <register new destination> for cargo.
-4. Booking System requests Cargo Owner to <re-route cargo>.
-
-
-Deviations
----------------------------------------------------------------------------
-1a. Cargo has been claimed:
-    1. Failure (no reason to change destination of a claimed cargo).
-
-3a. Shipping application can't change destination:
-    1. Failure.
-
-
----------------------------------------------------------------------------
-Success guarantees:
-    Cargo has changed destination and Cargo Owner is notified to re-route cargo.
-
-Minimal guarantees:
-    Cargo remains on track (?)
-
-Stakeholders/Interests:
-    Cargo Owner - wants cargo delivered to the new destination.
-    Shipping company - wants fast re-routing of cargo (to avoid delaying the cargo).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/ReRouteCargo.txt
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/ReRouteCargo.txt b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/ReRouteCargo.txt
deleted file mode 100644
index d9b647d..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/ReRouteCargo.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-
-USE CASE	    Re-route Cargo [user-goal]
-===========================================================================
-Cargo Owner wants to assign cargo to another route.
-
-If a cargo was handled in an unexpected location (is misdirected), the booking
-system will request the Cargo Owner to re-route the cargo to get it back on track.
-
-The Cargo Owner can also anytime re-route a cargo that is on track.
-
-
-Primary actor.. Cargo Owner (can be a Booking clerk on behalf of Cargo Owner)
-Scope.......... Booking System in shipping application
-Preconditions.. Cargo has a route specification.
-Trigger........ Cargo Owner requests to re-route cargo.
-
-
-Main Success Scenario
----------------------------------------------------------------------------
-1. Cargo Owner requests to re-route cargo.
-2. Booking System asks Delivery Inspector to <derive updated route specification> for cargo.
-3. Booking System asks Path Finder for route candidates matching route specification.
-4. Booking System presents route candidates to Cargo Owner.
-5. Cargo Owner chooses preferred route.
-6. Booking System <assigns cargo to route>.
-
-
-Deviations
----------------------------------------------------------------------------
-3a. No routes satisfy new route specification:
-    1. Failure.
-
-

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/RouteCargo.txt
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/RouteCargo.txt b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/RouteCargo.txt
deleted file mode 100644
index 6254403..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/RouteCargo.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-
-USE CASE	    Route Cargo [user-goal]
-===========================================================================
-Cargo Owner wants to choose a route for a cargo.
-
-
-Primary actor.. Cargo Owner (can be a Booking clerk on behalf of Cargo Owner)
-Scope.......... Booking System in shipping application
-Preconditions.. Cargo is not routed.
-Trigger........ Cargo Owner requests to route cargo.
-
-
-Main Success Scenario
----------------------------------------------------------------------------
-1. Cargo Owner requests to route cargo.
-2. Booking System asks Path Finder for route candidates matching route specification.
-3. Booking System presents route candidates to Cargo Owner.
-4. Cargo Owner chooses preferred route.
-5. Booking System <assigns cargo to new route>.
-
-
-Deviations
----------------------------------------------------------------------------
-2a. No routes satisfy route specification:
-    1. Failure.
-
-

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/routing/AssignCargoToRoute.txt
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/routing/AssignCargoToRoute.txt b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/routing/AssignCargoToRoute.txt
deleted file mode 100644
index 59b3a72..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/routing/AssignCargoToRoute.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-
-USE CASE	    Assign Cargo to Route [subfunction]
-===========================================================================
-Cargo Inspector assigns cargo to a route. A route is described by an itinerary.
-
-
-Primary actor.. Cargo Inspector
-Scope.......... Shipping application
-Preconditions.. Cargo has not been claimed yet.
-Trigger........ Cargo Inspector receives new itinerary to be assigned to cargo.
-
-
-Main Success Scenario
----------------------------------------------------------------------------
-1. Cargo Inspector <derives updated route specification>.
-2. Cargo Inspector verifies that route satisfies route specification.
-3. Cargo Inspector assigns cargo to route.
-4. Cargo Inspector assigns route specification to cargo.
-5. Cargo Inspector determines next expected handling event.
-6. Cargo Inspector updates cargo delivery status.
-
-
-Deviations
----------------------------------------------------------------------------
-*1. Cargo has been claimed:
-    1. Failure. Can't re-route claimed cargo.
-
-1a. Route doesn't satisfy route specification:
-    1. Failure.
-
-3a. Route doesn't satisfy new route specification:
-    1. Failure.
-
-5a. Cargo has not been handled (initial routing):
-    1. Cargo Inspector expects receipt in route origin.
-
-5b. Cargo is on board carrier (re-routing):
-    1. Cargo Inspector expects unload in arrival location of current carrier movement.
-
-5c. Cargo is in port (re-routing):
-    1. Cargo Inspector expects load in route origin.
-

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/routing/RegisterNewDestination.txt
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/routing/RegisterNewDestination.txt b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/routing/RegisterNewDestination.txt
deleted file mode 100644
index 6c1e7aa..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/routing/RegisterNewDestination.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-
-USE CASE	    Register New Destination  [subfunction]
-===========================================================================
-A Cargo Inspector registers a new destination for a cargo.
-
-
-Primary actor.. Cargo Inspector
-Scope.......... Booking system
-Preconditions.. Cargo has a route specification.
-Trigger........ Cargo Inspector receives request to register new destination of cargo.
-
-
-Main Success Scenario
----------------------------------------------------------------------------
-1. Cargo Inspector verifies new destination.
-2. Cargo Inspector <derives updated route specification>.
-3. Cargo Inspector assigns new route specification to cargo.
-4. Cargo Inspector asks Delivery Inspector to <inspect cargo delivery status>.
-
-
-Deviations
----------------------------------------------------------------------------
-x1. Cargo has been claimed:
-    1. Failure (can't change destination after cargo has been handed over to cargo owner).
-
-1a. Cargo Inspector doesn't recognize new location:
-    1. Failure.
-
-1b. New destination is same as old destination:
-    1. Exit.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/specification/DeriveUpdatedRouteSpecification.txt
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/specification/DeriveUpdatedRouteSpecification.txt b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/specification/DeriveUpdatedRouteSpecification.txt
deleted file mode 100644
index b825367..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/booking/specification/DeriveUpdatedRouteSpecification.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-
-USE CASE	    Derive Updated Route Specification [subfunction]
-===========================================================================
-A Cargo Inspector is asked for an updated route specification for a cargo
-according to the current delivery status.
-
-
-Primary actor.. Cargo Inspector
-Scope.......... Booking System
-Preconditions.. Cargo is routed.
-Trigger........ Booking System wants an updated route specification for a cargo.
-
-
-Main Success Scenario
----------------------------------------------------------------------------
-1. Cargo Inspector collects destination and arrival deadline from old route specification.
-2. Cargo Inspector sets new origin to current location and new earliest departure date to last completion time.
-3. Cargo Inspector builds and returns new route specification.
-
-
-Deviations
----------------------------------------------------------------------------
-1a. Cargo is going to a new destination:
-    1. Cargo Inspector uses new given destination.
-
-2a. Cargo is not received yet:
-    1. Cargo Inspector sets new origin to cargo origin.
-    2. Cargo Inspector leaves earliest departure time unchanged.
-
-2b. Cargo is on board carrier:
-    1. Cargo Inspector sets new origin to arrival location of current carrier movement.
-    2. Cargo Inspector sets new earliest departure date to arrival time of current carrier movement.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/handling/_ProcessHandlingEvent.txt
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/handling/_ProcessHandlingEvent.txt b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/handling/_ProcessHandlingEvent.txt
deleted file mode 100644
index 5935846..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/handling/_ProcessHandlingEvent.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-
-USE CASE	    Process Handling Event [summary - Nuts and Bolts use case]
-===========================================================================
-System automatically receives and validates incoming handling event data
-for a cargo. The cargo is then inspected to see if it's still on track and
-to initiate actions if necessary.
-
-Certain conditions can cause relevant parties to be notified.
-
-
-Primary actor.. Handling Manager
-Scope.......... Handling System in shipping application
-Preconditions.. None
-Trigger........ Delivery Inspector receives handling event data from handling authority.
-
-
-Main Success Scenario
----------------------------------------------------------------------------
-1. Handling Manager asks Data Parser to <parse handling event data>.
-2. Handling Manager asks Event Registrar to <register handling event>.
-3. Handling Manager asks Delivery Inspector to <inspect cargo delivery status>.
-
-
-Deviations
----------------------------------------------------------------------------
-1a. Handling event data is invalid:
-    1. Handling Manager notifies handling authority of invalid data and exits.
-
-2a. Handling event data is not recognized in Delivery Inspector:
-    1. Handling Manager notifies handling authority of unrecognized data and exits.
-
-3a. Cargo has arrived:
-    1. Handling Manager requests cargo owner to claim cargo.
-
-3b. Cargo is misdirected or misrouted:
-    1. Handling Manager requests cargo owner to re-route cargo.
-
-
----------------------------------------------------------------------------
-Success guarantees:
-    Handling event is registered.
-    Cargo delivery status is inspected.
-    Relevant notifications are sent.
-
-Minimal guarantees:
-    Delivery Inspector data is in a valid state.
-    Registration attempt data is logged.
-    Relevant notifications are sent.
-
-Stakeholders/Interests:
-    Cargo Owner wants
-        - access to accurate last-minute tracking information
-        - notification of misdirection or arrival of cargo
-    Shipper wants
-        - cargo handled efficiently (financial department)
-        - data consistency (IT department)
-        - handling process traceability (legal/support department)
-    Handling authority wants
-        - notification of rejected handling registration attempts.
-
-
-Comments
----------------------------------------------------------------------------
-Handling events are supposed to come in automatically from various incident
-logging applications. We have no users processing handled cargos and therefore
-no user-goal level use cases either! We only have subfunction use cases like
-"RegisterHandlingEvent" describing a technical process with no human involvement.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/handling/inspection/InspectCargoDeliveryStatus.txt
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/handling/inspection/InspectCargoDeliveryStatus.txt b/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/handling/inspection/InspectCargoDeliveryStatus.txt
deleted file mode 100644
index 23c9533..0000000
--- a/samples/dci-cargo/dcisample_b/src/main/resources/org/apache/zest/sample/dcicargo/sample_b/context/usecase/handling/inspection/InspectCargoDeliveryStatus.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-
-USE CASE        Inspect Cargo Delivery Status [subfunction]
-===========================================================================
-A Delivery Inspector inspects and updates the delivery status of a cargo.
-
-If the cargo has been handled, the handling event data is used to derive the
-delivery status.
-
-(This can hardly be called a use case...)
-
-
-Primary actor.. Delivery Inspector
-Scope.......... Handling Monitoring System in shipping application
-Preconditions.. Cargo has a route specification.
-Trigger........ Delivery Inspector receives request to inspect the cargo delivery status.
-
-
-Main Success Scenario
----------------------------------------------------------------------------
-1. Delivery Inspector determines the handling event type.
-2. Delivery Inspector delegates inspection according to handling event type.
-
-
-Deviations
----------------------------------------------------------------------------
-1a. Cargo hasn't been handled yet:
-    1. Delivery Inspector <inspects unhandled cargo>.
-
-2a. Cargo was received:
-    1. Delivery Inspector <inspects received cargo>.
-
-2b. Cargo was loaded:
-    1. Delivery Inspector <inspects loaded cargo>.
-
-2c. Cargo was unloaded in final destination:
-    1. Delivery Inspector <inspects arrived cargo>.
-
-2d. Cargo was unloaded:
-    1. Delivery Inspector <inspects unloaded cargo>.
-
-2e. Cargo is being handled by customs authorities:
-    1. Delivery Inspector <inspects cargo in customs>.
-
-2f. Cargo was claimed by cargo owner:
-    1. Delivery Inspector <inspects claimed cargo>.
-
-
----------------------------------------------------------------------------
-Success guarantees:
-    All information we know about a Cargo delivery is derived.
-
-Minimal guarantees:
-    Persisted data is consistent (?)...
-
-Stakeholders/Interests:
-    Cargo owner - wants reliable tracking information
-    Shipping company - wants precise handling monitoring to prevent further (expensive) misdirection
\ No newline at end of file


Mime
View raw message