You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/05/31 16:06:49 UTC
[1/5] ISIS-406, ISIS-416, ISIS-417: updating poms;
'select all' checkbox; disable concurrency checking;
make spinning-icon configurable; remove defunct code
Updated Branches:
refs/heads/master a4fabe69b -> bd39f6806
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/claims/viewer-wicket/ide/eclipse/launch/claims-viewer-wicket.launch
----------------------------------------------------------------------
diff --git a/example/application/claims/viewer-wicket/ide/eclipse/launch/claims-viewer-wicket.launch b/example/application/claims/viewer-wicket/ide/eclipse/launch/claims-viewer-wicket.launch
index d3afdc3..e808f36 100644
--- a/example/application/claims/viewer-wicket/ide/eclipse/launch/claims-viewer-wicket.launch
+++ b/example/application/claims/viewer-wicket/ide/eclipse/launch/claims-viewer-wicket.launch
@@ -13,8 +13,6 @@
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="true"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.bytecode.identity&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.alternatives.bytecode.javassist&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceC
ontainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.embedded&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.objectstores.nosql&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.
apache.isis.runtimes.dflt.objectstores.sql-impl&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.objectstores.sql-tests-common&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.objectstores.sql-tests-served&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&
lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.objectstores.xml&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.alternatives.progmodel.groovy-applib&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.alternatives.progmodel.groovy-metamodel&q
uot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.alternatives.progmodel.wrapper-applib&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.alternatives.progmodel.wrapper-metamodel&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF
-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.remoting.common&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.remoting.marshalling-encode&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.remoting.marshalling-serialize&quot;/&gt;&#13;&#10;" typeId="or
g.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.remoting.marshalling-xstream&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.remoting.transport-http-client&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quo
t;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.remoting.transport-http-server&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.remoting.transport-sockets&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.security.file&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/>
; <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.security.ldap&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.applib&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.core.commons&quot;/&gt;&#13;&#10
;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.core.metamodel&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.core.progmodel&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&l
t;javaProject name=&quot;org.apache.isis.runtimes.dflt.runtime&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.core.testsupport&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.webapp&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&a
mp;quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.webserver&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.defaults.bytecode&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.objectstores.dflt&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jd
t.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.progmodels.dflt&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.defaults.security&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;or
g.apache.isis.examples.apps.bdd-claims-commandline&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.bdd-claims-concordion&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.bdd-claims-dom&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&
;quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.bdd-claims-fixture&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.bdd-claims-service&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.claims-commandline&quot;/&gt;&#13;&#1
0;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.claims-dom&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.claims-fixture&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt
;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.claims-service&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.claims-webapp&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.ecs&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento=&q
uot;&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.expenses-commandline&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.expenses-dom&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.expenses-fixtures&quot;/
&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.expenses-scimpi&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.expenses-services&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalon
e=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.expenses-webapp&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.groovy-claims-commandline&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.groovy-claims-dom&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContain
er.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.groovy-claims-fixture&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.groovy-claims-service&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name
=&quot;org.apache.isis.examples.apps.groovy-claims-webapp&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.library&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.orders&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&a
mp;quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.shoppingcart-cart&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.shoppingcart-catalogue&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.apps.shoppingcart-dom&quot;/&gt;&#13;&#10;" t
ypeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.examples.progmodel.namefile&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.skins.classic-skin&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#1
0;&lt;javaProject name=&quot;org.apache.isis.support.archetypes.application&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.support.archetypes.exploration&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.support.archetypes.scimpi&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="
&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.support.prototype-dom&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.support.prototype-fixture&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.support.prototype-objstore-default&quot;/&gt;&#1
3;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.support.prototype-quickrun&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.support.prototype-viewer-html&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&q
uot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.support.prototype-viewer-wicket&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.bdd-common&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.bdd-concordion&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container m
emento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.dnd&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.html&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.junit&quot;/&gt;&#13;&#10;" typeId="org
.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.restful-applib&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.restful-viewer&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProj
ect name=&quot;org.apache.isis.viewer.scimpi-dispatcher&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.scimpi-servlet&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.wicket-applib&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&
;quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.wicket-metamodel&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.wicket-model&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.wicket-ui&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sou
rceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.wicket-viewer&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;default/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="claims-viewer-wicket"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
</launchConfiguration>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/claims/viewer-wicket/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/viewer-wicket/pom.xml b/example/application/claims/viewer-wicket/pom.xml
index 4958303..dbd1811 100644
--- a/example/application/claims/viewer-wicket/pom.xml
+++ b/example/application/claims/viewer-wicket/pom.xml
@@ -73,7 +73,6 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.2.0-SNAPSHOT</version>
</dependency>
<!-- isis runtime -->
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/quickstart_dnd_junit_bdd/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_dnd_junit_bdd/pom.xml b/example/application/quickstart_dnd_junit_bdd/pom.xml
index 4907d38..be7af8e 100644
--- a/example/application/quickstart_dnd_junit_bdd/pom.xml
+++ b/example/application/quickstart_dnd_junit_bdd/pom.xml
@@ -34,12 +34,12 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <isis.version>1.2.0-SNAPSHOT</isis.version>
+ <isis.version>1.3.0-SNAPSHOT</isis.version>
<isis-objectstore-xml.version>1.0.0-SNAPSHOT</isis-objectstore-xml.version>
<isis-profilestore-xml.version>1.0.0-SNAPSHOT</isis-profilestore-xml.version>
<isis-viewer-bdd.version>1.0.0-SNAPSHOT</isis-viewer-bdd.version>
<isis-viewer-dnd.version>1.0.0-SNAPSHOT</isis-viewer-dnd.version>
- <isis-security-file.version>1.0.1-SNAPSHOT</isis-security-file.version>
+ <isis-security-file.version>1.0.2-SNAPSHOT</isis-security-file.version>
</properties>
<repositories>
@@ -158,7 +158,6 @@
<module>dom</module>
<module>fixture</module>
<module>viewer-dnd</module>
- <module>tests-junit</module>
<module>tests-bdd</module>
</modules>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/quickstart_dnd_junit_bdd/tests-junit/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_dnd_junit_bdd/tests-junit/isis.properties b/example/application/quickstart_dnd_junit_bdd/tests-junit/isis.properties
deleted file mode 100644
index a6c2b1d..0000000
--- a/example/application/quickstart_dnd_junit_bdd/tests-junit/isis.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.
-isis.services.prefix = objstore.dflt
-isis.services = todo.ToDoItemsDefault
-
-isis.fixtures.prefix= fixture
-isis.fixtures= LogonAsSvenFixture,todo.ToDoItemsFixture
-
-isis.exploration.users=sven, dick, bob
-
-isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor
-isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.CglibObjectFactory
-
-isis.user-profile-store=in-memory
-isis.persistor=in-memory
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/quickstart_dnd_junit_bdd/tests-junit/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_dnd_junit_bdd/tests-junit/pom.xml b/example/application/quickstart_dnd_junit_bdd/tests-junit/pom.xml
deleted file mode 100644
index 90c220c..0000000
--- a/example/application/quickstart_dnd_junit_bdd/tests-junit/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.example.application</groupId>
- <artifactId>quickstart_dnd_junit_bdd</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>quickstart_dnd_junit_bdd-tests-junit</artifactId>
-
- <name>Quickstart (DnD/Junit/BDD) JUnit Tests</name>
-
- <dependencies>
-
- <!-- this project's dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>quickstart_dnd_junit_bdd-fixture</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
-
- <!-- isis -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-bytecode-cglib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-objectstore</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-profilestore</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>isis-security-file</artifactId>
- </dependency>
-
- <!-- isis testing -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-wrapper</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-integtestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/quickstart_dnd_junit_bdd/tests-junit/src/test/java/junit/AbstractTest.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_dnd_junit_bdd/tests-junit/src/test/java/junit/AbstractTest.java b/example/application/quickstart_dnd_junit_bdd/tests-junit/src/test/java/junit/AbstractTest.java
deleted file mode 100644
index 2a29b1f..0000000
--- a/example/application/quickstart_dnd_junit_bdd/tests-junit/src/test/java/junit/AbstractTest.java
+++ /dev/null
@@ -1,101 +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 junit;
-
-import dom.todo.ToDoItems;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-
-import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.applib.services.wrapper.WrapperObject;
-import org.apache.isis.core.integtestsupport.legacy.ConfigDir;
-import org.apache.isis.core.integtestsupport.legacy.IsisTestRunner;
-import org.apache.isis.core.integtestsupport.legacy.Service;
-import org.apache.isis.core.integtestsupport.legacy.Services;
-import org.apache.isis.core.wrapper.WrapperFactoryDefault;
-
-@RunWith(IsisTestRunner.class)
-@ConfigDir("../viewer-dnd/config") // acts as default, but can be overridden by annotations
-@Services({ @Service(ToDoItems.class), @Service(WrapperFactoryDefault.class) })
-public abstract class AbstractTest {
-
- private DomainObjectContainer domainObjectContainer;
- private WrapperFactory wrapperFactory;
-
- /**
- * The {@link WrapperFactory#wrap(Object) wrapped} equivalent of the
- * {@link #setToDoItems(ToDoItems) injected} {@link ToDoItems}.
- */
- protected ToDoItems toDoItems;
-
- @Before
- public void wrapInjectedServices() throws Exception {
- toDoItems = wrapped(toDoItems);
- }
-
- @Before
- public void setUp() throws Exception {
- }
-
- protected <T> T wrapped(final T obj) {
- return wrapperFactory.wrap(obj);
- }
-
- @SuppressWarnings("unchecked")
- protected <T> T unwrapped(final T obj) {
- if (obj instanceof WrapperObject) {
- final WrapperObject wrapperObject = (WrapperObject) obj;
- return (T) wrapperObject.wrapped();
- }
- return obj;
- }
-
- @After
- public void tearDown() throws Exception {
- }
-
- // //////////////////////////////////////////////////////
- // Injected.
- // //////////////////////////////////////////////////////
-
- protected WrapperFactory getWrapperFactory() {
- return wrapperFactory;
- }
-
- public void setWrapperFactory(final WrapperFactory wrapperFactory) {
- this.wrapperFactory = wrapperFactory;
- }
-
- protected DomainObjectContainer getDomainObjectContainer() {
- return domainObjectContainer;
- }
-
- public void setDomainObjectContainer(final DomainObjectContainer domainObjectContainer) {
- this.domainObjectContainer = domainObjectContainer;
- }
-
- public void setToDoItems(final ToDoItems toDoItems) {
- this.toDoItems = toDoItems;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/quickstart_dnd_junit_bdd/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_dnd_junit_bdd/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java b/example/application/quickstart_dnd_junit_bdd/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java
deleted file mode 100644
index a0b25fd..0000000
--- a/example/application/quickstart_dnd_junit_bdd/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java
+++ /dev/null
@@ -1,57 +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 junit.todo;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-import java.util.List;
-
-import junit.AbstractTest;
-import dom.todo.ToDoItem;
-import dom.todo.ToDoItem.Category;
-import fixture.LogonAsSvenFixture;
-import fixture.todo.ToDoItemsFixture;
-
-import org.junit.Test;
-
-import org.apache.isis.core.integtestsupport.legacy.Fixture;
-import org.apache.isis.core.integtestsupport.legacy.Fixtures;
-
-@Fixtures({ @Fixture(ToDoItemsFixture.class), @Fixture(LogonAsSvenFixture.class) })
-public class ToDoItemRepositoryTest extends AbstractTest {
-
- @Test
- public void canFindAllItemsNotYetDone() throws Exception {
- final List<ToDoItem> foobarList = toDoItems.notYetDone();
- assertThat(foobarList.size(), is(5));
- }
-
- @Test
- public void canCreateToDoItem() throws Exception {
- final ToDoItem newItem = toDoItems.newToDo("item description", Category.Professional);
- assertThat(newItem, is(not(nullValue())));
- assertThat(newItem.getDescription(), is("item description"));
- assertThat(getDomainObjectContainer().isPersistent(newItem), is(true));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/quickstart_dnd_junit_bdd/tests-junit/src/test/java/junit/todo/ToDoItemTest.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_dnd_junit_bdd/tests-junit/src/test/java/junit/todo/ToDoItemTest.java b/example/application/quickstart_dnd_junit_bdd/tests-junit/src/test/java/junit/todo/ToDoItemTest.java
deleted file mode 100644
index 72ad8d3..0000000
--- a/example/application/quickstart_dnd_junit_bdd/tests-junit/src/test/java/junit/todo/ToDoItemTest.java
+++ /dev/null
@@ -1,66 +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 junit.todo;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import junit.AbstractTest;
-import dom.todo.ToDoItem;
-import fixture.LogonAsSvenFixture;
-import fixture.todo.ToDoItemsFixture;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import org.apache.isis.applib.services.wrapper.DisabledException;
-import org.apache.isis.core.integtestsupport.legacy.Fixture;
-import org.apache.isis.core.integtestsupport.legacy.Fixtures;
-
-@Fixtures({ @Fixture(ToDoItemsFixture.class), @Fixture(LogonAsSvenFixture.class) })
-public class ToDoItemTest extends AbstractTest {
-
- private ToDoItem toDoItem;
-
- @Override
- @Before
- public void setUp() {
- toDoItem = toDoItems.notYetDone().get(0);
- toDoItem = wrapped(toDoItem);
- }
-
- @Test
- public void canMarkAsDone() throws Exception {
- toDoItem.markAsDone();
- assertThat(toDoItem.getDone(), is(true));
- }
-
- @Test
- public void cannotMarkAsDoneTwice() throws Exception {
- toDoItem.markAsDone();
- try {
- toDoItem.markAsDone();
- fail("Should have been disabled");
- } catch (final DisabledException e) {
- assertThat(e.getMessage(), is("Already done"));
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/quickstart_dnd_junit_bdd/viewer-dnd/ide/eclipse/launch/quickstart_dnd_junit_bdd-viewer-dnd.launch
----------------------------------------------------------------------
diff --git a/example/application/quickstart_dnd_junit_bdd/viewer-dnd/ide/eclipse/launch/quickstart_dnd_junit_bdd-viewer-dnd.launch b/example/application/quickstart_dnd_junit_bdd/viewer-dnd/ide/eclipse/launch/quickstart_dnd_junit_bdd-viewer-dnd.launch
index 489d335..7fe36b0 100644
--- a/example/application/quickstart_dnd_junit_bdd/viewer-dnd/ide/eclipse/launch/quickstart_dnd_junit_bdd-viewer-dnd.launch
+++ b/example/application/quickstart_dnd_junit_bdd/viewer-dnd/ide/eclipse/launch/quickstart_dnd_junit_bdd-viewer-dnd.launch
@@ -12,9 +12,7 @@
</mapAttribute>
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.Isis"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--type exploration --viewer dnd"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart_dnd_junit_bdd-viewer-dnd"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
</launchConfiguration>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/quickstart_scimpi_nosql/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/pom.xml b/example/application/quickstart_scimpi_nosql/pom.xml
index 3feca0d..d87c7d6 100644
--- a/example/application/quickstart_scimpi_nosql/pom.xml
+++ b/example/application/quickstart_scimpi_nosql/pom.xml
@@ -33,10 +33,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <isis.version>1.2.0-SNAPSHOT</isis.version>
+ <isis.version>1.3.0-SNAPSHOT</isis.version>
<isis-objectstore-nosql.version>1.0.0-SNAPSHOT</isis-objectstore-nosql.version>
<isis-viewer-scimpi.version>1.0.0-SNAPSHOT</isis-viewer-scimpi.version>
- <isis-security-file.version>1.0.1-SNAPSHOT</isis-security-file.version>
+ <isis-security-file.version>1.0.2-SNAPSHOT</isis-security-file.version>
</properties>
<repositories>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/quickstart_scimpi_nosql/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch b/example/application/quickstart_scimpi_nosql/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch
index eaf9f9b..00f1f0e 100644
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch
@@ -13,6 +13,6 @@
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart_scimpi_nosql-viewer-scimpi"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--type server_exploration"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart_scimpi_nosql-viewer-scimpi"/>
</launchConfiguration>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
index cbcfc77..47dbb8f 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
@@ -214,6 +214,7 @@ public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3
@Named("Undo")
@PublishedAction
+ @Bulk
@MemberOrder(name="complete", sequence = "2")
public ToDoItem notYetCompleted() {
setComplete(false);
@@ -559,11 +560,4 @@ public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3
// // }}
-
- public ToDoItem updateDueBy(
- //@RenderedAdjusted
- LocalDate dueBy) {
- setDueBy(dueBy);
- return this;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/quickstart_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/pom.xml b/example/application/quickstart_wicket_restful_jdo/pom.xml
index d2c24dd..fc79c55 100644
--- a/example/application/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/pom.xml
@@ -32,7 +32,7 @@
<properties>
<isis.version>1.2.0</isis.version>
<isis-objectstore-jdo.version>1.1.0</isis-objectstore-jdo.version>
- <isis-viewer-wicket.version>1.2.0</isis-viewer-wicket.version>
+ <isis-viewer-wicket.version>1.3.0-SNAPSHOT</isis-viewer-wicket.version>
<isis-viewer-restfulobjects.version>2.0.0</isis-viewer-restfulobjects.version>
<isis-security-shiro.version>1.1.1</isis-security-shiro.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/app/QuickStartApplication.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/app/QuickStartApplication.java b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/app/QuickStartApplication.java
index bf3ab6d..c81bd82 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/app/QuickStartApplication.java
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/app/QuickStartApplication.java
@@ -20,26 +20,12 @@ package app;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import java.nio.charset.Charset;
-import java.util.Enumeration;
import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-import javax.servlet.ServletContext;
-
-import org.apache.commons.collections.EnumerationUtils;
-import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
-import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
+import javax.servlet.http.HttpServletRequest;
import com.google.common.base.Joiner;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
import com.google.common.io.Resources;
import com.google.inject.AbstractModule;
import com.google.inject.Module;
@@ -47,6 +33,15 @@ import com.google.inject.name.Names;
import com.google.inject.util.Modules;
import com.google.inject.util.Providers;
+import org.apache.wicket.Session;
+import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Response;
+import org.apache.wicket.request.http.WebRequest;
+
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
+import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
+import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
+
/**
* As specified in <tt>web.xml</tt>.
@@ -69,6 +64,33 @@ public class QuickStartApplication extends IsisWicketApplication {
private static final long serialVersionUID = 1L;
+//
+// uncomment for a (slightly hacky) way of allowing logins using ?user=sven&pass=pass
+//
+// for demos only, obvious
+
+// @Override
+// public Session newSession(final Request request, final Response response) {
+// AuthenticatedWebSessionForIsis s = (AuthenticatedWebSessionForIsis) super.newSession(request, response);
+// final org.apache.wicket.util.string.StringValue user = request.getRequestParameters().getParameterValue("user");
+// final org.apache.wicket.util.string.StringValue password = request.getRequestParameters().getParameterValue("pass");
+// s.signIn(user.toString(), password.toString());
+// return s;
+// }
+//
+// @Override
+// public WebRequest newWebRequest(HttpServletRequest servletRequest, String filterPath) {
+// try {
+// String uname = servletRequest.getParameter("user");
+// if (uname != null) {
+// servletRequest.getSession().invalidate();
+// }
+// } catch (Exception e) {
+// }
+// WebRequest request = super.newWebRequest(servletRequest, filterPath);
+// return request;
+// }
+
@Override
protected Module newIsisWicketModule() {
final Module isisDefaults = super.newIsisWicketModule();
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/images/spinning-icon.gif
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/images/spinning-icon.gif b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/images/spinning-icon.gif
new file mode 100644
index 0000000..75e3b1e
Binary files /dev/null and b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/images/spinning-icon.gif differ
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/domain-service/email-service/pom.xml
----------------------------------------------------------------------
diff --git a/example/domain-service/email-service/pom.xml b/example/domain-service/email-service/pom.xml
index 676a987..3a428af 100644
--- a/example/domain-service/email-service/pom.xml
+++ b/example/domain-service/email-service/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <isis.version>1.2.0-SNAPSHOT</isis.version>
+ <isis.version>1.3.0-SNAPSHOT</isis.version>
</properties>
<groupId>org.apache.isis.example.domainservice</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/misc/metamodel/namefile/pom.xml
----------------------------------------------------------------------
diff --git a/example/misc/metamodel/namefile/pom.xml b/example/misc/metamodel/namefile/pom.xml
index d55f5e8..481ef78 100644
--- a/example/misc/metamodel/namefile/pom.xml
+++ b/example/misc/metamodel/namefile/pom.xml
@@ -23,7 +23,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <isis.version>1.2.0-SNAPSHOT</isis.version>
+ <isis.version>1.3.0-SNAPSHOT</isis.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/tool/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tool/maven-plugin/pom.xml b/tool/maven-plugin/pom.xml
index 05681ac..23bff53 100644
--- a/tool/maven-plugin/pom.xml
+++ b/tool/maven-plugin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
[3/5] ISIS-418: deleting the isis-site-skin
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/logos/isis-extras-logo.png
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/logos/isis-extras-logo.png b/site-skin/src/main/resources/images/logos/isis-extras-logo.png
deleted file mode 100644
index f3f3ad1..0000000
Binary files a/site-skin/src/main/resources/images/logos/isis-extras-logo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/logos/isis-logo.pdn
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/logos/isis-logo.pdn b/site-skin/src/main/resources/images/logos/isis-logo.pdn
deleted file mode 100644
index 077f48c..0000000
Binary files a/site-skin/src/main/resources/images/logos/isis-logo.pdn and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/logos/isis-logo.png
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/logos/isis-logo.png b/site-skin/src/main/resources/images/logos/isis-logo.png
deleted file mode 100644
index 19a37de..0000000
Binary files a/site-skin/src/main/resources/images/logos/isis-logo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/logos/maven-feather.png
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/logos/maven-feather.png b/site-skin/src/main/resources/images/logos/maven-feather.png
deleted file mode 100644
index b5ada83..0000000
Binary files a/site-skin/src/main/resources/images/logos/maven-feather.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/newwindow.png
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/newwindow.png b/site-skin/src/main/resources/images/newwindow.png
deleted file mode 100755
index 6287f72..0000000
Binary files a/site-skin/src/main/resources/images/newwindow.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/resources.txt
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/resources.txt b/site-skin/src/main/resources/resources.txt
deleted file mode 100644
index fa4bc73..0000000
--- a/site-skin/src/main/resources/resources.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-images/expanded.gif
-images/collapsed.gif
-images/logos/maven-feather.png
-images/logos/build-by-maven-white.png
-images/logos/build-by-maven-black.png
-images/logos/apache-incubator-logo.png
-images/logos/banner.png
-css/maven-base.css
-css/print.css
[4/5] ISIS-418: deleting the isis-site-skin
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/logos/isis-extras-logo.pdn
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/logos/isis-extras-logo.pdn b/site-skin/src/main/resources/images/logos/isis-extras-logo.pdn
deleted file mode 100644
index 54d451e..0000000
--- a/site-skin/src/main/resources/images/logos/isis-extras-logo.pdn
+++ /dev/null
@@ -1,467 +0,0 @@
-PDN3z<pdnImage width="391" height="399" layers="3" savedWithVersion="3.510.4297.28964"><custom><thumb png="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" /></custom></pdnImage> ���� PPaintDotNet.Data, Version=3.510.4297.28969, Culture=neutral, PublicKeyToken=null ISystem, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 PaintDotNet.Document
-isDisposedlayerswidthheight savedWith userMetaDatauserMetadataItems PaintDotNet.LayerList System.Version2System.Collections.Specialized.NameValueCollection �System.Collections.Generic.KeyValuePair`2[[System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]][] � � PaintDotNet.LayerList parentArrayList+_itemsArrayList+_sizeArrayList+_version PaintDotNet.Document System.Version _Major_Minor_Build _Revision � � $q 2System.Collections.Specialized.NameValueCollection ReadOnly HashProviderComparerCountKeysValuesVersion 2System.Collections.CaseInsensitiveHashCodeProvider*System.Collections.CaseInsensitiveComparer
-
% �System.Collections.Generic.KeyValuePair`2[[System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]�����System.Collections.Generic.KeyValuePair`2[[System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]] keyvalue
-$exif.tag0 /<exif id="771" len="1" type="1" value="AA==" />��������
-$exif.tag1 7<exif id="769" len="8" type="5" value="oIYBAI+xAAA=" />��������
-$exif.tag2 1<exif id="20752" len="1" type="1" value="AQ==" />��������
-$exif.tag3 5<exif id="20753" len="4" type="4" value="ww4AAA==" />��������
-$exif.tag4 5<exif id="20754" len="4" type="4" value="ww4AAA==" />��������
-$exif.tag9 D<exif id="305" len="18" type="2" value="UGFpbnQuTkVUIHYzLjUuMTAA" />��������! $exif.tag10" /<exif id="296" len="2" type="3" value="AgA=" />��������$ $exif.tag11% 7<exif id="282" len="8" type="5" value="8nYBAOgDAAA=" />��������' $exif.tag12( 7<exif id="283" len="8" type="5" value="8nYBAOgDAAA=" /> ) * +
-
- 2System.Collections.CaseInsensitiveHashCodeProvider m_text System.Globalization.TextInfo , *System.Collections.CaseInsensitiveComparer
m_compareInfo System.Globalization.CompareInfo - ! $ '
7 8 9 : ; < = > ? @ PPaintDotNet.Core, Version=3.510.4297.28965, Culture=neutral, PublicKeyToken=null) PaintDotNet.BitmapLayer
-propertiessurfaceLayer+isDisposed Layer+width Layer+heightLayer+properties -PaintDotNet.BitmapLayer+BitmapLayerProperties PaintDotNet.Surface@ !PaintDotNet.Layer+LayerProperties A B � � C * ) D E � � F + ) G H � � I , System.Globalization.TextInfo m_listSeparator m_isReadOnlycustomCultureName m_nDataItemm_useUserOverride
m_win32LangID
-
-� - System.Globalization.CompareInfo win32LCIDculturem_name J 7 System.Collections.ArrayList _items_size_version K 8 7 L 9 7 M : 7 N ; 7 O < 7 P = 7 Q > 7 R ? 7 S A -PaintDotNet.BitmapLayer+BitmapLayerProperties blendOp&PaintDotNet.UserBlendOps+NormalBlendOp T B PaintDotNet.Surface scan0widthheightstride PaintDotNet.MemoryBlock@ @ U � � C !PaintDotNet.Layer+LayerProperties name userMetaDatauserMetadataItemsvisible isBackgroundopacity 2System.Collections.Specialized.NameValueCollection �System.Collections.Generic.KeyValuePair`2[[System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]][] V
-Background W X �D A Y E B Z � � F C [ Layer 3 \ X �G A ^ H B _ � � I C ` Layer 2 a X �K L M N O P Q " R % S ( T &PaintDotNet.UserBlendOps+NormalBlendOp U PaintDotNet.MemoryBlock length64 hasParentdeferred @ �� W
- n o X �System.Collections.Generic.KeyValuePair`2[[System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]Y T Z U �� \
- r s ^ T _ U �� a
- v w n o r s v w O� � E0O ��}�wVו� 1k�5��3c�m�z����$j��z/HB $�.��{5�@l�n�^ �^;�����w����� �U�^�L&0'�n�}�>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-��������@������8�����������������i���L���cG��
���??((((LP��?���������ԥ��� ��.~���� &�._����0'���&
Ӌ�"���}� ��_RPPP�8��� ����$8���sk������S�駟��Qܠ���01@~QDDB�"1=5�=Ep�)��S]pl�CPv"�K��/Qޒ����8���%�ڵ ^~�L��� �J��[��gv �P3��,C�j|��7�[RPPP� ^8w� ����M�p�+�,��7$�rOn���j<����������;����� �;&�ʓม�; 0�i�2��q /���S��[
-�J�[o�ŵ���PPPPP �7�����X���b��پ�3��`�\7�#��SX��a,yf7��x$�.���_��W� � hN@]6�y� �k�8v�i})f��2^����\��n@ޕǐ�� ���}5 H
��#��D�C�����.\���/<���Қ ��2�n��^� � 3;�೧�W G��g���H�ң�pb�.03o��&��)oIAAAal�x��m���p�^�����D3���Z��uì�|��*����\>������[j�C� ��*����
-
-
-
-c�=�������D<\�y���Ȍf3^��S_�
��=��+g�����X��AD����<��m����Ư�����������1DFF�{� 8f3^X_ ��%��.x�=�:�������G�!���~������>, o�i���x����j �����y>�o�
-�[j ם6Ҍ!��Bfv^�.�=�ʲ ]��7�b�'
�ңHy��\�ɽ����lU!���k�[RPPPC����m111x8&3�3༡��(�J��Y���G��-�C_)�6�snX��!��u ��B�Ǹ�d�-�roi��}�[�ك�F7��Y ���ᡲD���w��� �ۯ�x�qc9�7�b���/ �� ��A��.Koi?<���Bd%��^�s��[RPPP���UI/D,�̼�pb��1����e�� �^(b�P�Mep���0�x�>�ɗ
�-�]܉�#-x�" KW૯�Rޒ����(����2n�q|�*���^��U�͞�ؿ洙�Up�R�� �OmC��������o���ZLK���{�v ���������y��o���[�b�l�⚁��r1S��>{�X��B�� [+ậ
-����F�^�1�[��R��N����� �t��=(oIAAAa�x�ʕ+��pá.������$�$u ^`z�aC 7U����j� Z���H� ���2����. i�#��XZ��/��R��VPPP%��UI/,\��� ���� b���#� N�����y�
-n;� sN�c����xKԉ;i�v�a��(l���>
���S����/��X8�&` uf�nyI��M�����
'���^ n ���4�ێ���ۀ���9�e���r�[zS����]̽�W^yE�#��AAAA��C��w�܉�s��7s�;���_�w%�^�I��Bo1�%/l� |$��9/��Ÿ��p3���a�������dF�r,)��_|�gӪ3����p�A�������IQ�հ.�*`�U(va�x�f 2�d�� 5:7x쮅�& iѼ���[�z
o��[�\��}������)(((�YЛKo� �bR�0�"���C��H��&�æ28��x�E��N�
?��ᾒ�����-%��t�.���V^~�e����
-
-
-
-� ��F���D���d9��^�n���^U�m#����ӖJ�I�xA�/�1.�A;x��F�[:6�����[z�Q��vK���3V�����ιAyK
-
-
-
-� ��6o���$µ� Ό��0�#O�ۖ ����8�y[��%��?�v��So�����zK�/l���zLˊ�ƽ;�\ZyK
-
-
-
-�� 4c����cb8f��¹컥�dȪn0t� >��`��s�� �L�R����[zFzK����qd��(�5yK/ o��v<���8� n=(*��_�u�|�=�H3H��kʪJ^�sg��8a�0�[Z�o�����HyC��[���-�����5��-��������1����/&e�\/Н �%��U�d�$�y$z�w�W;"~p߹zPoi� G�-�i����ذg�YnI�����1�G�#(l\r����3�J����$�u �$9wv�)xaD�0���9o�8���Y�>���K/�]�jߒ����̓�Q�Y��m~A�x0�i�.�%/t��I����n��w� �F� 4o�V�5#H���G�ҫޒ�-�~�ؿ>�����i�)�Ƨ�~����%�
-
-
-
-7y�m� �+��am\7W¡���Ug��m4t�^��%I^0�[�-%�-1�X!����-Šo�6��O���)~PPPP�~��m��+6 թ���1�
� 4���z|�j��0X̝�w�s��i�-靸5<Ҋ��&o)��-�g�- �<��4�v"��y��[u � r���E.��e�� �=�B� 4{vܠ�z���$xaN�1~�[:G�Ү!��Ӛ��� �9ֆ�u��[��O�]�
-
-
-
-
-#��귅��aڊ08�����
-ͺm�(��l� C���ks�MxK -��T�-]ּ�L�-E_��}�x0'k7��yK
-
-
-
-
-�C��os��@��Dط�q�`�]���n����YU� �i�0���aD�R(�7�����{N�ժ�AAAAax��B�ۨ�6'y i���*>S�zA���: �>�� K^�n�[�7ro)�{KGuoiV}:b����G qo�rK� ���F�����*Kbz�
-N��N ���y�ͻm�
�|�A��NyK/�����j�Rޕ�oi+����ƠiS7~��G>oW��� /�~~���Dxt�
-��-mWR�i��zq�����L��x�=v
� ��[r �-u �q�_�[:�7�m����g�ս%�
-
-
-
-��6Wo���±��{I�����8J^�f>w�`o����n��1�[:��˧ͼ����`��6�j�@tq>��CՙVPPP���-���wr4\Z���
-M����� f y$�=�7�7�-�i��a�-��5�������t��ٯ��߈�y�(�\���^�=((((Lt�\��Bb���\Pg�8��Ue��I�9� ��p���\�-�XzK��-�cZ�"�9��~'Nͥ&2$/�������H�>����y��?Ov�|A�j Xp�� n��T�ߘּ���[�'��g��tdpo���1�i%��$�>P�i� �OV�\���!��
����S�i���ֳܟ���N/� �n� ��[r�[Zf�-����)�-Ű_㷿 �c
��ԝ8�����|�1x�x�?})�; �J^��R��&: ��[���<ca(N���������.?��4o)�l ��[Z��>q�ϥ՝8���s[�ۂ�b�6�wh�`�Sl�m,�@��]v � �-��;2~�#��.��tt ��ҽ�$�����sOt`��L��I�իW9?(oIAAa�@������R9/8��� z%/: ���Wi�����:/Hn�}�p���Zͼ�6�-mѼ�KCyK���6��
���PA �ۚ�ܒ�K+((�w�����.����L3PO�}�%z�y@�a�j���y�/�0rn����P�ގ���a��[bܐw��-�_�����-ũ� Sޒ��¸��v���@��]��%<�J={��P�x�\����m��D����^K^h��R yK�� �o�Bpv��~��'�-)((�[/�?��c�] |��:���]b�j���܅!|$wz��5 �
��[�?���g��t��[�?�� ��p]���[�-)((�K� z�s����t�����
-�À�nC������ � n�Sޒ���{K'zKirߒ�[J~EzK�0mE(N�=õ�ڧ���0�@��k�o ]�3
-�yՙi�% ��uDV�2It��� {M���
�ƨ��I�^�[J{��-�d#(;��>�L��R�AAAa�CΞ��� ����v� ֗j^��G�mۮ�� {�;��^��7�Vo���[��0oi��-ơ���{K�˛��T�AAAa,C������gZ,�{˸�D3���� �ܙ���F74�]o鈥��_��2
�R�['����Fx0Μ�����ޒڷ���0�A���˗��g�% 0�q%� ���Uu� �jCNU�$/ ���-y[zKOnA�����R� {1�d' Zs�����{�{Kj����0A��|K����x�,O�o$�1�2^(�� 3I۫����6_po�� ������ �b�'�s匹�������^�yͫ��w�鷀��݊��D@�8���mk��+��B��
-8��� uۨ�N�����
��h����sKoi�R���tP�TbZj8��>ŹA�UPPK���|�ᓵ n��;I�� �00�@��$������L���F�
��[�9hn)��3������"(+���ժ�%�� �1<��<��H��n��?/;m,�`�0/8�0��6z�4i߈�a�yK�������g8?d��yK�L_poir�T�8u'NAAa4�x�f ���M^��5���tf<�5C���&�0�Л��~p^��axKg
��kC{K�[��)8��)u'NAAaT��&�1�>���a�/I���Z~��qCߟ�(���; R/���}����ad�0���3o)\�� ��yKǐ��>�k �r�����~��Jj.���0� �mYYY�?�� �v�1l(���Ȭ��} �#��7�c0N ?�qo���[�Ѽ��-rK��p~�2zK���P�2$�.�7�|�߉S��� � �C������p�*�� ���xA���)�$���� \s
~h�5�0ڼ��-�`�𖢟�vmo�i ϭ�x 5 ۏ
н%�
-
-
-��*��,\��ok���$��� �m���
� ��Q�-�B~�[��yK+���_�؞�������N���¨ ��-Z��T�>�l���(���|@����'xIn�Q~O��i�6�-=�LS�>�CxK�*���T�AAA᷂ܭJ���£x9��{G�gG�Uu�l�0��$C ��� �0A�%�zK��-�m��a�vh?~��g�-)((�f �b��� �_N�7W����1��Fm�6ߓ�w�/ ��r/�f�%�a�{K�CzK�pl����믿�gjW���y�o��^ ���p`���ΛV�z�I�z���$� �p��a zKK��R��X�����Pi�U�믿�%�yPPP�S����!s�������x���� �۶M�� ������ �-�cyKOYzK���D��ʷO`�+y� ��WcZZ8� ܧ{K� ��Y�d ��C�Q��:�2m��B� f 9{� /��vh�q�-��yK���(�%�Y�[��yK��-=�
���%�[RPP��0��
�.�OA�9��U7Vh�g�U5��
B/41>7(o�qoi�0��� ��[�py"�V૯�R�%��
-z_�����
��p�-ao��1l,3�I�$M/ �8w6��H��D�� �-���ұ��ҫ��䵽��"���^�[R����p�!�-
-
���8���wٜ匡�| e���d�/x� �[��ԪyKOo�eso)��-�� �[�,��ҥK�x'N��VPP���;�|}}� �t~Ǚ��N�*�^(Ӳ�ی��,x��o��^nP�R#�
�R��k{Kq�?��[�H���|�[R��n$/�~�kq�x���s����; �{U�y$���5�0?(o��-���[:d�-=��o�4xK������{��O?�;q*����p3��g�͛7�0��_��"m�P�͞��=I� � kL�`��-݀�tP�B��{q��-�n�-�2
����z��UĽ�W_}�k�[�-}��gPPP���p��9DD/Ƽ�x8w�s��1�1�`�$/�=I��γ�y@�?(o���cm�?Ro�ٝbz�UɈ+��_|�w�o�=v���f�ۤ����01@�� h �w\8���{躭�kM/�bz�f�� up��`�C�Kj �S��
{K�[zl$��!D1��I�R6�ۭ{K7��/��������yx��xJ��������|"��,�� �k��k�L��?o�ؓ$�
��7�x��0����;�--d:ù��Y x��o�[�_�s�N̝;���>�S�7�
:ߨ������췅������]�fod�v�yS�~��ٸW�:Ϝ�j�p����ם�q�-u�yK)Fo�Ǒ���v!�H+ �Z�%ey������ҵ���uz�������yq����ԧ`�d �j6�����@|���0�@o � ����D8���љ�c�q�Yf�gh�Ф��# 1|7��[�[jҼ���[�:Bo��VFa�ޝ�w����SO=��� xG�ye�/� �.aj�;�g���\V�O>��}��MyU
-
-
-�� W�\AXX欈�Kk /]�j3�?Ϭ�P�wa�p�4�A�us���[b�ܓ�5�k�R��-�����R��z��[ ��x���KCv��g�[�^^^���CK:pO�Lξە/�a��x��*��6�W^�?�����WRP?��$�� ���+�;Y��:;��{UW�yG�Ռj����H^h�!~5�Ҿ��-�NC��2�&-���{q�V
_��x����-eXxK�� ��gw!�H+f��~cJs��D���=��Aj���@/��}D�,�Ǵ«�lҞ�U�S��� ��֑�h�;�=%��LZAa|@�Bdd$£ç<��q��b�?��p�; Up�yA˪zy�h�7��"o�ilxKC��v�h' �)?�/��t/c} �{�1���:
-��~ݼ�mXp� ��F��[�����˴��ذ{��?�����
-�K�<?����m� '�ƴ�K�N}V+.����1g���&�x ��-�S�OݜSP���@�ߠ@�g/�+�y��"� �^U�U�������P�i�|Tp�ћ��-
�W� 4��R�3|W u�JaO��]�ٝ�՞�Y���ќ���V��4<T����)p�)��=kA���]��x���|�@��H7FFFaVx���8�L�!��,�
-�V<���i�o� �v ����o�5���.�uSHAa�� ӛ �9������/g �Z���ֳǁ� Z�ه��>�n?LToi ?�8�ExH|o�i�>� �L+�7~�Bㄖ �X��G/ԧa:���cڪdL+O`_"�� {����GL�j�u���O?��� ���}�-�K���9��.�%ؤ>#x�i������*� v�����U��jA;��K3��
-
-c�hI��9I��Y���C� �Z�gU+�^�6�0H^z�xaxnP���j�}�k/� V�4��=$� L+�#^��#k2�V���uL/�����ya�����q���V��m�g�P�� ����PH������Vx
����:�<$�� R�vH{ ��>��#���@�bv���;���7�,���g��OAa��~��?��o��$
-^���=��=5����|�n�'�g��|A�±�n�v��ޒI/�l����|���A�fw3���B{.f�2��̴B�� ҃UL+T$�/7e��i ��B��֢�� �]��ȀלH� R��ð[�"�
-/�&�"�
-� Y�^�u�s�^�u�K��� �>
-��B�n��^�e��Y�o��V�"UP��\Jff&��Ì�%�àw��6W�{U]��Ȫ�sg��
�� &��d�9; �����|�=��J,<$��2�И�yA�-,ǃ�C��:�k
-���"����
�]�p���t�Ÿ;�
-V��`��lR��dZAr����&���ʗ�@�� �
���x�]�/<P������5�Jj栠0� �m�>��ˌ���
-�6�{�Ű'i{�(���^��s�`�F�
�[� �V ^�V-�&^�Z��i�C��L�!5 �8������Ls��R�!��Y��L+t#%5
N� p�K2~7����&� ���bҊs�C�Ne���<�'���W`�u ����P�h�@��p��?�Q�
��6�,�?��g*˪�0v �m���H^��B�V6�f \/�L�7�I2���>�Z��r[�ø��h��c���ȧ�/�B;�� <Ҝ����MZ�2��Gr���W���n�Dci�.�������a\���w2�pV �4^X.x�k�?�YI��*�_�]����3�f n�-���3&�x�-���9?�,���� ��y�����h��e�7�����?�
-����B
���p�� �7� ��D��#���`���L/���
-4o� R�)�ĵBi� �J��[�%��р��n�����w>&{.���3�p� '/<�II��3�� ��ا�G���2^ Nx �s�d���������2n8
-D �Ȳ��R���gY�G�k�+)(�n�ݪt�m��H�,\Ͻ���W��#9: .�k/�w�2I��$/ oվ��AyK���$'�0Μ+ͺlf]�|�`��Hs��,<�*-�ĵBk.�7�q)�҅��V�uv��� ������qW�X-;���ILJ<�x� � dZ�"� ��z��
-��Vx��������q�07�_�
�� ;p����@���g((�nПQ�y`^Q*��{D��2�Z�AdUw�7k��<�w��� ͌؛�U�n� &��d�m�"�*fΆ.�ټ�<��B+: �Cb��� 1��~_��F�t6�����Xp��|�pׂu�&���O1Nx�\+���
-l��V���ܷ/��x�]L)x�]G�V�v���b� ���M?�v�a����}���F'��~[Ll,�S�౾���M|��L{U�[�U��'� ����V7�hU�����!��b�!�|���R��&���Y�1��h�<����l[j�۸VX ��V� �BM+���8!�1LJ>��h����
-/3^����B.i��'��{�7��3xt� ���;���"B˲ 0dY3_�Y֏?��� ��AAat��^��97d.|�#�&����3�H/���ݫ���f𑼏� '��4Ro��G�f�-�rHZ>�rH�yg��^Pg![�,4d�y�^�̪�6�"����k��݁\������N�^���ðN|���i� �.�:��K��\*�
-�/�8ar�;&^(|�}�/}��o#0g��#
Ȳ��,kH��J��h�|%���{^�d .���d�Eu�3�*� Z����^�Um�v$1^��0'�R~�ޒ����� Ҁ.yH��VxDh��
��
-3[sᴉi��<�o�A��+DE-�t�E��/Ĥ�m"�D�f�
-O`R�S��ls�`��� ��JNx �2^���̨� �����j�������*j z�3�F���y� �[A������.۫�^�j�C�a�`�
-'�
���,?�o�}�ق��-p�P�J�ݩ���wL ҃�b��~=yH��k�׳M m����'�
-�z&���h�p6���h�@�f9WX�"��,� �o�»�'�w���
-�P��o���3<{��8 ٩�"D�5̘eMy��M�ꫯ�
�+)(� ����7�W.���j>c������`�ah��
-^h�/{�}��w����q�- �<;coA�����wj��7 �>�L+<���g�6��=����P��ʵB|"�� q�O�������Ĵ�U�9�����u�˺d��&ㅷ
ZA�8'_Ѿ"���U�ᡚo0{͟�����Ôe=`�e����P�6\�6�w���h�=���
-
-�=����˗��6�eaph��w�gX�#:�f �;�<{�}O�3p�m�q�-��P�o"��VC>u���l�]��F�`�Y�.: |��ʹ¦rDl�EAo jۚ�V�����q����^*�
-g�\��i�y�.r�� ��]�;�'�/���/n�Z|�s���_cF�pi���;|���sX-���g�nP{Y~{ПA�1���!"i)�k���T��u<㲽��[�͢�y�괬�!����T�����[� �ͻlƝH��z���^��YX+�^ԛ{Hz_��^{�룻����M�
-~Q� �<� �V��u^ �`�� l�V��g�'��2�@�Q���.��煫�O% �+>Ń�_������x���<�J��a�e��e]vU�n��J*˪���A��~[`���%ËrG��g~�A�0�iݶ�ZV��0w�|pj��0���[={p��:�^mCoAϧn(Ӻl�"�Ԗo���;�d�n��T���uL+�Z�
-^~sp�w<��V���B�)���
-V)������U��8�.�i� M:�"�W��?���cL����{��k�<|�u�Ȳf�ϥu�����7ߨ��
-
-��hưk�.��7/ ^�"��{ f �ZS��({G�K^Xg�S�a�yK���%ƹ{M��!9��lN��=y���� ̠ R�J� fZa:i�
3[���COb�kP�ێ��$%%�9
-Srqw�VX'�`�pVIgaE{�R�f�@�REW���
���L#�P,y�Ax᪙�t�G����1��k�b�`�Y�F~S�|%�eUP�m@���Vtt4|����[��Pm��b�<��042I��;{��#�
�
�[��̹̺l�!� R{�� �t�� $�+ȃ
-�]��
�P�ނ��z�xa�[ �_P�
-4�(�}\+<�8�9�4��6�?�]�2��GS$'��_"y�����J>��W�gY�
�e��ڊ����SRYV�;�_��s� ,e���ٳ��Z�W��6�à�a�wۈ� ��w-~����
-�4���r���:㭅
�__j��#rH3����CzH�\�V >��E^[=�
-K�%��/�������\�� ��ks� w]��Q ��5��#�{� J�7,7X�J�`Z#β:�,�oB=�����
-
-wr�L�ۂb�a_����x��ˀ; Z&���9U� ��,>�-�yK�Do�f � � ���̴��y���[�R+T-�Z�2H.�+��U��
m��X�چz��~ϥ�k�X/=�dʤ>���}N� ���-�5������͙���'��� �v����>���Ȳα̲ 4ϲ>^���~���(˪�AA��C����,����g��|�WU����0p�`�/0.xT|��G;Loi_�6s�m�9̧��Nmy�i��<$��MZ����%���ޠe�� +�,>W�I<%x�r��R.
-���
-ڮT�<�$f E�' ���]'70~����A���۴eY� YրM�a��KX-�F�֓z��4������Ew�h�@���.g?��{�hެ�U�n[��U���x���=j���q�-�7e��,g��!m1yH��'��H�7�:
"��Zㅇ���U �)�ݥ(��@}���}1�} &�m��%�5N��qּRۗj�%�
-�4YfR��<A���A�j� ��
#Ȳn�F�5��+{��A�eUP����6~�m�����x��f �3��<ˬ*�a�n��{No=�S�#熉�-1^pߧ�و\I/�lA�8W�rH=� �ż�:��H�#(�J���գ���ݝHHH���HL
�Ƥ�~���ԋ���%�V0�GS�<�^� ���8/ �
#�2���1��eȲ�$��� ��~ �K��� �YV�
-
-�r� ��p�_�y�}_����ط�m�q��.�����[�ZA�\�l�y����o��: -��$�,��� �����S��͝h�j�Z��� 6N1��u��;�$ʥR�I>k��ZA�G��f��Y��
->�Ȍ��$7 ̲�0�,kه�
-i� /����PYV��Ⅸ�(G,�Gy�x��V�{U/�; � �0w�p����8�/x�o�=$W9[���-���B�C�i�,�; �k����Wp�X���t�aZ��k'�PX{e�:rlN�&���#Q�kqoǸ�"_p��4����� J�7,7���a�,+� �̲� ���P߳W�eUP�M�3���E@�r��i�����y�aO��z� �y��f� m/� ��[ �pzA�
-�i7�1�Zj��); �C�)��l/�Bo9����wiw��7 ��E�jn�� �$?��`���6k�{�]����|�_c�P��
-�0�>�Ina�u�Y�֟1%�<|�T�UA�6����O>���h��,�K_{O��(��nz�L���} � f�0�%���q��k�J���; =����B �
-kEg�^�,<��� �W�� q�M��hDGw7��3� �IL+����L��\j��N�#��`K�.�^5ە�����)�
���v3����n�W2˲~�Yƽ�;ɲ��z��?��i�,�/����g((�"��Y���D�$�K�FҞ7��!�@�{�?�؟g�/H}0$7L,oi��yH�L/8m��
-FIv w���B1ܶVûoʶv��� m]�p���4�Ÿ;h5&��M�i� g�V�n6�V������lܕ�k� ��W� � 7��,��n�m9��J�e%����ps���ȣ�~[pL8<Vg����4c ^0� L3�a0����ya�yKfΖ�/�V�Q��,�nu=�t��PC� �\��²�k��ل��n���#p!�SqwX ߃ĵ��'5�����
-��o��\�qB�U�>�`��Oᅏ��>�u��ȲN$�b�e
�Y�5?�6�8�V��;�4�����n �233� ^%��{@ۅDy{�C��W���6���]� Ʃ�d�<t^0�Ou1�ɓ �`��FSg�� u��q
-��Fgm�:�\=}`e ۹հbZ�v�Ym��r�i�$M+o��k��@3ℏL�PF�'��
� ˚�2< YV�+)(�8��� .�����p�Z�g���� f mG�>c� ҙ����(� �@�79[�9���xHrw�Q+ȽL/h}��2��u-r�נ��L+,�d�4X�kZ�Zj�T�
-b��}�t�9O�Ͼ�eR�,Aㅏ���� �oPn��3�e]�eYg�0�:��#X�[�gY��(nPP�AП���{�a�MO�3{�������,�m�� ��{��� 7�
���Ɔ�tx��C2�d>���3h�o6xH3�����,�; �� ��p` R�c=�۸V�\ ��]#0)�����泌�� �u��+�n� �]|��q�'�
� :7�I_i�,�#��É����3l�u&ϲ�`�9��3�?���j栠p����� ��l� ���+wo=7j>ұ��� /�k�k��m���9;��۴|�#��
-�[��Z���]+��۶J���!��-� ��χ�����_���c�h�L{�/��
-\+�8��>0h�wT�)�G�� 7��,k��Yֿ`J�����믿�yV5sPP�>��3�o �~۪T��_����5��[�ǴL���6 '�1o���a-�Q>0�j�
-F��\+ vgA�+�u�j~íbW �z��~<���Up%� ��#� ֩4Wx�4W�\j�kL+�n��
-����
- ���}��}z��0J��GfY o�[o��gYUGZAa� ��{�n̛7����� |�`�I2�z>�j6w�?� ��:o7�!o�H��3g9[0��t4̛M{/LZA��@Za]߃D�����[��цʪ*�,��>)�;���'4NX�$��c���B�˚V���\�q�=B'�x�S� �q^�&7�d�p;|%C������ڃu�O� � TGZAad��U�Ga~f��ϵ�NҼ��vx��1�������7�xaD�0n�%MWy 8[��� Lkm���*8
s��8o~�!]� ��봡 +6�E5�6w"!i �U`�b��n���DžVx֤h߅�dWA�G�7�� y��
�]��R��OZ���[ϲRgGAAaxЌ������`��8��+`z� Č�,���A�I2��0� �� n���g ��2���t��r��f�!i�}���F��FnhEm{3*++��7�뿂� �
���]A �i��
�ћ��lW`�_�p��'�|����p'g�5��+���e��z���eU3��!w%����+j�jV�w����-f ��y�
�`�������/xR��{H
|-��l��C�2͛-�,P_�^j��c�ס�W�+$&/�kp ��+���]� �O�&�<l�/�&St�r�0i�B�?�"9�Ԃ* ��pӾ�o�e�?X�uÿ0��#X�_���g�T�UAax�L���㑼8x X#z u�����yǴn�#��м�? �%�- 6u����}�=y�Eis�>o��)�1o�e1oֵ��Z�ݴEס���VU��g ~��o������
-^x
-6�K�zv���.OەjW�����=�Geo��e�x�sܷ���at�J7�e��gYk;wsnPYV��Az�~n:w� ��<�� w������{�;'�i �Ue��a8� zK� �^p�ר�O� Ҏ� R���d�7�\����B-��+���5�;��ى����97��%�����L+,�Z�Y�/Վv q��m�?"N�\tUh��4���w�������U�"_�6eY��Y֧� _���
-
-À��o CPJ ��϶�Nz h�n��,u��<�^�4f�Dߙ��g�n
?�joɐO��<4�� u�e�Mߩݯ͛u� ; �; R+l�� TH-���Q�ъ������ �$ܵ�6I��6� l��Ⱦ�5��}�q����D��R�t^�|�9'�2h�[�
w.˪��I����_��ш7�|SeY��1 pi�2���y����v�c�I�dEVU� ]7�� �ƨ�D��" ��}a�e�B ����;Լ9CۃĴ������ww�:��V�OL�C@4��/�U�>���&E�B�s|�`��L���?"N��� ����9s�Yֆ�fY��UX/Z���� 7((h ^�?����wU|(�)�1 �a ^�za0^�U�a4yK�la
�L�=�g�rO�.m�6����f�7w�wļY��w��g�*�l�@C�:�56��g.���I�:`�x�)O
-^Z!�>W�f=�*v����x�>g��J�7(7|~g��W��,� ��6���si�IAa��x��oN \�������WUf�DV���>�|'�=6/�J~���%� �3g�O%^�o-�� g˽�M6�Yд�#B+�K������&�w���
-�Ip ��]~E��K˥/�V�s� 1k. ��=í��L٣
- N���/t糬��Ȳ��,�|/�̲���j�0�!gϋ�^�J���U��$��w� {U�; �'I� / � glj�t\�8'z zi�a��f�e��,���d�ْ��
-�I+T�tK'�֡����� [���&鄦R���Z�&�Um� g�|� �G�?�Zn� }�x�ˁ�P��Jw"��x�,� ϲ~̳��=� �*���UYV�
�H?S�m��8xws����4^0�0��y�jsg� ~��?�}S��?�%����l��ޞ� �T�q��v �0t6��q��&[��7 I�+P~�����ע�k-ڻ;��DZ!�~��Z�1���l�q�q���
6]+h�R�pN�ZAp�� �W��8�Jr×��Fo���gY���;Qӱ�{J2˪���D�ܭJ��yqQ�mȆ/�/�
�N =�*; �Z�A���B��
�w�~~�S��q'f �ւ�qO ��״�#�
-��&[��̵�\�MU(�օ��6�56��w�z.���0�@s�sL+0NHgZa� �mμ7Ů �
-��L�=<���E��K� _�~� �
�
73s�YօCeYӟ�ϲz|��W|�@6�vP�h�wz����� ����-ڌao��Q&i���Ц�� � �Kn�y~�͵�k��z�� 2�*:�f9$�Y�+�}�Ȧ�y���}�.���}5�6����i�.,�O�k@$��ɇU��.?
���|߅MƳ�V��]��]+|,�c��9�����f�� *o�W�Qn��|%�
�e�t�,k�{�ф7�x�k����o*��0�@���6 o���{�Y�d<�k^���#bO��)�/^`�<q����?�ق��! �@�� �{� ݷ���[,�,��B6fм�!�g���V�`Z÷�e�{��C�������6 ��&��
-�a;[ℕ/�
-�
-�]�ٛ�9��c�V�����'H^����+��,��5���P�u=Z��q����?����+W���8xo���%�|L��~>����ah6u(�*����x�{~���P�@�p��[�z��A+� �m���VK�P��5pc�/~[ r�����ʹB ��a痃I�ۙV8õ�M:�
-+��m��5���]�)f���
-��������em�v�Ձ��I�������VYV���[��� �ˢ�6~읤y�A�z^k�0�1� <�}����h��kk���L/�pI߫��ک�A������{/��F�0��2H��dZ�vi���ESo;������<�`����)إ]�-}+��m��|_�d� �]�&�� �4�<�T=w$8�Z|���H�a�eY�n ˚�*ܗ��h�Jj �0�!g QQQX�������[ ��u�<
w|N�|$�zL�0$7t�no�2�� �x�p@۟�*���Z�_�Y(wL�f�!1� ����$noE^�t�v#33��� �� ���9�Ϛ/d���yo^x��_�Y�R� Q���S �i��oLߵ�C�̲�6fY�;|���cX-h�ŋyV�|%�ي �3d��3� sJ����4[��0跞��`ȩj� �۫ n_nI�-x�Y$� �
����.�� �ދ C���!i}�r~��iS9V�Z�� ��?�q����6is���a �-��&�@�f�1^(��t|��=�
���� 읿�
�������w�ҸȲ��ᆲ�
�eݍ��m��}�����
-�o[�d �V.����%��>l�A��C��Ɛ����:�]������a���,8n��:egA�7p��i��B~_�cO-"�4!����=(((�Wp~)����T�
-6�O�Z�6�
�O�?���?��s��d����t�8��Ax�[�+M�,�~�e]�eYi/+eY�#M �������v �� �o�b�t�w��� y'�L�~��w�:��9���'{�ﺸa���� 'L ��a�ྯ��e�ny�SxH�ys����e�(�T�g��ݝ��8L�����FX' � ���h�+pNд�d�֎i��� S'�W%����}; 7�F_i�eY�W*������Z��zn ^�u�h�z
-�
r�jLL �$�ñ6�gQ��f��4�a��
zA���1qÓwV;ܔ�$y�e���!�.��7o1̛
͘�V�� ���d�+r�lhAkO'�
-��
-�L� �E�
-<�ĴB� �ۼ71�z�E��v>����H��Ն�f�AeY�,k�PY��>�� �?���~�I� � h�@�6��s�[���V�.$3^�3� �<��{��� �
��[�[C�G�>�a��n�!�
-�R�7o,�: ]���73^�ZaC߱G�"og'�wp��8Ӽ��V�cZ�(�
-tsG�+�Ys��"D��G��l�I�rp�h� _����+M�,k1� >��,�Zʲ>����@��f
-�r�6�ۼ�|�� ~{� ��@�� ��b� ; �|������z�
���(�'�3�c���c�m��BofwY̛����`�7j�ZnjESW����;' ��g��~ج�s���Vx����Z��]�?*�.ʅĵ�q��
����o�� ���T;��,���J�Y��<���dY_�{\�sE]�d���0 `�9$��e} ���n�0x�; r�@ﰘ;�c�p���W�Q�-��a��yD��di��Bg��{�yH3[��Vh�>uK jz� Rbr
-&�D�wA5��?�o��lj�3����C[�*��^��� ��a�X��
r�ʲ�|��X-h�3�<�;p��U�J
-c r����?���6��ޡ7�{I�> �nz�^��w$/����87��a�zK�/�H�C>��!
�Y� y�r0�9���������֢� ��[PUUW���Ᶎ�ћ`�|ڔA���
-v��fؕ�i�?�J�j#'H^�^��
�
��WZ5|�Q�e�ك܆��SR i��� ����X���;�텐]_�ֳ�$
<TRUNCATED>
[2/5] git commit: ISIS-406, ISIS-416, ISIS-417: updating poms;
'select all' checkbox; disable concurrency checking;
make spinning-icon configurable; remove defunct code
Posted by da...@apache.org.
ISIS-406, ISIS-416, ISIS-417: updating poms; 'select all' checkbox; disable concurrency checking; make spinning-icon configurable; remove defunct code
* updating poms to latest snapshot;
* select all on standalone tables in wicket viewer
* moved spinning-icon.gif (for veil) out into WEB-INF dir, so pluggable
* fixed some concurrency issues.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9644f925
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9644f925
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9644f925
Branch: refs/heads/master
Commit: 9644f9255f9bcbf143fe113986b70bebfd0f501a
Parents: a4fabe6
Author: Dan Haywood <da...@apache.org>
Authored: Fri May 31 14:15:08 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Fri May 31 14:15:08 2013 +0100
----------------------------------------------------------------------
component/objectstore/nosql/pom.xml | 2 +-
component/objectstore/sql/pom.xml | 2 +-
component/objectstore/xml/pom.xml | 2 +-
component/profilestore/xml/pom.xml | 2 +-
component/progmodel/groovy/pom.xml | 2 +-
component/viewer/bdd/pom.xml | 4 +-
component/viewer/bdd/tck/pom.xml | 2 +-
component/viewer/dnd/pom.xml | 2 +-
component/viewer/dnd/tck/pom.xml | 2 +-
component/viewer/scimpi/pom.xml | 2 +-
component/viewer/scimpi/tck/pom.xml | 4 +-
.../viewer/wicket/model/models/ActionModel.java | 23 +--
.../wicket/model/models/EntityCollectionModel.java | 21 --
.../wicket/ui/components/actions/ActionPanel.java | 7 -
.../actions/ActionParametersFormPanel.html | 2 +-
.../ui/components/actions/spinning-icon-blue.gif | Bin 2693 -> 0 bytes
.../ajaxtable/BulkActionsLinkFactory.java | 3 +-
.../CollectionContentsAsAjaxTablePanel.java | 14 --
.../ajaxtable/MyAjaxFallbackDefaultDataTable.java | 2 +-
.../ajaxtable/MyAjaxFallbackHeadersToolbar.java | 73 ++++++
.../ajaxtable/MyHeadersToolbar.html | 29 +++
.../ajaxtable/MyHeadersToolbar.java | 183 +++++++++++++++
.../columns/ObjectAdapterSelectColumn.java | 57 -----
.../columns/ObjectAdapterToggleboxColumn.java | 39 +++-
.../CollectionContentsAsIconsPanelFactory.java | 4 -
.../entity/properties/EntityPropertiesPanel.html | 2 +-
.../widgets/checkbox/ContainedToggleboxPanel.java | 14 +-
example/application/claims/dom/pom.xml | 2 +-
example/application/claims/pom.xml | 6 +-
.../ide/eclipse/launch/claims-viewer-dnd.launch | 2 -
.../ide/eclipse/launch/claims-viewer-scimpi.launch | 2 -
.../ide/eclipse/launch/claims-viewer-wicket.launch | 2 -
example/application/claims/viewer-wicket/pom.xml | 1 -
.../application/quickstart_dnd_junit_bdd/pom.xml | 5 +-
.../tests-junit/isis.properties | 29 ---
.../quickstart_dnd_junit_bdd/tests-junit/pom.xml | 82 -------
.../src/test/java/junit/AbstractTest.java | 101 --------
.../java/junit/todo/ToDoItemRepositoryTest.java | 57 -----
.../src/test/java/junit/todo/ToDoItemTest.java | 66 ------
.../quickstart_dnd_junit_bdd-viewer-dnd.launch | 2 -
.../application/quickstart_scimpi_nosql/pom.xml | 4 +-
.../eclipse/launch/quickstart-viewer-scimpi.launch | 2 +-
.../dom/src/main/java/dom/todo/ToDoItem.java | 8 +-
.../quickstart_wicket_restful_jdo/pom.xml | 2 +-
.../src/main/java/app/QuickStartApplication.java | 52 +++--
.../src/main/webapp/images/spinning-icon.gif | Bin 0 -> 5266 bytes
example/domain-service/email-service/pom.xml | 2 +-
example/misc/metamodel/namefile/pom.xml | 2 +-
tool/maven-plugin/pom.xml | 2 +-
49 files changed, 401 insertions(+), 529 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/objectstore/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/pom.xml b/component/objectstore/nosql/pom.xml
index 8ad54e8..fe28304 100644
--- a/component/objectstore/nosql/pom.xml
+++ b/component/objectstore/nosql/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/objectstore/sql/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/pom.xml b/component/objectstore/sql/pom.xml
index 1929c6e..2240e6c 100644
--- a/component/objectstore/sql/pom.xml
+++ b/component/objectstore/sql/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/objectstore/xml/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/pom.xml b/component/objectstore/xml/pom.xml
index b9f9f16..0e608b2 100644
--- a/component/objectstore/xml/pom.xml
+++ b/component/objectstore/xml/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/profilestore/xml/pom.xml
----------------------------------------------------------------------
diff --git a/component/profilestore/xml/pom.xml b/component/profilestore/xml/pom.xml
index b8cbf2f..74dca29 100644
--- a/component/profilestore/xml/pom.xml
+++ b/component/profilestore/xml/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/progmodel/groovy/pom.xml
----------------------------------------------------------------------
diff --git a/component/progmodel/groovy/pom.xml b/component/progmodel/groovy/pom.xml
index 59f3522..3105d45 100644
--- a/component/progmodel/groovy/pom.xml
+++ b/component/progmodel/groovy/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/bdd/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/pom.xml b/component/viewer/bdd/pom.xml
index fcb600e..d8b31fb 100644
--- a/component/viewer/bdd/pom.xml
+++ b/component/viewer/bdd/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -43,7 +43,7 @@
<docbkxGuideSubTitle>Acceptance Testing using BDD Frameworks</docbkxGuideSubTitle>
<docbkxGuideName>isis-bdd-integration</docbkxGuideName>
- <isis-security-file.version>1.0.1-SNAPSHOT</isis-security-file.version>
+ <isis-security-file.version>1.0.2-SNAPSHOT</isis-security-file.version>
</properties>
<!-- used in Site generation for relative references. -->
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/bdd/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/tck/pom.xml b/component/viewer/bdd/tck/pom.xml
index bf2646e..46793e3 100644
--- a/component/viewer/bdd/tck/pom.xml
+++ b/component/viewer/bdd/tck/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/dnd/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/pom.xml b/component/viewer/dnd/pom.xml
index 7ae116a..d2a5437 100644
--- a/component/viewer/dnd/pom.xml
+++ b/component/viewer/dnd/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/dnd/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/tck/pom.xml b/component/viewer/dnd/tck/pom.xml
index bea5fc5..d5d9480 100644
--- a/component/viewer/dnd/tck/pom.xml
+++ b/component/viewer/dnd/tck/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/scimpi/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/pom.xml b/component/viewer/scimpi/pom.xml
index ccea900..a4f1dc9 100644
--- a/component/viewer/scimpi/pom.xml
+++ b/component/viewer/scimpi/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/scimpi/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/tck/pom.xml b/component/viewer/scimpi/tck/pom.xml
index 737f319..4031b9c 100644
--- a/component/viewer/scimpi/tck/pom.xml
+++ b/component/viewer/scimpi/tck/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
@@ -35,7 +35,7 @@
<isis-viewer-scimpi.version>1.0.0-SNAPSHOT</isis-viewer-scimpi.version>
<isis-objectstore-xml.version>1.0.0-SNAPSHOT</isis-objectstore-xml.version>
<isis-profilestore-xml.version>1.0.0-SNAPSHOT</isis-profilestore-xml.version>
- <isis-security-file.version>1.0.1-SNAPSHOT</isis-security-file.version>
+ <isis-security-file.version>1.0.2-SNAPSHOT</isis-security-file.version>
<siteBaseDir>..</siteBaseDir>
<relativeUrl>scimpi-tck/</relativeUrl>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index 1492fee..8983e3f 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -87,11 +87,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
/**
* Redirect to <tt>EntityPage</tt>.
*/
- REDIRECT,
- /**
- * Select, ie call the provided {@link SelectionHandler}.
- */
- SELECT
+ REDIRECT
}
@@ -287,7 +283,6 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
private Mode actionMode;
private final SingleResultsMode singleResultsMode;
- private SelectionHandler selectionHandler;
private NoResultsHandler noResultsHandler;
/**
@@ -499,22 +494,6 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
return arguments;
}
- /**
- * The {@link SelectionHandler}, if any.
- *
- * <p>
- * If specified, then
- * {@link EntityCollectionModel#setSelectionHandler(SelectionHandler)
- * propogated} if the results is a {@link EntityCollectionModel collection},
- * or used directly if the results is an {@link EntityModel}.
- */
- public SelectionHandler getSelectionHandler() {
- return selectionHandler;
- }
-
- public void setSelectionHandler(final SelectionHandler selectionHandler) {
- this.selectionHandler = selectionHandler;
- }
/**
* The {@link NoResultsHandler}, if any,
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index 59dc791..3d7b880 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -182,8 +182,6 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
*/
private CollectionMemento collectionMemento;
- private SelectionHandler selectionHandler;
-
private final int pageSize;
/**
@@ -275,25 +273,6 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
return collectionMemento;
}
- /**
- * The {@link SelectionHandler}, if any.
- *
- * <p>
- * If specified, then view {@link Component}s are expected to render the
- * collection so that one of the entities can be selected.
- */
- public SelectionHandler getSelectionHandler() {
- return selectionHandler;
- }
-
- public void setSelectionHandler(final SelectionHandler selectionHandler) {
- this.selectionHandler = selectionHandler;
- }
-
- public boolean hasSelectionHandler() {
- return getSelectionHandler() != null;
- }
-
@SuppressWarnings("unchecked")
public static Iterable<Object> asIterable(final ObjectAdapter resultAdapter) {
return (Iterable<Object>) resultAdapter.getObject();
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
index d3db6bd..ea6dc0e 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
@@ -332,9 +332,6 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements ActionExe
// panel.setRedirect(true); // no longer required, http://mail-archives.apache.org/mod_mbox/wicket-users/201103.mbox/%3CAANLkTin3NmEBaMY9CF8diXA+wTMamQPc2O+tWvG_HCiW@mail.gmail.com%3E
panel.setResponsePage(entityPage);
- } else if (singleResultsMode == ActionModel.SingleResultsMode.SELECT) {
- panel.hideAll();
- actionModel.getSelectionHandler().onSelected(panel, actualAdapter);
} else if (singleResultsMode == ActionModel.SingleResultsMode.INLINE) {
final ComponentType componentType = ComponentType.ENTITY;
panel.hideAllBut(componentType);
@@ -362,10 +359,6 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements ActionExe
private void addOrReplaceCollectionResultsPanel(final ActionPanel panel, final ObjectAdapter resultAdapter) {
final EntityCollectionModel collectionModel = EntityCollectionModel.createStandalone(resultAdapter);
- final SelectionHandler selectionHandler = panel.getModel().getSelectionHandler();
- if (selectionHandler != null) {
- collectionModel.setSelectionHandler(selectionHandler);
- }
final ComponentFactoryRegistry componentFactoryRegistry = panel.getComponentFactoryRegistry();
componentFactoryRegistry.addOrReplaceComponent(panel, ComponentType.COLLECTION_CONTENTS, collectionModel);
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
index 5684190..89032c6 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
@@ -33,7 +33,7 @@
<div id="veil">
<div class="imgHolder">
<wicket:link>
- <img src="./spinning-icon.gif"/>
+ <img src="/images/spinning-icon.gif"/>
</wicket:link>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/spinning-icon-blue.gif
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/spinning-icon-blue.gif b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/spinning-icon-blue.gif
deleted file mode 100644
index 0e2b686..0000000
Binary files a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/spinning-icon-blue.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java
index f519a1a..53aafb5 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/BulkActionsLinkFactory.java
@@ -62,7 +62,8 @@ final class BulkActionsLinkFactory implements CssMenuLinkFactory {
final ObjectAction objectAction = actionMemento.getAction();
for(ObjectAdapterMemento entityAdapterMemento: model.getToggleMementosList()) {
- final ObjectAdapter entityAdapter = entityAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK);
+ // REVIEW: have disabled concurrency checking here...
+ final ObjectAdapter entityAdapter = entityAdapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK);
int numParameters = objectAction.getParameterCount();
if(objectAction.isContributed()) {
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index 88091e9..ac66e1b 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -53,7 +53,6 @@ import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ColumnAbstract;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterPropertyColumn;
-import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterSelectColumn;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterTitleColumn;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterToggleboxColumn;
import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuBuilder;
@@ -92,7 +91,6 @@ public class CollectionContentsAsAjaxTablePanel extends PanelAbstract<EntityColl
addToggleboxColumnIfRequired(columns, bulkActions);
addTitleColumn(columns, model.getParentObjectAdapterMemento());
addPropertyColumnsIfRequired(columns);
- addSelectedButtonIfRequired(columns);
final SortableDataProvider<ObjectAdapter,String> dataProvider = new CollectionContentsSortableDataProvider(model);
dataTable = new MyAjaxFallbackDefaultDataTable<ObjectAdapter,String>(ID_TABLE, columns, dataProvider, model.getPageSize());
@@ -192,9 +190,6 @@ public class CollectionContentsAsAjaxTablePanel extends PanelAbstract<EntityColl
private void addPropertyColumnsIfRequired(final List<IColumn<ObjectAdapter,String>> columns) {
final ObjectSpecification typeOfSpec = getModel().getTypeOfSpecification();
- if (getModel().hasSelectionHandler()) {
- return;
- }
final ObjectSpecification parentSpecIfAny =
getModel().isParented()
@@ -235,15 +230,6 @@ public class CollectionContentsAsAjaxTablePanel extends PanelAbstract<EntityColl
};
}
- private void addSelectedButtonIfRequired(final List<IColumn<ObjectAdapter,String>> columns) {
- if (!getModel().hasSelectionHandler()) {
- return;
- }
- final SelectionHandler handler = getModel().getSelectionHandler();
-
- columns.add(new ObjectAdapterSelectColumn(Model.of(""), handler));
- }
-
private ObjectAdapterPropertyColumn createObjectAdapterPropertyColumn(final ObjectAssociation property) {
return new ObjectAdapterPropertyColumn(Model.of(property.getName()), property.getId(), property.getId());
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyAjaxFallbackDefaultDataTable.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyAjaxFallbackDefaultDataTable.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyAjaxFallbackDefaultDataTable.java
index 9a3b92d..dd11ffe 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyAjaxFallbackDefaultDataTable.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyAjaxFallbackDefaultDataTable.java
@@ -40,7 +40,7 @@ public class MyAjaxFallbackDefaultDataTable<T, S> extends DataTable<T, S>
super(id, columns, dataProvider, rowsPerPage);
setOutputMarkupId(true);
setVersioned(false);
- addTopToolbar(new AjaxFallbackHeadersToolbar<S>(this, dataProvider));
+ addTopToolbar(new MyAjaxFallbackHeadersToolbar<S>(this, dataProvider));
addBottomToolbar(new AjaxNavigationToolbar(this));
addBottomToolbar(new NoRecordsToolbar(this));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyAjaxFallbackHeadersToolbar.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyAjaxFallbackHeadersToolbar.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyAjaxFallbackHeadersToolbar.java
new file mode 100644
index 0000000..e14c496
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyAjaxFallbackHeadersToolbar.java
@@ -0,0 +1,73 @@
+/**
+ * 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.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.IAjaxCallListener;
+import org.apache.wicket.extensions.ajax.markup.html.repeater.data.sort.AjaxFallbackOrderByBorder;
+import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackHeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+
+
+/**
+ * Adapted from Wicket's own {@link AjaxFallbackHeadersToolbar}.
+ */
+public class MyAjaxFallbackHeadersToolbar<S> extends MyHeadersToolbar<S>
+{
+ private static final long serialVersionUID = 1L;
+
+ public MyAjaxFallbackHeadersToolbar(final DataTable<?, S> table, final ISortStateLocator<S> stateLocator)
+ {
+ super(table, stateLocator);
+ table.setOutputMarkupId(true);
+ }
+
+ @Override
+ protected WebMarkupContainer newSortableHeader(final String borderId, final S property,
+ final ISortStateLocator<S> locator)
+ {
+ return new AjaxFallbackOrderByBorder<S>(borderId, property, locator, getAjaxCallListener())
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onAjaxClick(final AjaxRequestTarget target)
+ {
+ target.add(getTable());
+ }
+
+ @Override
+ protected void onSortChanged()
+ {
+ super.onSortChanged();
+ getTable().setCurrentPage(0);
+ }
+ };
+ }
+
+ /**
+ * Returns a decorator that will be used to decorate ajax links used in sortable headers
+ *
+ * @return decorator or null for none
+ */
+ protected IAjaxCallListener getAjaxCallListener()
+ {
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyHeadersToolbar.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyHeadersToolbar.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyHeadersToolbar.html
new file mode 100644
index 0000000..1a744eb
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyHeadersToolbar.html
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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 xmlns:wicket="http://wicket.apache.org">
+ <tr class="headers">
+ <wicket:container wicket:id="headers">
+ <th wicket:id="header">
+ <!--
+ input type="checkbox" xxxwicket:id="checkbox"/>
+ -->
+ <span wicket:id="label">[header-label]</span>
+ </th>
+ </wicket:container>
+ </tr>
+</wicket:panel>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyHeadersToolbar.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyHeadersToolbar.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyHeadersToolbar.java
new file mode 100644
index 0000000..40885e7
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/MyHeadersToolbar.java
@@ -0,0 +1,183 @@
+/**
+ * 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.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator;
+import org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByBorder;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IStyledColumn;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.RefreshingView;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.string.Strings;
+
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterTitleColumn;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterToggleboxColumn;
+
+
+/**
+ * Adapted from Wicket's own {@link HeadersToolbar}.
+ */
+public class MyHeadersToolbar<S> extends AbstractToolbar
+{
+ private static final long serialVersionUID = 1L;
+
+ static abstract class CssAttributeBehavior extends Behavior
+ {
+ private static final long serialVersionUID = 1L;
+
+ protected abstract String getCssClass();
+
+ /**
+ * @see Behavior#onComponentTag(Component, ComponentTag)
+ */
+ @Override
+ public void onComponentTag(final Component component, final ComponentTag tag)
+ {
+ String className = getCssClass();
+ if (!Strings.isEmpty(className))
+ {
+ tag.append("class", className, " ");
+ }
+ }
+ }
+
+ /**
+ * Constructor
+ *
+ * @param <T>
+ * the column data type
+ * @param table
+ * data table this toolbar will be attached to
+ * @param stateLocator
+ * locator for the ISortState implementation used by sortable headers
+ */
+ public <T> MyHeadersToolbar(final DataTable<T, S> table, final ISortStateLocator<S> stateLocator)
+ {
+ super(table);
+
+ RefreshingView<IColumn<T, S>> headers = new RefreshingView<IColumn<T, S>>("headers")
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected Iterator<IModel<IColumn<T, S>>> getItemModels()
+ {
+ List<IModel<IColumn<T, S>>> columnsModels = new LinkedList<IModel<IColumn<T, S>>>();
+
+ for (IColumn<T, S> column : table.getColumns())
+ {
+ columnsModels.add(Model.of(column));
+ }
+
+ return columnsModels.iterator();
+ }
+
+ @Override
+ protected void populateItem(Item<IColumn<T, S>> item)
+ {
+ final IColumn<T, S> column = item.getModelObject();
+
+ WebMarkupContainer header = null;
+
+ if (column.isSortable())
+ {
+ header = newSortableHeader("header", column.getSortProperty(), stateLocator);
+ }
+ else
+ {
+ header = new WebMarkupContainer("header");
+ }
+
+ if (column instanceof IStyledColumn)
+ {
+ CssAttributeBehavior cssAttributeBehavior = new CssAttributeBehavior()
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected String getCssClass()
+ {
+ return ((IStyledColumn<?, S>)column).getCssClass();
+ }
+ };
+
+ header.add(cssAttributeBehavior);
+ }
+
+ item.add(header);
+ item.setRenderBodyOnly(true);
+
+ Component label;
+ //Component checkBox;
+ //if(column instanceof ObjectAdapterToggleboxColumn) {
+ label = new Label("label");
+ // checkBox = column.getHeader("checkbox");
+ // label.setVisible(false);
+ //} else {
+ label = column.getHeader("label");
+ // checkBox = new CheckBox("checkbox");
+ // checkBox.setVisible(false);
+ // }
+ header.add(label);
+ //header.add(checkBox);
+ }
+ };
+ add(headers);
+ }
+
+ /**
+ * Factory method for sortable header components. A sortable header component must have id of
+ * <code>headerId</code> and conform to markup specified in <code>HeadersToolbar.html</code>
+ *
+ * @param headerId
+ * header component id
+ * @param property
+ * property this header represents
+ * @param locator
+ * sort state locator
+ * @return created header component
+ */
+ protected WebMarkupContainer newSortableHeader(final String headerId, final S property,
+ final ISortStateLocator<S> locator)
+ {
+ return new OrderByBorder<S>(headerId, property, locator)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onSortChanged()
+ {
+ getTable().setCurrentPage(0);
+ }
+ };
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterSelectColumn.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterSelectColumn.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterSelectColumn.java
deleted file mode 100644
index e9f9be1..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterSelectColumn.java
+++ /dev/null
@@ -1,57 +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.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns;
-
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.model.IModel;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.viewer.wicket.model.common.SelectionHandler;
-import org.apache.isis.viewer.wicket.ui.components.widgets.buttons.ContainedButtonPanel;
-
-public final class ObjectAdapterSelectColumn extends ColumnAbstract<ObjectAdapter> {
-
- private static final long serialVersionUID = 1L;
-
- private final SelectionHandler handler;
-
- public ObjectAdapterSelectColumn(final IModel<String> columnNameModel, final SelectionHandler handler) {
- super(columnNameModel);
- this.handler = handler;
- }
-
- @Override
- public void populateItem(final Item<ICellPopulator<ObjectAdapter>> cellItem, final String componentId, final IModel<ObjectAdapter> rowModel) {
-
- // TODO: i18n
- cellItem.add(new ContainedButtonPanel(componentId, "select") {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onSubmit() {
- final IModel<ObjectAdapter> o = rowModel;
- final ObjectAdapter selectedAdapter = o.getObject();
- handler.onSelected(this, selectedAdapter);
- }
- });
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
index 3f82d33..8ce2cfc 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
@@ -19,12 +19,20 @@
package org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns;
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.IModel;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.viewer.wicket.model.common.SelectionHandler;
+import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.checkbox.ContainedToggleboxPanel;
public final class ObjectAdapterToggleboxColumn extends ColumnAbstract<ObjectAdapter> {
@@ -37,17 +45,38 @@ public final class ObjectAdapterToggleboxColumn extends ColumnAbstract<ObjectAda
super("");
this.handler = handler;
}
+
+ @Override
+ public Component getHeader(String componentId) {
+
+ final ContainedToggleboxPanel toggle = new ContainedToggleboxPanel(componentId) {
+ private static final long serialVersionUID = 1L;
+ @Override
+ public void onSubmit(AjaxRequestTarget target) {
+ for (ContainedToggleboxPanel toggle : rowToggles) {
+ toggle.toggle(target);
+ target.add(toggle);
+ }
+ }
+ };
+ return toggle;
+ }
+ private final List<ContainedToggleboxPanel> rowToggles = Lists.newArrayList();
+
@Override
public void populateItem(final Item<ICellPopulator<ObjectAdapter>> cellItem, final String componentId, final IModel<ObjectAdapter> rowModel) {
- cellItem.add(new ContainedToggleboxPanel(componentId) {
+ final ContainedToggleboxPanel toggle = new ContainedToggleboxPanel(componentId) {
private static final long serialVersionUID = 1L;
@Override
- public void onSubmit() {
- final IModel<ObjectAdapter> o = rowModel;
- final ObjectAdapter selectedAdapter = o.getObject();
+ public void onSubmit(AjaxRequestTarget target) {
+ final EntityModel o = (EntityModel) rowModel;
+ final ObjectAdapter selectedAdapter = o.load(ConcurrencyChecking.NO_CHECK);
handler.onSelected(this, selectedAdapter);
}
- });
+ };
+ rowToggles.add(toggle);
+ toggle.setOutputMarkupId(true);
+ cellItem.add(toggle);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
index 1bb4d96..3503f32 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
@@ -49,10 +49,6 @@ public class CollectionContentsAsIconsPanelFactory extends ComponentFactoryAbstr
}
final EntityCollectionModel entityCollectionModel = (EntityCollectionModel) model;
- if (entityCollectionModel.hasSelectionHandler()) {
- return ApplicationAdvice.DOES_NOT_APPLY;
- }
-
final ObjectSpecification typeOfSpec = entityCollectionModel.getTypeOfSpecification();
if (typeOfSpec.getFacet(IconFacet.class) == null) {
return ApplicationAdvice.DOES_NOT_APPLY;
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
index 107215a..e988bae 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
@@ -41,7 +41,7 @@
<div id="veil" style="position:fixed;">
<div class="imgHolder">
<wicket:link>
- <img src="./spinning-icon.gif"/>
+ <img src="/images/spinning-icon.gif"/>
</wicket:link>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
index bdb567f..4d0b4fe 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
@@ -28,6 +28,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
@@ -59,7 +60,7 @@ public class ContainedToggleboxPanel extends PanelAbstract<Model<Boolean>> {
@Override
protected void onUpdate(AjaxRequestTarget target) {
- ContainedToggleboxPanel.this.onSubmit();
+ ContainedToggleboxPanel.this.onSubmit(target);
}
};
form.add(checkbox);
@@ -73,6 +74,15 @@ public class ContainedToggleboxPanel extends PanelAbstract<Model<Boolean>> {
/**
* Hook method for (typically anonymous) subclasses to override.
*/
- public void onSubmit() {
+ public void onSubmit(AjaxRequestTarget target) {
+ }
+
+ /**
+ * Programmatic toggling.
+ * @param target
+ */
+ public void toggle(AjaxRequestTarget target) {
+ checkbox.setModelObject(!checkbox.getModelObject());
+ onSubmit(target);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/claims/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/dom/pom.xml b/example/application/claims/dom/pom.xml
index 9d18470..49918d8 100644
--- a/example/application/claims/dom/pom.xml
+++ b/example/application/claims/dom/pom.xml
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/claims/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/pom.xml b/example/application/claims/pom.xml
index 6babb5e..fa65c2d 100644
--- a/example/application/claims/pom.xml
+++ b/example/application/claims/pom.xml
@@ -26,12 +26,12 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <isis.version>1.2.0-SNAPSHOT</isis.version>
+ <isis.version>1.3.0-SNAPSHOT</isis.version>
<isis-objectstore-xml.version>1.0.0-SNAPSHOT</isis-objectstore-xml.version>
<isis-profilestore-xml.version>1.0.0-SNAPSHOT</isis-profilestore-xml.version>
- <isis-security-file.version>1.0.1-SNAPSHOT</isis-security-file.version>
+ <isis-security-file.version>1.0.2-SNAPSHOT</isis-security-file.version>
<isis-viewer-dnd.version>1.0.0-SNAPSHOT</isis-viewer-dnd.version>
- <isis-viewer-wicket.version>1.2.0-SNAPSHOT</isis-viewer-wicket.version>
+ <isis-viewer-wicket.version>1.3.0-SNAPSHOT</isis-viewer-wicket.version>
<isis-viewer-scimpi.version>1.0.0-SNAPSHOT</isis-viewer-scimpi.version>
</properties>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/claims/viewer-dnd/ide/eclipse/launch/claims-viewer-dnd.launch
----------------------------------------------------------------------
diff --git a/example/application/claims/viewer-dnd/ide/eclipse/launch/claims-viewer-dnd.launch b/example/application/claims/viewer-dnd/ide/eclipse/launch/claims-viewer-dnd.launch
index c60635b..185395e 100644
--- a/example/application/claims/viewer-dnd/ide/eclipse/launch/claims-viewer-dnd.launch
+++ b/example/application/claims/viewer-dnd/ide/eclipse/launch/claims-viewer-dnd.launch
@@ -13,9 +13,7 @@
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;applib&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;berkeley-persistor&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&qu
ot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;bytecode-cglib&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;bytecode-javassist&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;claims-commandline&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&q
uot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;claims-dom&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;claims-fixture&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;claims-service&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;
no&quot;?&gt;&#10;&lt;javaProject name=&quot;claims-webapp&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;classic-skin&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;commons&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&a
mp;lt;javaProject name=&quot;core&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;dnd-viewer&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;example-claims&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;exa
mples&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;headless&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;headless-applib&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;headless-embedded&quot;/&gt;
&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;headless-junit&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;headless-viewer&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;hibernate-persistor&quot;/&gt;&#10;"
typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;html-viewer&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;http-remoting&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;http-remoting-client&quot;/&gt;&#10;" typeId="org.ecl
ipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;http-remoting-server&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;metamodel&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;isis-parent&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourc
eContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;plugins&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;release&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;remoting&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <
container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;runtime&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;scimpi&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;scimpi-dispatcher&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?x
ml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;scimpi-servlet&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;sql&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;sql-integrationtests&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&am
p;quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;sql-persistor&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;trunk&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;webapp&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quo
t; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;webserver&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;xml-persistor&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;javaProject name=&quot;xstream-marshalling&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot
;no&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.Isis"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--type exploration --viewer dnd"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="claims-viewer-dnd"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
</launchConfiguration>
http://git-wip-us.apache.org/repos/asf/isis/blob/9644f925/example/application/claims/viewer-scimpi/ide/eclipse/launch/claims-viewer-scimpi.launch
----------------------------------------------------------------------
diff --git a/example/application/claims/viewer-scimpi/ide/eclipse/launch/claims-viewer-scimpi.launch b/example/application/claims/viewer-scimpi/ide/eclipse/launch/claims-viewer-scimpi.launch
index 206b682..959db1e 100644
--- a/example/application/claims/viewer-scimpi/ide/eclipse/launch/claims-viewer-scimpi.launch
+++ b/example/application/claims/viewer-scimpi/ide/eclipse/launch/claims-viewer-scimpi.launch
@@ -12,8 +12,6 @@
</mapAttribute>
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="claims-viewer-scimpi"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
</launchConfiguration>
[5/5] git commit: ISIS-418: deleting the isis-site-skin
Posted by da...@apache.org.
ISIS-418: deleting the isis-site-skin
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bd39f680
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bd39f680
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bd39f680
Branch: refs/heads/master
Commit: bd39f68066aa6688b219e80c30ec3b0bceb1e227
Parents: 9644f92
Author: Dan Haywood <da...@apache.org>
Authored: Fri May 31 15:06:32 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Fri May 31 15:06:32 2013 +0100
----------------------------------------------------------------------
pom.xml | 1 -
site-skin/NOTICE | 7 -
site-skin/pom.xml | 68 --
.../appended-resources/supplemental-models.xml | 16 -
.../src/main/resources/META-INF/maven/site.vm | 536 ---------------
site-skin/src/main/resources/css/maven-base.css | 169 -----
site-skin/src/main/resources/css/maven-theme.css | 161 -----
site-skin/src/main/resources/css/print.css | 25 -
site-skin/src/main/resources/css/site.css | 241 -------
site-skin/src/main/resources/images/collapsed.gif | Bin 53 -> 0 bytes
site-skin/src/main/resources/images/expanded.gif | Bin 52 -> 0 bytes
site-skin/src/main/resources/images/external.png | Bin 162 -> 0 bytes
.../src/main/resources/images/icon_error_sml.gif | Bin 1010 -> 0 bytes
.../src/main/resources/images/icon_info_sml.gif | Bin 606 -> 0 bytes
.../src/main/resources/images/icon_success_sml.gif | Bin 990 -> 0 bytes
.../src/main/resources/images/icon_warning_sml.gif | Bin 576 -> 0 bytes
.../images/logos/apache-incubator-logo.png | Bin 4700 -> 0 bytes
.../src/main/resources/images/logos/banner-big.pdn | Bin 350009 -> 0 bytes
.../main/resources/images/logos/banner-normal.pdn | Bin 45456 -> 0 bytes
.../src/main/resources/images/logos/banner.png | Bin 33599 -> 0 bytes
.../images/logos/build-by-maven-black.png | Bin 2294 -> 0 bytes
.../images/logos/build-by-maven-white.png | Bin 2260 -> 0 bytes
.../src/main/resources/images/logos/gradient.png | Bin 63518 -> 0 bytes
.../resources/images/logos/isis-extras-logo.pdn | 467 -------------
.../resources/images/logos/isis-extras-logo.png | Bin 3934 -> 0 bytes
.../src/main/resources/images/logos/isis-logo.pdn | Bin 138477 -> 0 bytes
.../src/main/resources/images/logos/isis-logo.png | Bin 92667 -> 0 bytes
.../main/resources/images/logos/maven-feather.png | Bin 3330 -> 0 bytes
site-skin/src/main/resources/images/newwindow.png | Bin 220 -> 0 bytes
site-skin/src/main/resources/resources.txt | 9 -
30 files changed, 0 insertions(+), 1700 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 59093e7..fb86986 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,6 @@
<module>example/misc/metamodel/jsr303</module>
-->
- <module>site-skin</module>
<module>tool/maven-plugin</module>
</modules>
</profile>
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/NOTICE
----------------------------------------------------------------------
diff --git a/site-skin/NOTICE b/site-skin/NOTICE
deleted file mode 100644
index ba21d0c..0000000
--- a/site-skin/NOTICE
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Isis
-Copyright 2010-2013 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/pom.xml
----------------------------------------------------------------------
diff --git a/site-skin/pom.xml b/site-skin/pom.xml
deleted file mode 100644
index 4fde5cd..0000000
--- a/site-skin/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../core/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.isis.skin</groupId>
- <artifactId>isis-site-skin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <name>Isis Classic Skin</name>
-
- <properties>
- <siteBaseDir>..</siteBaseDir>
- <relativeUrl>site-skin/</relativeUrl>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <!-- Apache Release Audit Tool -->
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.8</version>
- <configuration>
- <excludes>
- <!--
- overriding inherited excludes from oia.core:isis
- with a more specific set for this component
- -->
- <exclude>**/target/**</exclude>
- <exclude>**/target-ide/**</exclude>
-
- <exclude>**/*.project</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.settings/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/site-skin/src/main/appended-resources/supplemental-models.xml b/site-skin/src/main/appended-resources/supplemental-models.xml
deleted file mode 100644
index e7cb7df..0000000
--- a/site-skin/src/main/appended-resources/supplemental-models.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-<supplementalDataModels xmlns="http://maven.apache.org/supplemental-model/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/supplemental-model/1.0.0 http://maven.apache.org/xsd/supplemental-model-1.0.0.xsd">
-
-</supplementalDataModels>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/META-INF/maven/site.vm
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/META-INF/maven/site.vm b/site-skin/src/main/resources/META-INF/maven/site.vm
deleted file mode 100644
index fb5c075..0000000
--- a/site-skin/src/main/resources/META-INF/maven/site.vm
+++ /dev/null
@@ -1,536 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
- 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.
--->
-<!-- Not Generated by Apache Maven Doxia at $dateFormat.format( $currentDate ) -->
-<!-- Relative path: $relativePath -->
-#macro ( link $href $name $target $img $position $alt $border $width $height )
- #set ( $linkTitle = ' title="' + $name + '"' )
- #if( $target )
- #set ( $linkTarget = ' target="' + $target + '"' )
- #else
- #set ( $linkTarget = "" )
- #end
- #if ( ( $href.toLowerCase().startsWith("http") || $href.toLowerCase().startsWith("https") ) )
- #set ( $linkClass = ' class="externalLink"' )
- #else
- #set ( $linkClass = "" )
- #end
- #if ( $img )
- #if ( $position == "left" )
- <a href="$href"$linkClass$linkTarget$linkTitle>#image($img $alt $border $width $height)$name</a>
- #else
- <a href="$href"$linkClass$linkTarget$linkTitle>$name #image($img $alt $border $width $height)</a>
- #end
- #else
- <a href="$href"$linkClass$linkTarget$linkTitle>$name</a>
- #end
-#end
-##
-#macro ( image $img $alt $border $width $height )
- #if( $img )
- #if ( ! ( $img.toLowerCase().startsWith("http") || $img.toLowerCase().startsWith("https") ) )
- #set ( $imgSrc = $PathTool.calculateLink( $img, $relativePath ) )
- #set ( $imgSrc = $imgSrc.replaceAll( "\\", "/" ) )
- #set ( $imgSrc = ' src="' + $imgSrc + '"' )
- #else
- #set ( $imgSrc = ' src="' + $img + '"' )
- #end
- #if( $alt )
- #set ( $imgAlt = ' alt="' + $alt + '"' )
- #else
- #set ( $imgAlt = ' alt=""' )
- #end
- #if( $border )
- #set ( $imgBorder = ' border="' + $border + '"' )
- #else
- #set ( $imgBorder = "" )
- #end
- #if( $width )
- #set ( $imgWidth = ' width="' + $width + '"' )
- #else
- #set ( $imgWidth = "" )
- #end
- #if( $height )
- #set ( $imgHeight = ' height="' + $height + '"' )
- #else
- #set ( $imgHeight = "" )
- #end
- <img class="imageLink"$imgSrc$imgAlt$imgBorder$imgWidth$imgHeight/>
- #end
-#end
-#macro ( banner $banner $id )
- #if ( $banner )
- #if( $banner.href )
- <a href="$banner.href" id="$id"#if( $banner.alt ) title="$banner.alt"#end>
- #else
- <div id="$id">
- #end
-##
- #if( $banner.src )
- #set ( $src = $banner.src )
- #if ( ! ( $src.toLowerCase().startsWith("http") || $src.toLowerCase().startsWith("https") ) )
- #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
- #set ( $src = $src.replaceAll( "\\", "/" ) )
- #end
- #if ( $banner.alt )
- #set ( $alt = $banner.alt )
- #else
- #set ( $alt = $banner.name )
- #end
- <img src="$src" alt="$alt" />
- #else
- $banner.name
- #end
-##
- #if( $banner.href )
- </a>
- #else
- </div>
- #end
- #end
-#end
-##
-#macro ( links $links )
- #set ( $counter = 0 )
- #foreach( $item in $links )
- #set ( $counter = $counter + 1 )
- #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
- #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
- #if ( $links.size() > $counter )
- |
- #end
- #end
-#end
-##
-#macro ( breadcrumbs $breadcrumbs )
- #set ( $counter = 0 )
- #foreach( $item in $breadcrumbs )
- #set ( $counter = $counter + 1 )
- #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
-##
- #if ( $currentItemHref == $alignedFileName || $currentItemHref == "" )
- $item.name
- #else
- #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
- #end
- #if ( $breadcrumbs.size() > $counter )
- >
- #end
- #end
-#end
-##
-#macro ( displayTree $display $item )
- #if ( $item && $item.items && $item.items.size() > 0 )
- #foreach( $subitem in $item.items )
- #set ( $subitemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
- #set ( $subitemHref = $subitemHref.replaceAll( "\\", "/" ) )
- #if ( $alignedFileName == $subitemHref )
- #set ( $display = true )
- #end
-##
- #displayTree( $display $subitem )
- #end
- #end
-#end
-##
-#macro ( menuItem $item )
- #set ( $collapse = "none" )
- #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
- #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
-##
- #if ( $item && $item.items && $item.items.size() > 0 )
- #if ( $item.collapse == false )
- #set ( $collapse = "expanded" )
- #else
- ## By default collapsed
- #set ( $collapse = "collapsed" )
- #end
-##
- #set ( $display = false )
- #displayTree( $display $item )
-##
- #if ( $alignedFileName == $currentItemHref || $display )
- #set ( $collapse = "expanded" )
- #end
- #end
- <li class="$collapse">
- #if ( $item.img )
- #if ( $item.position == "left" )
- #if ( $alignedFileName == $currentItemHref )
- <strong>#image($item.img $item.alt $item.border $item.width $item.height) $item.name</strong>
- #else
- #link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height)
- #end
- #else
- #if ( $alignedFileName == $currentItemHref )
- <strong>$item.name #image($item.img $item.alt $item.border $item.width $item.height)</strong>
- #else
- #link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height)
- #end
- #end
- #else
- #if ( $alignedFileName == $currentItemHref )
- <strong>$item.name</strong>
- #else
- #link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
- #end
- #end
- #if ( $item && $item.items && $item.items.size() > 0 )
- #if ( $collapse == "expanded" )
- <ul>
- #foreach( $subitem in $item.items )
- #menuItem( $subitem )
- #end
- </ul>
- #end
- #end
- </li>
-#end
-##
-#macro ( mainMenu $menus )
- #foreach( $menu in $menus )
- #if ( $menu.name )
- #if ( $menu.img )
- #if( $menu.position )
- #set ( $position = $menu.position )
- #else
- #set ( $position = "left" )
- #end
-##
- #if ( ! ( $menu.img.toLowerCase().startsWith("http") || $menu.img.toLowerCase().startsWith("https") ) )
- #set ( $src = $PathTool.calculateLink( $menu.img, $relativePath ) )
- #set ( $src = $src.replaceAll( "\\", "/" ) )
- #set ( $src = ' src="' + $src + '"' )
- #else
- #set ( $src = ' src="' + $menu.img + '"' )
- #end
-##
- #if( $menu.alt )
- #set ( $alt = ' alt="' + $menu.alt + '"' )
- #else
- #set ( $alt = ' alt="' + $menu.name + '"' )
- #end
-##
- #if( $menu.border )
- #set ( $border = ' border="' + $menu.border + '"' )
- #else
- #set ( $border = ' border="0"' )
- #end
-##
- #if( $menu.width )
- #set ( $width = ' width="' + $menu.width + '"' )
- #else
- #set ( $width = "" )
- #end
- #if( $menu.height )
- #set ( $height = ' height="' + $menu.height + '"' )
- #else
- #set ( $height = "" )
- #end
-##
- #set ( $img = '<img class="imageLink"' + $src + $alt + $border + $width + $height + "/>" )
-##
- #if ( $position == "left" )
- <h5>$img $menu.name</h5>
- #else
- <h5>$menu.name $img</h5>
- #end
- #else
- <h5>$menu.name</h5>
- #end
- #end
- #if ( $menu.items && $menu.items.size() > 0 )
- <ul>
- #foreach( $item in $menu.items )
- #menuItem( $item )
- #end
- </ul>
- #end
- #end
-#end
-##
-#macro ( copyright )
- #if ( $project )
- #if ( ${project.organization} && ${project.organization.name} )
- #set ( $period = "" )
- #else
- #set ( $period = "." )
- #end
-##
- #set ( $currentYear = ${currentDate.year} + 1900 )
-##
- #if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
- ${project.inceptionYear}-${currentYear}${period}
- #else
- ${currentYear}${period}
- #end
-##
- #if ( ${project.organization} )
- #if ( ${project.organization.name} && ${project.organization.url} )
- <a href="$project.organization.url">${project.organization.name}</a>.
- #elseif ( ${project.organization.name} )
- ${project.organization.name}.
- #end
- #end
- #end
-#end
-##
-#macro ( publishDate $position $publishDate $version )
- #if ( $publishDate && $publishDate.format )
- #set ( $format = $publishDate.format )
- #else
- #set ( $format = "yyyy-MM-dd" )
- #end
-##
- $dateFormat.applyPattern( $format )
-##
- #set ( $dateToday = $dateFormat.format( $currentDate ) )
-##
- #if ( $publishDate && $publishDate.position )
- #set ( $datePosition = $publishDate.position )
- #else
- #set ( $datePosition = "left" )
- #end
-##
- #if ( $version )
- #if ( $version.position )
- #set ( $versionPosition = $version.position )
- #else
- #set ( $versionPosition = "left" )
- #end
- #else
- #set ( $version = "" )
- #set ( $versionPosition = "left" )
- #end
-##
- #set ( $breadcrumbs = $decoration.body.breadcrumbs )
- #set ( $links = $decoration.body.links )
-
- #if ( $datePosition.equalsIgnoreCase( "right" ) && $links && $links.size() > 0 )
- #set ( $prefix = " |" )
- #else
- #set ( $prefix = "" )
- #end
-##
- #if ( $datePosition.equalsIgnoreCase( $position ) )
- #if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
- $prefix <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday</span>
- #if ( $versionPosition.equalsIgnoreCase( $position ) )
- | <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
- #end
- #elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $datePosition.equalsIgnoreCase( "navigation-top" ) ) )
- <div id="lastPublished">
- <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday</span>
- #if ( $versionPosition.equalsIgnoreCase( $position ) )
- | <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
- #end
- </div>
- #elseif ( $datePosition.equalsIgnoreCase("left") )
- <div class="xleft">
- <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday</span>
- #if ( $versionPosition.equalsIgnoreCase( $position ) )
- | <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
- #end
- #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
- | #breadcrumbs( $breadcrumbs )
- #end
- </div>
- #end
- #elseif ( $versionPosition.equalsIgnoreCase( $position ) )
- #if ( ( $versionPosition.equalsIgnoreCase( "right" ) ) || ( $versionPosition.equalsIgnoreCase( "bottom" ) ) )
- $prefix <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
- #elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
- <div id="lastPublished">
- <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
- </div>
- #elseif ( $versionPosition.equalsIgnoreCase("left") )
- <div class="xleft">
- <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
- #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
- | #breadcrumbs( $breadcrumbs )
- #end
- </div>
- #end
- #elseif ( $position.equalsIgnoreCase( "left" ) )
- #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
- <div class="xleft">
- #breadcrumbs( $breadcrumbs )
- </div>
- #end
- #end
-#end
-##
-#macro ( poweredByLogo $poweredBy )
- #if( $poweredBy )
- #foreach ($item in $poweredBy)
- #if( $item.href )
- #set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
- #set ( $href = $href.replaceAll( "\\", "/" ) )
- #else
- #set ( $href="http://maven.apache.org/" )
- #end
-##
- #if( $item.name )
- #set ( $name = $item.name )
- #else
- #set ( $name = $i18n.getString( "site-renderer", $locale, "template.builtby" ) )
- #set ( $name = "${name} Maven" )
- #end
-##
- #if( $item.img )
- #set ( $img = $item.img )
- #else
- #set ( $img = "images/logos/maven-feather.png" )
- #end
-##
- #if ( ! ( $img.toLowerCase().startsWith("http") || $img.toLowerCase().startsWith("https") ) )
- #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
- #set ( $img = $src.replaceAll( "\\", "/" ) )
- #end
-##
- #if( $item.alt )
- #set ( $alt = ' alt="' + $item.alt + '"' )
- #else
- #set ( $alt = ' alt="' + $name + '"' )
- #end
-##
- #if( $item.border )
- #set ( $border = ' border="' + $item.border + '"' )
- #else
- #set ( $border = "" )
- #end
-##
- #if( $item.width )
- #set ( $width = ' width="' + $item.width + '"' )
- #else
- #set ( $width = "" )
- #end
- #if( $item.height )
- #set ( $height = ' height="' + $item.height + '"' )
- #else
- #set ( $height = "" )
- #end
-##
- <a href="$href" title="$name" class="poweredBy">
- <img class="poweredBy" $alt src="$img" $border $width $height />
- </a>
- #end
- #if( $poweredBy.isEmpty() )
- <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
- <img class="poweredBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />
- </a>
- #end
- #else
- <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
- <img class="poweredBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />
- </a>
- #end
-#end
-##
-<html xmlns="http://www.w3.org/1999/xhtml"#if ( $locale ) xml:lang="$locale.language" lang="$locale.language"#end>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
- <title>$title</title>
- <style type="text/css" media="all">
- @import url("$relativePath/css/maven-base.css");
- @import url("$relativePath/css/maven-theme.css");
- @import url("$relativePath/css/site.css");
- </style>
- <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" />
-#foreach( $author in $authors )
- <meta name="author" content="$author" />
-#end
-#if ( $dateCreation )
- <meta name="Date-Creation-yyyymmdd" content="$dateCreation" />
-#end
-#if ( $dateRevision )
- <meta name="Date-Revision-yyyymmdd" content="$dateRevision" />
-#end
-#if ( $locale )
- <meta http-equiv="Content-Language" content="$locale.language" />
-#end
- #if ( $decoration.body.head )
- #foreach( $item in $decoration.body.head.getChildren() )
- ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
- ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
- ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
- #set ( $documentHeader = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" )
- #set ( $documentHeader = $documentHeader.replaceAll( "\\", "" ) )
- #if ( $item.name == "script" )
- $StringUtils.replace( $item.toUnescapedString(), $documentHeader, "" )
- #else
- $StringUtils.replace( $item.toString(), $documentHeader, "" )
- #end
- #end
- #end
- $headContent
- </head>
- <body class="composite">
- <div id="wrapper">
- <div id="banner">
- <a href="http://incubator.apache.org/isis" id="bannerFull"> </a>
- <div class="clear">
- <hr/>
- </div>
- </div>
- <div id="breadcrumbs">
- #publishDate( "left" $decoration.publishDate $decoration.version )
- <div class="xright">#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate $decoration.version )</div>
- <div class="clear">
- <hr/>
- </div>
- </div>
- <div id="leftColumn">
- <div id="navcolumn">
- #publishDate( "navigation-top" $decoration.publishDate $decoration.version )
- #mainMenu( $decoration.body.menus )
- #poweredByLogo( $decoration.poweredBy )
- #publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
- </div>
- </div>
- <div id="bodyColumn">
- <div id="searchBox">
- <form action="http://www.google.com/cse" id="cse-search-box">
- <div>
- <input type="hidden" name="cx" value="001500763902520246267:purt3m54z98" />
- <input type="hidden" name="ie" value="UTF-8" />
- <input type="text" name="q" size="31" />
- <input type="submit" name="sa" value="Search" />
- </div>
-</form>
-<script type="text/javascript" src="http://www.google.com/cse/brand?form=cse-search-box&lang=en"></script>
- </div>
- <div id="contentBox">
- $bodyContent
- </div>
- </div>
- <div class="clear">
- <hr/>
- </div>
- <div id="footer">
- <div class="xright">Copyright ©#copyright()All Rights Reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )</div>
- <div class="clear">
- <hr/>
- </div>
- </div>
- </div>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/css/maven-base.css
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/css/maven-base.css b/site-skin/src/main/resources/css/maven-base.css
deleted file mode 100644
index 3b194e5..0000000
--- a/site-skin/src/main/resources/css/maven-base.css
+++ /dev/null
@@ -1,169 +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.
- */
-body {
- margin: 0px;
- padding: 0px;
-}
-img {
- border:none;
-}
-table {
- padding:0px;
- width: 100%;
- margin-left: -2px;
- margin-right: -2px;
-}
-acronym {
- cursor: help;
- border-bottom: 1px dotted #feb;
-}
-table.bodyTable th, table.bodyTable td {
- padding: 2px 4px 2px 4px;
- vertical-align: top;
-}
-div.clear{
- clear:both;
- visibility: hidden;
-}
-div.clear hr{
- display: none;
-}
-#bannerLeft, #bannerRight {
- font-size: xx-large;
- font-weight: bold;
-}
-#bannerLeft img, #bannerRight img {
- margin: 0px;
-}
-.xleft, #bannerLeft img {
- float:left;
-}
-.xright, #bannerRight {
- float:right;
-}
-#banner {
- padding: 0px;
-}
-#banner img {
- border: none;
-}
-#breadcrumbs {
- padding: 3px 10px 3px 10px;
-}
-#leftColumn {
- width: 170px;
- float:left;
- overflow: auto;
-}
-#bodyColumn {
- margin-right: 1.5em;
- margin-left: 197px;
-}
-#legend {
- padding: 8px 0 8px 0;
-}
-#navcolumn {
- padding: 8px 4px 0 8px;
-}
-#navcolumn h5 {
- margin: 0;
- padding: 0;
- font-size: small;
-}
-#navcolumn ul {
- margin: 0;
- padding: 0;
- font-size: small;
-}
-#navcolumn li {
- list-style-type: none;
- background-image: none;
- background-repeat: no-repeat;
- background-position: 0 0.4em;
- padding-left: 16px;
- list-style-position: outside;
- line-height: 1.2em;
- font-size: smaller;
-}
-#navcolumn li.expanded {
- background-image: url(../images/expanded.gif);
-}
-#navcolumn li.collapsed {
- background-image: url(../images/collapsed.gif);
-}
-#poweredBy {
- text-align: center;
-}
-#navcolumn img {
- margin-top: 10px;
- margin-bottom: 3px;
-}
-#poweredBy img {
- display:block;
- margin: 20px 0 20px 17px;
-}
-#search img {
- margin: 0px;
- display: block;
-}
-#search #q, #search #btnG {
- border: 1px solid #999;
- margin-bottom:10px;
-}
-#search form {
- margin: 0px;
-}
-#lastPublished {
- font-size: x-small;
-}
-.navSection {
- margin-bottom: 2px;
- padding: 8px;
-}
-.navSectionHead {
- font-weight: bold;
- font-size: x-small;
-}
-.section {
- padding: 4px;
-}
-#footer {
- padding: 3px 10px 3px 10px;
- font-size: x-small;
-}
-#breadcrumbs {
- font-size: x-small;
- margin: 0pt;
-}
-.source {
- padding: 12px;
- margin: 1em 7px 1em 7px;
-}
-.source pre {
- margin: 0px;
- padding: 0px;
-}
-#navcolumn img.imageLink, .imageLink {
- padding-left: 0px;
- padding-bottom: 0px;
- padding-top: 0px;
- padding-right: 2px;
- border: 0px;
- margin: 0px;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/css/maven-theme.css
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/css/maven-theme.css b/site-skin/src/main/resources/css/maven-theme.css
deleted file mode 100644
index f201c75..0000000
--- a/site-skin/src/main/resources/css/maven-theme.css
+++ /dev/null
@@ -1,161 +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.
- */
-
-body {
- padding: 0px 0px 10px 0px;
-}
-
-body, td, select, input, li{
- font-family: Verdana, Helvetica, Arial, sans-serif;
- font-size: 13px;
-}
-code{
- font-family: Courier, monospace;
- font-size: 13px;
-}
-a {
- text-decoration: none;
-}
-a:link {
- color:#36a;
-}
-a:visited {
- color:#47a;
-}
-a:active, a:hover {
- color:#69c;
-}
-#legend li.externalLink {
- background: url(../images/external.png) left top no-repeat;
- padding-left: 18px;
-}
-a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
- background: url(../images/external.png) right center no-repeat;
- padding-right: 18px;
-}
-#legend li.newWindow {
- background: url(../images/newwindow.png) left top no-repeat;
- padding-left: 18px;
-}
-a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover {
- background: url(../images/newwindow.png) right center no-repeat;
- padding-right: 18px;
-}
-h2 {
- padding: 4px 4px 4px 6px;
- border: 1px solid #999;
- color: #900;
- background-color: #ddd;
- font-weight:900;
- font-size: x-large;
-}
-h3 {
- padding: 4px 4px 4px 6px;
- border: 1px solid #aaa;
- color: #900;
- background-color: #eee;
- font-weight: normal;
- font-size: large;
-}
-h4 {
- padding: 4px 4px 4px 6px;
- border: 1px solid #bbb;
- color: #900;
- background-color: #fff;
- font-weight: normal;
- font-size: large;
-}
-h5 {
- padding: 4px 4px 4px 6px;
- color: #900;
- font-size: medium;
-}
-p {
- line-height: 1.3em;
- font-size: small;
-}
-#breadcrumbs {
- border-top: 1px solid #aaa;
- border-bottom: 1px solid #aaa;
- background-color: #ccc;
-}
-#leftColumn {
- margin: 10px 0 0 5px;
- border: 1px solid #999;
- background-color: #eee;
-}
-#navcolumn h5 {
- font-size: smaller;
- border-bottom: 1px solid #aaaaaa;
- padding-top: 2px;
- color: #000;
-}
-
-table.bodyTable th {
- color: white;
- background-color: #bbb;
- text-align: left;
- font-weight: bold;
-}
-
-table.bodyTable th, table.bodyTable td {
- font-size: small;
-}
-
-table.bodyTable tr.a {
- background-color: #ddd;
-}
-
-table.bodyTable tr.b {
- background-color: #eee;
-}
-
-.source {
- border: 1px solid #999;
-}
-dl {
- padding: 4px 4px 4px 6px;
- border: 1px solid #aaa;
- background-color: #ffc;
-}
-dt {
- color: #900;
-}
-#organizationLogo img, #projectLogo img, #projectLogo span{
- margin: 8px;
-}
-#banner {
- border-bottom: 1px solid #fff;
-}
-.errormark, .warningmark, .donemark, .infomark {
- background: url(../images/icon_error_sml.gif) no-repeat;
-}
-
-.warningmark {
- background-image: url(../images/icon_warning_sml.gif);
-}
-
-.donemark {
- background-image: url(../images/icon_success_sml.gif);
-}
-
-.infomark {
- background-image: url(../images/icon_info_sml.gif);
-}
-
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/css/print.css
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/css/print.css b/site-skin/src/main/resources/css/print.css
deleted file mode 100644
index 520a0b77..0000000
--- a/site-skin/src/main/resources/css/print.css
+++ /dev/null
@@ -1,25 +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.
- */
-#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {
- display: none !important;
-}
-#bodyColumn, body.docs div.docs {
- margin: 0 !important;
- border: none !important
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/css/site.css
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/css/site.css b/site-skin/src/main/resources/css/site.css
deleted file mode 100644
index d251a10..0000000
--- a/site-skin/src/main/resources/css/site.css
+++ /dev/null
@@ -1,241 +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.
- */
-body {
- background: #4A6074;
- text-align: center;
-}
-#wrapper {
- width: 980px;
- border:3px solid white;
- margin:8px auto;
- text-align: left;
- background: white;
-}
-
-.gsc-branding {
- display: none;
-}
-
-#searchBox {
- text-align: right;
-}
-
-#bannerFull {
- background: url(../images/logos/banner.png) left top no-repeat;
- height: 100px;
- width: 980px;
- float: left;
-}
-
-img.wrap-left {
- float: left;
- padding-top: 2px;
- padding-bottom: 10px;
-}
-
-img.wrap-right {
- float: right;
-}
-
-
-#links:before {
- content: "Related sites: ";
-}
-
-a:link {
- color:#4477AA;
-}
-
-a {
- text-decoration:none;
-}
-
-p, ul, table, img {
- margin-top: 0.5em;
- margin-bottom: 1.2em;
- line-height: 1.3em;
-}
-
-p, li, td {
-
-}
-
-li {
- margin-bottom: 2px;
-}
-
-a #externalLink {
- after: "EXT" url('../images/external.png');
-}
-
-img {
- padding-left: 4px;
- float: none;
-}
-
-table.bodyTable th,
-table.bodyTable td {
- padding:6px 6px;
- vertical-align:top;
-}
-
-
-tr.a {
- background-color: #eeeeee;
-}
-
-tr.b {
- background-color: #fafafa;
-}
-
-dl {
- background-color:#ffffff;
- border:none;
- padding:4px 24px 4px 18px;
-}
-
-contentBox + section {
- padding-top: -1em;
-}
-
-.section {
- padding:4px 0;
-}
-
-#breadcrumbs {
- background: #f0f0f0;
- padding: 5px 9px;
-}
-
-#leftColumn {
- width:14em;
- padding-top: 10px;
- margin: 12px 0 0 10px;
- background-color:transparent;
- border: none;
- border-right:1px solid #EEEEEE;
- min-height: 800px;
-}
-
-#navcolumn {
- padding: 0 8px;
-}
-
-#navcolumn ul {
- padding-bottom: 8px;
-}
-
-
-#navcolumn ul li.expanded ul {
- padding-bottom: 0px;
-}
-
-#navcolumn h5 {
- padding-left: 10px;
- border: none;
- color:#4477AA;
- font-size:smaller;
- font-weight: bold;
- padding-top:2px;
- padding-bottom: 2px;
-}
-
-
-#navcolumn li {
- padding-top: 3px;
- padding-left: 10px;
- margin-bottom: 0px;
-}
-
-#navcolumn a:link,
-#navcolumn a:visited {
- color: #000000;
-}
-
-#navcolumn a:hover {
- color: #4477AA;
-}
-
-
-#bodyColumn {
- margin-left:18em;
- margin-top: 10px;
- padding-top: 0px;
-}
-
-#search {
- background-color:White;
- float:right;
- padding-bottom:10px;
- padding-left:55px;
- padding-right:10px;
-}
-
-h1,h2,h3,h4,h5 {
- background-color: transparent;
- border: none;
- border-bottom:1px solid #AAAAAA;
- color:#6699CC;
- font-weight:normal;
- padding: 4px 0px;
- margin-bottom: 3px;
- margin-top: 2px;
-}
-
-#bodyColumn h1 {
- font-size: large;
- font-weight: bold;
-}
-
-#bodyColumn h2 {
- font-size: small;
- font-weight: bold;
- margin:0 0 16px;
- border-bottom: none;
-}
-
-#bodyColumn h3 {
- font-size: small;
- font-weight: normal;
-}
-
-#bodyColumn h4 {
- font-size: 110%;
-}
-
-#bodyColumn h5 {
- font-size: 90%;
-}
-
-div.source {
- background-color:#fdfffd;
-}
-
-#poweredby {
-
-}
-
-
-#gadget span#title {
- display: none;
-}
-
-#gadget iframe font {
- display: none;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/collapsed.gif
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/collapsed.gif b/site-skin/src/main/resources/images/collapsed.gif
deleted file mode 100644
index 6e71084..0000000
Binary files a/site-skin/src/main/resources/images/collapsed.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/expanded.gif
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/expanded.gif b/site-skin/src/main/resources/images/expanded.gif
deleted file mode 100644
index 0fef3d8..0000000
Binary files a/site-skin/src/main/resources/images/expanded.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/external.png
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/external.png b/site-skin/src/main/resources/images/external.png
deleted file mode 100644
index 4607aca..0000000
Binary files a/site-skin/src/main/resources/images/external.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/icon_error_sml.gif
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/icon_error_sml.gif b/site-skin/src/main/resources/images/icon_error_sml.gif
deleted file mode 100755
index 61132ef..0000000
Binary files a/site-skin/src/main/resources/images/icon_error_sml.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/icon_info_sml.gif
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/icon_info_sml.gif b/site-skin/src/main/resources/images/icon_info_sml.gif
deleted file mode 100755
index c6cb9ad..0000000
Binary files a/site-skin/src/main/resources/images/icon_info_sml.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/icon_success_sml.gif
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/icon_success_sml.gif b/site-skin/src/main/resources/images/icon_success_sml.gif
deleted file mode 100755
index 52e85a4..0000000
Binary files a/site-skin/src/main/resources/images/icon_success_sml.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/icon_warning_sml.gif
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/icon_warning_sml.gif b/site-skin/src/main/resources/images/icon_warning_sml.gif
deleted file mode 100755
index 873bbb5..0000000
Binary files a/site-skin/src/main/resources/images/icon_warning_sml.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/logos/apache-incubator-logo.png
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/logos/apache-incubator-logo.png b/site-skin/src/main/resources/images/logos/apache-incubator-logo.png
deleted file mode 100644
index b1ba7e8..0000000
Binary files a/site-skin/src/main/resources/images/logos/apache-incubator-logo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/logos/banner-big.pdn
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/logos/banner-big.pdn b/site-skin/src/main/resources/images/logos/banner-big.pdn
deleted file mode 100644
index 9a3c953..0000000
Binary files a/site-skin/src/main/resources/images/logos/banner-big.pdn and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/logos/banner-normal.pdn
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/logos/banner-normal.pdn b/site-skin/src/main/resources/images/logos/banner-normal.pdn
deleted file mode 100644
index 29e3381..0000000
Binary files a/site-skin/src/main/resources/images/logos/banner-normal.pdn and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/logos/banner.png
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/logos/banner.png b/site-skin/src/main/resources/images/logos/banner.png
deleted file mode 100644
index 696d58c..0000000
Binary files a/site-skin/src/main/resources/images/logos/banner.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/logos/build-by-maven-black.png
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/logos/build-by-maven-black.png b/site-skin/src/main/resources/images/logos/build-by-maven-black.png
deleted file mode 100644
index 919fd0f..0000000
Binary files a/site-skin/src/main/resources/images/logos/build-by-maven-black.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/logos/build-by-maven-white.png
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/logos/build-by-maven-white.png b/site-skin/src/main/resources/images/logos/build-by-maven-white.png
deleted file mode 100644
index 7d44c9c..0000000
Binary files a/site-skin/src/main/resources/images/logos/build-by-maven-white.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/bd39f680/site-skin/src/main/resources/images/logos/gradient.png
----------------------------------------------------------------------
diff --git a/site-skin/src/main/resources/images/logos/gradient.png b/site-skin/src/main/resources/images/logos/gradient.png
deleted file mode 100644
index 55b39da..0000000
Binary files a/site-skin/src/main/resources/images/logos/gradient.png and /dev/null differ