You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2016/10/23 14:23:55 UTC
[14/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
http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/wicket/prevnext/PrevNext.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/wicket/prevnext/PrevNext.java b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/wicket/prevnext/PrevNext.java
deleted file mode 100644
index c6c955e..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/wicket/prevnext/PrevNext.java
+++ /dev/null
@@ -1,123 +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_a.infrastructure.wicket.prevnext;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.MetaDataKey;
-import org.apache.wicket.Page;
-import org.apache.wicket.Session;
-import org.apache.wicket.devutils.stateless.StatelessComponent;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-/**
- * Previous/Next arrows navigation panel with list of ids in session.
- *
- * Takes care of showing disabled icons at beginning/end.
- */
-@StatelessComponent
-public class PrevNext extends Panel
-{
- private static final MetaDataKey<ArrayList<String>> PREV_NEXT_PANEL_KEY = new MetaDataKey<ArrayList<String>>()
- {
- private static final long serialVersionUID = 1L;
- };
-
- public static void registerIds( Session session, List<String> ids )
- {
- if( ids == null || ids.isEmpty() )
- {
- throw new RuntimeException( "Please register a list of ids." );
- }
-
- session.setMetaData( PREV_NEXT_PANEL_KEY, (Serializable) ids );
- session.bind();
- }
-
- public static void addId( Session session, String id )
- {
- if( id == null || id.isEmpty() )
- {
- throw new RuntimeException( "Can't register empty id." );
- }
-
- ArrayList<String> ids = session.getMetaData( PREV_NEXT_PANEL_KEY );
- if( ids == null || ids.isEmpty() )
- {
- ids = new ArrayList<String>();
- }
-
- ids.add( id );
- session.setMetaData( PREV_NEXT_PANEL_KEY, ids );
- session.bind();
- }
-
- public PrevNext( String id, Class<? extends Page> pageClass, String actualId )
- {
- super( id );
-
- List<String> ids = getSession().getMetaData( PREV_NEXT_PANEL_KEY );
-
- if( ids == null || ids.size() == 0 )
- {
- setEnabled( false );
- setVisible( false );
- return;
- }
-
- String prev = null;
- String current;
- for( Iterator<String> it = ids.iterator(); it.hasNext(); )
- {
- current = it.next();
- if( current.equals( actualId ) )
- {
- if( prev == null )
- {
- add( new WebMarkupContainer( "prev" ).add( new AttributeModifier( "class", "prevDisabled" ) ) );
- }
- else
- {
- add( new BookmarkablePageLink<Void>( "prev", pageClass, new PageParameters().set( 0, prev ) ) );
- }
-
- if( !it.hasNext() )
- {
- add( new WebMarkupContainer( "next" ).add( new AttributeModifier( "class", "nextDisabled" ) ) );
- }
- else
- {
- add( new BookmarkablePageLink<Void>( "next", pageClass, new PageParameters().set( 0, it.next() ) ) );
- }
-
- return;
- }
- prev = current;
- }
-
- throw new RuntimeException( "Passed tracking id was not found in the PrevNextSession." );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/wicket/tabs/TabsPanel.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/wicket/tabs/TabsPanel.java b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/wicket/tabs/TabsPanel.java
deleted file mode 100644
index a06cfa3..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/wicket/tabs/TabsPanel.java
+++ /dev/null
@@ -1,93 +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_a.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;
-
-/**
- * Tabs 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 )
- {
- 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_a/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/log4j.properties b/samples/dci-cargo/dcisample_a/src/main/resources/log4j.properties
deleted file mode 100644
index f135303..0000000
--- a/samples/dci-cargo/dcisample_a/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 - %-26.26c{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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/BasePage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/BasePage.html b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/BasePage.html
deleted file mode 100644
index 155345e..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/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 A)</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">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</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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/BookNewCargoPage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/BookNewCargoPage.html b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/BookNewCargoPage.html
deleted file mode 100644
index c9eb686..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/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"> </div>
- </td>
- </tr>
- <tr>
- <td>Destination</td>
- <td>
- <select wicket:id="destinationSelector"></select>
- </td>
- <td>
- <div wicket:id="destinationFeedback"> </div>
- </td>
- </tr>
- <tr>
- <td>Arrival deadline</td>
- <td>
- <input type="text" wicket:id="deadline"/>
- </td>
- <td>
- <div wicket:id="deadlineFeedback"> </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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/BookingBasePage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/BookingBasePage.html b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/BookingBasePage.html
deleted file mode 100644
index 6a4c159..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/CargoDetailsPage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/CargoDetailsPage.html b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/CargoDetailsPage.html
deleted file mode 100644
index a0f6d15..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/CargoDetailsPage.html
+++ /dev/null
@@ -1,109 +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">
- <tr>
- <td>Origin</td>
- <td wicket:id="origin"></td>
- </tr>
- <tr>
- <td>Destination</td>
- <td wicket:id="destination"></td>
- <td wicket:id="changeDestination"></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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/CargoListPage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/CargoListPage.html b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/CargoListPage.html
deleted file mode 100644
index 276c015..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/ChangeDestinationPage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/ChangeDestinationPage.html b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/ChangeDestinationPage.html
deleted file mode 100644
index a3815a3..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/RouteCargoPage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/RouteCargoPage.html b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/RouteCargoPage.html
deleted file mode 100644
index c72030f..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/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 route 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>
-
- <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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/RoutePanel.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/RoutePanel.html b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/booking/RoutePanel.html
deleted file mode 100644
index 3cf259f..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/handling/RegisterHandlingEventPage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/handling/RegisterHandlingEventPage.html b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/handling/RegisterHandlingEventPage.html
deleted file mode 100644
index 3a95f60..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/handling/RegisterHandlingEventPage.html
+++ /dev/null
@@ -1,90 +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">Register handling event</div>
-
- <form wicket:id="form">
- <div wicket:id="feedback"></div>
- <table>
- <tbody>
- <tr>
- <td>Completion</td>
- <td>
- <input type="text" wicket:id="completion"/>
- </td>
- </tr>
- <tr>
- <td>Cargo</td>
- <td>
- <select wicket:id="trackingIdSelector"></select>
- </td>
- </tr>
- <tr>
- <td>Event type</td>
- <td>
- <select wicket:id="eventTypeSelector"></select>
- </td>
- </tr>
- <tr>
- <td>Voyage</td>
- <td>
- <select wicket:id="voyageNumberSelector"></select>
- </td>
- </tr>
- <tr>
- <td>Location</td>
- <td>
- <select wicket:id="unLocodeSelector"></select>
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td></td>
- <td>
- <input type="submit" value="Register" wicket:id="register"/>
- </td>
- </tr>
- </tfoot>
- </table>
- </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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/handling/RegisterHandlingEventPage.properties
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/handling/RegisterHandlingEventPage.properties b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/handling/RegisterHandlingEventPage.properties
deleted file mode 100644
index 2ebfac8..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/handling/RegisterHandlingEventPage.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 customer.
-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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/HandlingHistoryPanel.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/HandlingHistoryPanel.html b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/HandlingHistoryPanel.html
deleted file mode 100644
index 00200a6..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/HandlingHistoryPanel.properties
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/HandlingHistoryPanel.properties b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/HandlingHistoryPanel.properties
deleted file mode 100644
index 569ac0a..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/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 customer
-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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/NextHandlingEventPanel.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/NextHandlingEventPanel.html b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/NextHandlingEventPanel.html
deleted file mode 100644
index b47d281..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/NextHandlingEventPanel.properties
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/NextHandlingEventPanel.properties b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/NextHandlingEventPanel.properties
deleted file mode 100644
index 3ddcf27..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/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.
-#
-#
-#
-
-expectedEvent.UNKNOWN=Next expected activity: Unknown...
-expectedEvent.ROUTE=Next expected activity: Routing of cargo
-expectedEvent.RECEIVE=Next expected activity: Receipt of cargo in ${location}
-expectedEvent.LOAD=Next expected activity: Load onto voyage ${voyage} in ${location} ${time}
-expectedEvent.UNLOAD=Next expected activity: Unload off voyage ${voyage} in ${location} ${time}
-expectedEvent.CLAIM=Next expected activity: Claim by customer in destination port ${location} ${time}
-expectedEvent.CUSTOMS=ERROR: CUSTOMS IS NOT AN EXPECTED EVENT
-expectedEvent.END_OF_CYCLE=Cargo has successfully been claimed in ${location} by customer
http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/TrackCargoPage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/TrackCargoPage.html b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/TrackCargoPage.html
deleted file mode 100644
index a69b60e..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/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"/>
- 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"/>
- Cargo is misdirected. </p>
-
- <p wicket:id="isClaimed" class="notifySuccess"><img src="../../graphics/icon/tick.png"/>
- 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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/TrackCargoPage.properties
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/TrackCargoPage.properties b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/tracking/TrackCargoPage.properties
deleted file mode 100644
index 9bd1ede..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/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 customer 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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/context/shipping/booking/BookNewCargo.txt
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/context/shipping/booking/BookNewCargo.txt b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/context/shipping/booking/BookNewCargo.txt
deleted file mode 100644
index 7412c32..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/context/shipping/booking/BookNewCargo.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-
-USE CASE Book New Cargo
-===========================================================================
-Customer books shipping of Cargo from one destination to another with an arrival deadline.
-
-Scope.......... Booking application ("system")
-Level.......... User-goal
-Primary actor.. Customer (can be Sales Rep/Manager or Booking clerk on behalf of Customer).
-Preconditions.. Customer is logged in.
-Trigger........ Customer wants to book cargo shipping.
-
-Main Success Scenario
----------------------------------------------------------------------------
-1. Customer provides origin/destination location and arrival deadline of cargo to system.
-2. System creates cargo with unique tracking id from route specification.
-3. System calculates one or more routes for cargo and presents itineraries for those routes to customer.
-4. Customer chooses preferred route.
-5. System assigns cargo to selected route.
-6. System confirms booking completion to customer.
-7. System notifies booking clerk to <initiate cargo transport>#3.
-
-Deviations
----------------------------------------------------------------------------
-Can happen anytime in the booking process:
-*a. Customer logs out or cancels booking:
- 1. System asks customer if he/she wants to save booking for later completion:
- a. System saves/deletes cargo.
-*b. Customer session times out.
- 1. System offers customer to logger in again and continue with same booking.
-*c. Customer closes browser:
- 1. System deletes cargo.
-
-Deviations of main success scenario steps:
-1a. Customer has unfinished booking from earlier session:
- 1. System asks customer if he/she wants to continue with this booking or to delete it.
- a. System presents next step in booking process to customer.
- b. System deletes cargo and starts new booking.
-2a. Origin location equals destination location:
- 1. Ask customer to choose different locations (or better: prevent in UI)
-2b. Arrival deadline is in the past or Today:
- 1. Ask customer to correct (or better: prevent in UI).
-3a. No routes satisfy route specification:
- 1. System logs unsatisfied route specification.
- 2. system shows failure message to customer.
-
----------------------------------------------------------------------------
-Success guarantees:
- Booking is saved and awaits handling by Booking clerk
-
-Minimal guarantees:
- Data entered is logged.
-
-Stakeholders/Interests:
- Customer - wants cargo delivered within chosen deadline.
- Handling dep - wants correct data to handle shipping.
- Sales dep - wants customer satisfaction and overbooking of vessels to maximize profit.
- Financial dep - wants payment settlement with customer.
-
-
-Tests
----------------------------------------------------------------------------
-*a: UI
-*b: UI
-*c: UI
-
-1a: UI
-2a: BookNewCargoTest
-2b: BookNewCargoTest
-2: BookNewCargoTest
-3a: BookNewCargoTest
-3b: UI
-4: UI
-5: BookNewCargoTest
-6: UI
-7: UI
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/context/shipping/booking/BuildDeliverySnapshot.txt
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/context/shipping/booking/BuildDeliverySnapshot.txt b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/context/shipping/booking/BuildDeliverySnapshot.txt
deleted file mode 100644
index c2cbdef..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/context/shipping/booking/BuildDeliverySnapshot.txt
+++ /dev/null
@@ -1,157 +0,0 @@
-
-USE CASE Build Delivery Snapshot [subfunction]
-===========================================================================
-Building of a delivery snapshot for a cargo is based on the handling
-history of a cargo, as well as its route specification and itinerary.
-
-A cargo is routed when an itinerary that satisfy the route specification has
-been assigned to the cargo (a route is chosen).
-
-A cargo has a handling history when one or more handling events have been registered for the cargo.
-
-Scope.......... Booking application ("system")
-Level.......... Subfunction
-Primary actor.. System as a "factory".
-Preconditions.. Route specification is known.
-Trigger........ System asks for a Delivery snapshot value object.
-
-A Delivery snapshot captures the relationships between
-Routing status, Transport status and Handling events:
-
-Routing status
- Some action, leading to next routing status
----------------------------------------------------------------------------
-NOT_ROUTED
- Customer routes cargo (Itinerary gets assigned to cargo) ->
-ROUTED
- Route specification changes so that Itinerary is no longer satisfying ->
-MISROUTED
- Awaits re-routing or new handling event (??) -> ROUTED
-
-Furthermore a cargo can become "misdirected" if the last handling event says
-that the cargo is now in a location not expected by the itinerary. The customer
-then has to reroute the cargo.
-
-Transport status
- Handling event type, leading to next transport status
----------------------------------------------------------------------------
-NOT_RECEIVED (in first port)
- RECEIVE
-IN_PORT (origin)
- LOAD
-ONBOARD_CARRIER
- UNLOAD
-IN_PORT (1 or more midpoints)
- LOAD
-ONBOARD_CARRIER
- UNLOAD (to destination)
-IN_PORT (destination)
- CUSTOMS (cargo awaits customs clearance - doesn't affect locations)
- CLAIM (customer claims cargo)
-CLAIMED (cargo is finally delivered)
-
- [Unknown or empty handling event type received] leads to
-UNKNOWN handling status [not used in citerus version]
-
-
-Main Success Scenario
----------------------------------------------------------------------------
-1. Factory initiates build of new delivery snapshot object with a time stamp.
-2. Factory sets routingStatus to ROUTED and calculates eta from itinerary.
-3. Factory sets lastHandlingEvent and lastKnownLocation from last handling event.
-4. Factory derives handling event type dependent data, namely:
- - transportStatus
- - isMisdirected
- - nextExpectedHandlingEvent
- - currentVoyage
- - isUnloadedAtDestination
-5. Factory returns delivery snapshot object containing derived data.
-
-
-Deviations
----------------------------------------------------------------------------
-2a. Route specification has same origin and destination location:
- 1. Failure.
-
-2b. Route specification has a deadline Today or in the past:
- 1. Failure.
-
-2c. Itinerary is unknown (cargo hasn't been routed yet):
- 1. Factory sets routingStatus = NOT_ROUTED and transportStatus = NOT_RECEIVED.
- 2. Factory sets nextExpectedHandlingEvent to RECEIVE in origin of route specification.
- 3. Go to step 5.
-
-2d. Route specification is not satisfied by itinerary:
- 1. Factory sets routingStatus = MISROUTED.
-
-3a. Cargo has no handling history yet:
- 1. Factory sets transportStatus to NOT_RECEIVED.
- a. Cargo is correctly routed:
- 1. Factory sets nextExpectedHandlingEvent to RECEIVE in origin location of route specification.
- 2. Go to step 5.
-
-4a. Cargo was received in port:
- 1. Factory sets transportStatus to IN_PORT.
- a. Cargo was received in wrong port:
- 1. Factory sets isMisdirected to true.
- 2. Factory sets eta to null.
- b. Cargo is correctly routed:
- 1. Factory sets nextExpectedHandlingEvent to LOAD/voyage/location of first itinerary leg.
-
-4b. Cargo was loaded onto carrier:
- 1. Factory sets transportStatus = ONBOARD_CARRIER.
- a. Cargo was rerouted:
- 1. Factory sets nextExpectedHandlingEvent to UNLOAD/voyage/location of first leg of new itinerary.
- a. Cargo was loaded in unexpected port:
- 1. Factory sets isMisdirected to true.
- 2. Factory sets eta to null.
- 3. Factory sets currentVoyage to voyage of last handling event.
- b. Cargo was correctly routed:
- 1. Factory sets nextExpectedHandlingEvent to UNLOAD location of current itinerary leg.
- 2. Factory sets currentVoyage to voyage of last handling event.
- c. Cargo was loaded onto wrong carrier [not in original version]
- 1. Factory should set isMisdirected to true...
- 2. Factory sets eta to null.
-
-4c. Cargo was unloaded from carrier:
- 1. Factory sets transportStatus to IN_PORT.
- a. Cargo is rerouted:
- 1. Factory sets nextExpectedHandlingEvent to LOAD/voyage/location of first leg of new itinerary.
- a. Cargo was unloaded in unexpected port:
- 1. Factory sets isMisdirected to true.
- 2. Factory sets eta to null.
- b. Cargo was unloaded at midpoint location:
- 1. Factory sets nextExpectedHandlingEvent to LOAD/voyage/location of following itinerary leg.
- c. Cargo was unloaded at destination location:
- 1. Factory sets nextExpectedHandlingEvent to CLAIM at destination location.
- 2. Factory sets isUnloadedAtDestination to true.
-
-4d. Cargo was registered by customs authorities:
- 1. Factory sets transportStatus to IN_PORT.
- a. Cargo is in destination port:
- 1. Factory sets isUnloadedAtDestination to true.
-
-4e. Cargo was claimed by customer:
- 1. Factory sets transportStatus = CLAIMED
- a. Cargo is not in destination port:
- 1. Factory sets isMisdirected to true.
- 2. Factory sets eta to null.
- b. Cargo is in destination port:
- 1. Factory sets isUnloadedAtDestination to true.
-
-4f. An unknown handling event was registered:
- 1. Factory sets transportStatus to UNKNOWN.
-
----------------------------------------------------------------------------
-Success guarantees:
- A Delivery object containing a complete transportation data snapshot for the cargo is returned.
-
-Minimal guarantees:
- No guarantee that a Delivery object can be created from supplied data.
-
-Stakeholders/Interests:
- System - can get a valid Delivery object.
-
-
-
-
http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/context/shipping/handling/InspectCargo.txt
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/context/shipping/handling/InspectCargo.txt b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/context/shipping/handling/InspectCargo.txt
deleted file mode 100644
index a6e0aaf..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/context/shipping/handling/InspectCargo.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-
-USE CASE Inspect Cargo [subfunction]
-===========================================================================
-System updates delivery snapshot of cargo based on registered handling event and saves cargo.
-
-Scope.......... Booking application ("system")
-Level.......... Subfunction
-Primary actor.. System
-Preconditions.. Cargo delivery snapshot is not up do date with registered handling event.
-Trigger........ Handling event has been registered.
-
-Main Success Scenario
----------------------------------------------------------------------------
-1. System <builds delivery snapshot> for cargo with registered handling event.
-2. System assigns new delivery snapshot to cargo.
-3. System checks that cargo is correctly in transit.
-4. System saves cargo.
-
-Deviations
----------------------------------------------------------------------------
-3a. Cargo is misdirected:
- 1. System notifies customer to reroute cargo.
-3b. Cargo has arrived:
- 1. System notifies customer to claim cargo (?)
http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/context/shipping/handling/RegisterHandlingEvent.txt
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/context/shipping/handling/RegisterHandlingEvent.txt b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/context/shipping/handling/RegisterHandlingEvent.txt
deleted file mode 100644
index c3ab921..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/context/shipping/handling/RegisterHandlingEvent.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-
-USE CASE Register Handling Event [subfunction]
-===========================================================================
-System registers cargo handling event data received from handling authority (port, shipper etc).
-
-Scope.......... Booking application ("system")
-Level.......... subfunction
-Primary actor.. System
-Preconditions.. Cargo trackingId is know by system and handler.
-Trigger........ Handling authority ("handler") submits handling event data for one or more cargos to system.
-
-Main Success Scenario
----------------------------------------------------------------------------
-1. System publishes event stating that handling event registration attempt has been received.
-2. System verifies that submitted data is complete.
-3. System verifies that submitted data can represent a valid handling event.
-4. System creates and saves handling event from submitted data.
-5. System <inspects cargo> to verify that handling event was expected
-6. System publishes event stating that handling event has been registered.
-
-
-Deviations
----------------------------------------------------------------------------
-2-5a. System couldn't create handling event:
- 1. System publishes event stating unsuccessful registration.
-
-2a. Submitted completion time, tracking id, event type or unLocode is null or empty:
- 1. Failure.
-
-3a. Handling event type string is not recognized:
- 1. Failure.
-3b. Tracking id doesn't represent a cargo in system:
- 1. Failure.
-3c. Tracking id doesn't represent a routed cargo in system:
- 1. Failure.
-3d. Location is not recognized in system:
- 1. Failure.
-3e. Handling event type requires voyage:
- 1. System finds voyage in store with voyage number.
- a. Voyage number is null:
- 1. Failure.
- b. Voyage number doesn't represent a voyage in system:
- 1. Failure.
-3f. Handling event type prohibits voyage:
- 1. System sets voyage to null.
-
-We could also check that a new event is not older than the last registered one...
-
-
----------------------------------------------------------------------------
-Success guarantees:
- Handling event is registered in system.
- Cargo is successfully updated.
- Handler is notified of successful handling event registration.
- Customer is notified if cargo is misdirected or has arrived.
-
-Minimal guarantees:
- System data is in a valid state.
- Registration attempt data is logged.
-
-Stakeholders/Interests:
- Customer - wants notification when cargo has arrived or is misdirected.
- Handler - wants confirmation that handling event registration was successful.
- Booking - wants all data to be in a valid and updated state and have a logger of all events.
-
-
-Comments
----------------------------------------------------------------------------
-I think the execution flow in RegisterHandlingEvent is easier to follow compared to that of DDDSample:
-
-1. HandlingReportServiceImpl -> JmsApplicationEventsImpl -> HandlingEventRegistrationAttemptConsumer
-2. HandlingReportServiceImpl -> HandlingReportParser
-3. HandlingReportServiceImpl -> JmsApplicationEventsImpl -> HandlingEventRegistrationAttemptConsumer
-4. HandlingEventRegistrationAttemptConsumer -> HandlingEventServiceImpl -> HandlingEventFactory
-5. HandlingEventServiceImpl -> HandlingEventRepositoryHibernate
-6. HandlingEventServiceImpl -> JmsApplicationEventsImpl -> CargoHandledConsumer
-7. CargoHandledConsumer -> CargoInspectionServiceImpl
-8. CargoInspectionServiceImpl -> CargoRepositoryHibernate
-
http://git-wip-us.apache.org/repos/asf/zest-java/blob/103c59cb/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/infrastructure/wicket/link/LinkPanel.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/infrastructure/wicket/link/LinkPanel.html b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/infrastructure/wicket/link/LinkPanel.html
deleted file mode 100644
index 3fee648..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/infrastructure/wicket/link/LinkPanel.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>
- <a wicket:id="link"><span wicket:id="label"></span></a>
-</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_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/infrastructure/wicket/prevnext/PrevNext.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/infrastructure/wicket/prevnext/PrevNext.html b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/infrastructure/wicket/prevnext/PrevNext.html
deleted file mode 100644
index f7e8a73..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/infrastructure/wicket/prevnext/PrevNext.html
+++ /dev/null
@@ -1,47 +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:head>
- <link href="css/prev-next.css" rel="stylesheet" type="text/css"/>
-</wicket:head>
-<wicket:panel>
- <div class="prevNextIcons">
- <a class="prev" href="#" wicket:id="prev"></a>
- <a class="next" href="#" wicket:id="next" ></a>
- </div>
-</wicket:panel>
-</html>
\ No newline at end of file