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 2011/05/13 15:52:10 UTC
svn commit: r1102735 [1/7] - in /incubator/isis/trunk: ./ applib/src/site/
core/commons/src/site/ core/metamodel/src/site/ core/progmodel/src/site/
core/runtime/src/site/ core/src/site/ core/testsupport/src/site/
core/webapp/src/site/ examples/claims/v...
Author: danhaywood
Date: Fri May 13 13:52:06 2011
New Revision: 1102735
URL: http://svn.apache.org/viewvc?rev=1102735&view=rev
Log:
ISIS-20 added missing licenses for remaining .xml files (primarily site.xml and web.xml files, but also miscellaneous others)
Modified:
incubator/isis/trunk/addmissinglicenses.groovy
incubator/isis/trunk/applib/src/site/site.xml
incubator/isis/trunk/core/commons/src/site/site.xml
incubator/isis/trunk/core/metamodel/src/site/site.xml
incubator/isis/trunk/core/progmodel/src/site/site.xml
incubator/isis/trunk/core/runtime/src/site/site.xml
incubator/isis/trunk/core/src/site/site.xml
incubator/isis/trunk/core/testsupport/src/site/site.xml
incubator/isis/trunk/core/webapp/src/site/site.xml
incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/claims/viewer-restful/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/claims/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/ecs/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/expensesOBSOLETE/commandline/src/main/assembly/demo.xml
incubator/isis/trunk/examples/expensesOBSOLETE/commandline/src/main/assembly/descriptor.xml
incubator/isis/trunk/examples/expensesOBSOLETE/distclient/build.xml
incubator/isis/trunk/examples/expensesOBSOLETE/distclient/client.xml
incubator/isis/trunk/examples/expensesOBSOLETE/distserver/server.xml
incubator/isis/trunk/examples/expensesOBSOLETE/hibernate/src/main/resources/hibernate.cfg.xml
incubator/isis/trunk/examples/expensesOBSOLETE/scimpi/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/expensesOBSOLETE/webapp/build.xml
incubator/isis/trunk/examples/expensesOBSOLETE/webapp/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/groovy-testapp/claims/commandline/src/main/assembly/descriptor.xml
incubator/isis/trunk/examples/groovy-testapp/claims/commandline/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/groovy-testapp/claims/webapp/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/library/src/main/webapp/WEB-INF/classes/hibernate.cfg.xml
incubator/isis/trunk/examples/library/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/orders/src/main/assembly/descriptor.xml
incubator/isis/trunk/examples/shopping-cart/cart/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/shopping-cart/catalogue/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/progmodels/dflt/src/site/site.xml
incubator/isis/trunk/progmodels/groovy/applib/src/site/site.xml
incubator/isis/trunk/progmodels/groovy/metamodel/src/site/site.xml
incubator/isis/trunk/progmodels/groovy/src/site/site.xml
incubator/isis/trunk/progmodels/src/site/site.xml
incubator/isis/trunk/progmodels/wrapper/applib/src/site/site.xml
incubator/isis/trunk/progmodels/wrapper/metamodel/src/site/site.xml
incubator/isis/trunk/progmodels/wrapper/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/bytecode/dflt/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/bytecode/identity/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/bytecode/javassist/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/bytecode/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/monitoring/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/objectstores/dflt/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/objectstores/nosql/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/objectstores/sql/impl/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/objectstores/sql/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-common/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/objectstores/sql/tests-served/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/objectstores/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/objectstores/xml/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/profilestores/dflt/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/profilestores/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/profilestores/xml/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/profilestores/xml/test.xml
incubator/isis/trunk/runtimes/dflt/remoting/common/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/remoting/marshalling-encode/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/remoting/marshalling-serialize/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/remoting/marshalling-xstream/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/remoting/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/remoting/transport-http/client/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/remoting/transport-http/server/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/remoting/transport-http/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/remoting/transport-sockets/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/runtime/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/webapp/src/site/site.xml
incubator/isis/trunk/runtimes/dflt/webserver/src/site/site.xml
incubator/isis/trunk/runtimes/embedded/src/site/site.xml
incubator/isis/trunk/runtimes/src/site/site.xml
incubator/isis/trunk/security/dflt/src/site/site.xml
incubator/isis/trunk/security/file/src/site/site.xml
incubator/isis/trunk/security/ldap/src/site/site.xml
incubator/isis/trunk/security/src/site/site.xml
incubator/isis/trunk/src/changes/changes.xml
incubator/isis/trunk/src/site/resources/archetype-catalog.xml
incubator/isis/trunk/src/site/resources/ide/eclipse/templates/Apache-Isis-code-style-cleanup.xml
incubator/isis/trunk/src/site/resources/ide/eclipse/templates/Apache-code-style-formatting.xml
incubator/isis/trunk/src/site/resources/ide/eclipse/templates/isis-templates.xml
incubator/isis/trunk/src/site/resources/ide/eclipse/templates/jmock2-templates.xml
incubator/isis/trunk/src/site/resources/ide/eclipse/templates/junit4-templates.xml
incubator/isis/trunk/src/site/site.xml
incubator/isis/trunk/src/site/xdoc/TOREVIEW/developer-tutorial.xml
incubator/isis/trunk/src/site/xdoc/TOREVIEW/expenses-demo.xml
incubator/isis/trunk/src/site/xdoc/TOREVIEW/screenshots.xml
incubator/isis/trunk/src/site/xdoc/naked-objects-books.xml
incubator/isis/trunk/src/site/xdoc/naked-objects-case-study.xml
incubator/isis/trunk/src/site/xdoc/naked-objects-pattern.xml
incubator/isis/trunk/src/site/xdoc/nof-maven-archetype.xml
incubator/isis/trunk/src/site/xdoc/nof-programming-screencasts.xml
incubator/isis/trunk/src/site/xdoc/nof-tutorial-movies.xml
incubator/isis/trunk/src/site/xdoc/oouis.xml
incubator/isis/trunk/support/quickstart-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
incubator/isis/trunk/support/quickstart-archetype/src/main/resources/archetype-resources/viewer-html/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/support/quickstart-archetype/src/main/resources/archetype-resources/viewer-restful/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/support/quickstart-archetype/src/main/resources/archetype-resources/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/support/quickstart-archetype/src/main/resources/archetype-resources/viewer-wicket/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/support/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/support/quickstart/viewer-restful/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/support/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/support/quickstart/viewer-wicket/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/support/src/site/site.xml
incubator/isis/trunk/viewer/bdd/common/src/site/site.xml
incubator/isis/trunk/viewer/bdd/concordion/src/site/site.xml
incubator/isis/trunk/viewer/bdd/src/site/site.xml
incubator/isis/trunk/viewer/dnd/src/site/site.xml
incubator/isis/trunk/viewer/html/src/site/site.xml
incubator/isis/trunk/viewer/junit/src/site/site.xml
incubator/isis/trunk/viewer/restful/applib/src/site/site.xml
incubator/isis/trunk/viewer/restful/src/site/site.xml
incubator/isis/trunk/viewer/restful/viewer/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/viewer/restful/viewer/src/site/site.xml
incubator/isis/trunk/viewer/scimpi/dispatcher/src/site/site.xml
incubator/isis/trunk/viewer/scimpi/servlet/src/site/site.xml
incubator/isis/trunk/viewer/scimpi/src/site/site.xml
incubator/isis/trunk/viewer/src/site/site.xml
incubator/isis/trunk/viewer/wicket/applib/src/site/site.xml
incubator/isis/trunk/viewer/wicket/metamodel/src/site/site.xml
incubator/isis/trunk/viewer/wicket/model/src/site/site.xml
incubator/isis/trunk/viewer/wicket/src/site/site.xml
incubator/isis/trunk/viewer/wicket/ui/src/site/site.xml
incubator/isis/trunk/viewer/wicket/viewer/src/site/site.xml
Modified: incubator/isis/trunk/addmissinglicenses.groovy
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/addmissinglicenses.groovy?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/addmissinglicenses.groovy (original)
+++ incubator/isis/trunk/addmissinglicenses.groovy Fri May 13 13:52:06 2011
@@ -114,7 +114,7 @@ currentDir.eachFileRecurse { file ->
if (file.name.endsWith(fileEnding)) {
def fileText = file.text;
- def hasLicense = fileText.find(".*Licensed to the Apache Software Foundation.*")
+ def hasLicense = fileText.find(".*http://www.apache.org/licenses/LICENSE-2.0.*")
if(hasLicense == null) {
println file.canonicalPath
Modified: incubator/isis/trunk/applib/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/site/site.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/site/site.xml (original)
+++ incubator/isis/trunk/applib/src/site/site.xml Fri May 13 13:52:06 2011
@@ -1,29 +1,47 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-
- <body>
- <breadcrumbs>
- <item name="AppLib" href="index.html"/>
- </breadcrumbs>
-
- <menu name="Application Library">
- <item name="About" href="index.html" />
- </menu>
-
- <menu name="Documentation">
- <item name="${docbkxGuideTitle} (PDF)" href="docbkx/pdf/${docbkxGuideName}.pdf" />
- <item name="${docbkxGuideTitle} (HTML)" href="docbkx/html/guide/${docbkxGuideName}.html" />
- <!--
- to incorporate into docbkx
- <item name="Recognised Types" href="recognised-types.html" />
- <item name="Recognised Methods" href="recognised-methods.html" />
- <item name="Recognised Annotations" href="recognised-annotations.html" />
- <item name="Services" href="services.html" />
- <item name="Fixtures" href="fixtures.html" />
- <item name="Developing Domain Objects" href="developing-domain-objects.html" />
- -->
- </menu>
-
- <menu name="Maven Reports" ref="reports"/>
- </body>
-</project>
+<?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>
+
+ <body>
+ <breadcrumbs>
+ <item name="AppLib" href="index.html"/>
+ </breadcrumbs>
+
+ <menu name="Application Library">
+ <item name="About" href="index.html" />
+ </menu>
+
+ <menu name="Documentation">
+ <item name="${docbkxGuideTitle} (PDF)" href="docbkx/pdf/${docbkxGuideName}.pdf" />
+ <item name="${docbkxGuideTitle} (HTML)" href="docbkx/html/guide/${docbkxGuideName}.html" />
+ <!--
+ to incorporate into docbkx
+ <item name="Recognised Types" href="recognised-types.html" />
+ <item name="Recognised Methods" href="recognised-methods.html" />
+ <item name="Recognised Annotations" href="recognised-annotations.html" />
+ <item name="Services" href="services.html" />
+ <item name="Fixtures" href="fixtures.html" />
+ <item name="Developing Domain Objects" href="developing-domain-objects.html" />
+ -->
+ </menu>
+
+ <menu name="Maven Reports" ref="reports"/>
+ </body>
+</project>
Modified: incubator/isis/trunk/core/commons/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/site/site.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/site/site.xml (original)
+++ incubator/isis/trunk/core/commons/src/site/site.xml Fri May 13 13:52:06 2011
@@ -1,25 +1,43 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-
- <body>
- <breadcrumbs>
- <item name="Commons" href="index.html"/>
- </breadcrumbs>
-
- <menu name="Commons">
- <item name="About" href="index.html" />
- <item name="Jottings" href="jottings.html" />
- </menu>
-
- <menu name="Core Modules">
- <item name="Core Test Support" href="../testsupport/index.html" />
- <item name="Core Commons" href="../commons/index.html" />
- <item name="Core Metamodel" href="../metamodel/index.html" />
- <item name="Core Progmodel" href="../progmodel/index.html" />
- <item name="Core Runtime" href="../runtime/index.html" />
- <item name="Core Webapp" href="../webapp/index.html" />
- </menu>
-
- <menu name="Maven Reports" ref="reports"/>
- </body>
-</project>
+<?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>
+
+ <body>
+ <breadcrumbs>
+ <item name="Commons" href="index.html"/>
+ </breadcrumbs>
+
+ <menu name="Commons">
+ <item name="About" href="index.html" />
+ <item name="Jottings" href="jottings.html" />
+ </menu>
+
+ <menu name="Core Modules">
+ <item name="Core Test Support" href="../testsupport/index.html" />
+ <item name="Core Commons" href="../commons/index.html" />
+ <item name="Core Metamodel" href="../metamodel/index.html" />
+ <item name="Core Progmodel" href="../progmodel/index.html" />
+ <item name="Core Runtime" href="../runtime/index.html" />
+ <item name="Core Webapp" href="../webapp/index.html" />
+ </menu>
+
+ <menu name="Maven Reports" ref="reports"/>
+ </body>
+</project>
Modified: incubator/isis/trunk/core/metamodel/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/site/site.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/site/site.xml (original)
+++ incubator/isis/trunk/core/metamodel/src/site/site.xml Fri May 13 13:52:06 2011
@@ -1,25 +1,43 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-
- <body>
- <breadcrumbs>
- <item name="Metamodel" href="index.html"/>
- </breadcrumbs>
-
- <menu name="Meta Model">
- <item name="About" href="index.html" />
- <item name="Jottings" href="jottings.html" />
- </menu>
-
- <menu name="Core Modules">
- <item name="Core Test Support" href="../testsupport/index.html" />
- <item name="Core Commons" href="../commons/index.html" />
- <item name="Core Metamodel" href="../metamodel/index.html" />
- <item name="Core Progmodel" href="../progmodel/index.html" />
- <item name="Core Runtime" href="../runtime/index.html" />
- <item name="Core Webapp" href="../webapp/index.html" />
- </menu>
-
- <menu name="Maven Reports" ref="reports"/>
- </body>
-</project>
+<?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>
+
+ <body>
+ <breadcrumbs>
+ <item name="Metamodel" href="index.html"/>
+ </breadcrumbs>
+
+ <menu name="Meta Model">
+ <item name="About" href="index.html" />
+ <item name="Jottings" href="jottings.html" />
+ </menu>
+
+ <menu name="Core Modules">
+ <item name="Core Test Support" href="../testsupport/index.html" />
+ <item name="Core Commons" href="../commons/index.html" />
+ <item name="Core Metamodel" href="../metamodel/index.html" />
+ <item name="Core Progmodel" href="../progmodel/index.html" />
+ <item name="Core Runtime" href="../runtime/index.html" />
+ <item name="Core Webapp" href="../webapp/index.html" />
+ </menu>
+
+ <menu name="Maven Reports" ref="reports"/>
+ </body>
+</project>
Modified: incubator/isis/trunk/core/progmodel/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/site/site.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/site/site.xml (original)
+++ incubator/isis/trunk/core/progmodel/src/site/site.xml Fri May 13 13:52:06 2011
@@ -1,25 +1,43 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-
- <body>
- <breadcrumbs>
- <item name="Progmodel" href="index.html"/>
- </breadcrumbs>
-
- <menu name="Programming Model">
- <item name="About" href="index.html" />
- <item name="Jottings" href="jottings.html" />
- </menu>
-
- <menu name="Core Modules">
- <item name="Core Test Support" href="../testsupport/index.html" />
- <item name="Core Commons" href="../commons/index.html" />
- <item name="Core Metamodel" href="../metamodel/index.html" />
- <item name="Core Progmodel" href="../progmodel/index.html" />
- <item name="Core Runtime" href="../runtime/index.html" />
- <item name="Core Webapp" href="../webapp/index.html" />
- </menu>
-
- <menu name="Maven Reports" ref="reports"/>
- </body>
-</project>
+<?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>
+
+ <body>
+ <breadcrumbs>
+ <item name="Progmodel" href="index.html"/>
+ </breadcrumbs>
+
+ <menu name="Programming Model">
+ <item name="About" href="index.html" />
+ <item name="Jottings" href="jottings.html" />
+ </menu>
+
+ <menu name="Core Modules">
+ <item name="Core Test Support" href="../testsupport/index.html" />
+ <item name="Core Commons" href="../commons/index.html" />
+ <item name="Core Metamodel" href="../metamodel/index.html" />
+ <item name="Core Progmodel" href="../progmodel/index.html" />
+ <item name="Core Runtime" href="../runtime/index.html" />
+ <item name="Core Webapp" href="../webapp/index.html" />
+ </menu>
+
+ <menu name="Maven Reports" ref="reports"/>
+ </body>
+</project>
Modified: incubator/isis/trunk/core/runtime/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/site/site.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/site/site.xml (original)
+++ incubator/isis/trunk/core/runtime/src/site/site.xml Fri May 13 13:52:06 2011
@@ -1,25 +1,43 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-
- <body>
- <breadcrumbs>
- <item name="Runtime" href="index.html"/>
- </breadcrumbs>
-
- <menu name="Runtime">
- <item name="About" href="index.html" />
- <item name="Jottings" href="jottings.html" />
- </menu>
-
- <menu name="Core Modules">
- <item name="Core Test Support" href="../testsupport/index.html" />
- <item name="Core Commons" href="../commons/index.html" />
- <item name="Core Metamodel" href="../metamodel/index.html" />
- <item name="Core Progmodel" href="../progmodel/index.html" />
- <item name="Core Runtime" href="../runtime/index.html" />
- <item name="Core Webapp" href="../webapp/index.html" />
- </menu>
-
- <menu name="Maven Reports" ref="reports"/>
- </body>
-</project>
+<?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>
+
+ <body>
+ <breadcrumbs>
+ <item name="Runtime" href="index.html"/>
+ </breadcrumbs>
+
+ <menu name="Runtime">
+ <item name="About" href="index.html" />
+ <item name="Jottings" href="jottings.html" />
+ </menu>
+
+ <menu name="Core Modules">
+ <item name="Core Test Support" href="../testsupport/index.html" />
+ <item name="Core Commons" href="../commons/index.html" />
+ <item name="Core Metamodel" href="../metamodel/index.html" />
+ <item name="Core Progmodel" href="../progmodel/index.html" />
+ <item name="Core Runtime" href="../runtime/index.html" />
+ <item name="Core Webapp" href="../webapp/index.html" />
+ </menu>
+
+ <menu name="Maven Reports" ref="reports"/>
+ </body>
+</project>
Modified: incubator/isis/trunk/core/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/src/site/site.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/core/src/site/site.xml (original)
+++ incubator/isis/trunk/core/src/site/site.xml Fri May 13 13:52:06 2011
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-
- <body>
- <breadcrumbs>
- <item name="Core" href="index.html"/>
- </breadcrumbs>
-
- <menu name="Core Framework">
- <item name="About" href="index.html" />
- <item name="Jottings" href="jottings.html" />
- </menu>
-
- <menu name="Core Modules">
- <item name="Core Test Support" href="./testsupport/index.html" />
- <item name="Core Commons" href="./commons/index.html" />
- <item name="Core Metamodel" href="./metamodel/index.html" />
- <item name="Core Progmodel" href="./progmodel/index.html" />
- <item name="Core Runtime" href="./runtime/index.html" />
- <item name="Core Webapp" href="./webapp/index.html" />
- </menu>
-
- <menu name="Documentation">
- <item name="${docbkxGuideTitle} (PDF)" href="docbkx/pdf/${docbkxGuideName}.pdf" />
- <item name="${docbkxGuideTitle} (HTML)" href="docbkx/html/guide/${docbkxGuideName}.html" />
- </menu>
- </body>
-</project>
+<?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>
+
+ <body>
+ <breadcrumbs>
+ <item name="Core" href="index.html"/>
+ </breadcrumbs>
+
+ <menu name="Core Framework">
+ <item name="About" href="index.html" />
+ <item name="Jottings" href="jottings.html" />
+ </menu>
+
+ <menu name="Core Modules">
+ <item name="Core Test Support" href="./testsupport/index.html" />
+ <item name="Core Commons" href="./commons/index.html" />
+ <item name="Core Metamodel" href="./metamodel/index.html" />
+ <item name="Core Progmodel" href="./progmodel/index.html" />
+ <item name="Core Runtime" href="./runtime/index.html" />
+ <item name="Core Webapp" href="./webapp/index.html" />
+ </menu>
+
+ <menu name="Documentation">
+ <item name="${docbkxGuideTitle} (PDF)" href="docbkx/pdf/${docbkxGuideName}.pdf" />
+ <item name="${docbkxGuideTitle} (HTML)" href="docbkx/html/guide/${docbkxGuideName}.html" />
+ </menu>
+ </body>
+</project>
Modified: incubator/isis/trunk/core/testsupport/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/site/site.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/site/site.xml (original)
+++ incubator/isis/trunk/core/testsupport/src/site/site.xml Fri May 13 13:52:06 2011
@@ -1,25 +1,43 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-
- <body>
- <breadcrumbs>
- <item name="Test Support" href="index.html"/>
- </breadcrumbs>
-
- <menu name="Test Support">
- <item name="About" href="index.html" />
- <item name="Jottings" href="jottings.html" />
- </menu>
-
- <menu name="Core Modules">
- <item name="Core Test Support" href="../testsupport/index.html" />
- <item name="Core Commons" href="../commons/index.html" />
- <item name="Core Metamodel" href="../metamodel/index.html" />
- <item name="Core Progmodel" href="../progmodel/index.html" />
- <item name="Core Runtime" href="../runtime/index.html" />
- <item name="Core Webapp" href="../webapp/index.html" />
- </menu>
-
- <menu name="Maven Reports" ref="reports"/>
- </body>
-</project>
+<?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>
+
+ <body>
+ <breadcrumbs>
+ <item name="Test Support" href="index.html"/>
+ </breadcrumbs>
+
+ <menu name="Test Support">
+ <item name="About" href="index.html" />
+ <item name="Jottings" href="jottings.html" />
+ </menu>
+
+ <menu name="Core Modules">
+ <item name="Core Test Support" href="../testsupport/index.html" />
+ <item name="Core Commons" href="../commons/index.html" />
+ <item name="Core Metamodel" href="../metamodel/index.html" />
+ <item name="Core Progmodel" href="../progmodel/index.html" />
+ <item name="Core Runtime" href="../runtime/index.html" />
+ <item name="Core Webapp" href="../webapp/index.html" />
+ </menu>
+
+ <menu name="Maven Reports" ref="reports"/>
+ </body>
+</project>
Modified: incubator/isis/trunk/core/webapp/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/site/site.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/site/site.xml (original)
+++ incubator/isis/trunk/core/webapp/src/site/site.xml Fri May 13 13:52:06 2011
@@ -1,25 +1,43 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-
- <body>
- <breadcrumbs>
- <item name="Webapp" href="index.html"/>
- </breadcrumbs>
-
- <menu name="Webapp">
- <item name="About" href="index.html" />
- <item name="Jottings" href="jottings.html" />
- </menu>
-
- <menu name="Core Modules">
- <item name="Core Test Support" href="../testsupport/index.html" />
- <item name="Core Commons" href="../commons/index.html" />
- <item name="Core Metamodel" href="../metamodel/index.html" />
- <item name="Core Progmodel" href="../progmodel/index.html" />
- <item name="Core Runtime" href="../runtime/index.html" />
- <item name="Core Webapp" href="../webapp/index.html" />
- </menu>
-
- <menu name="Maven Reports" ref="reports"/>
- </body>
-</project>
+<?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>
+
+ <body>
+ <breadcrumbs>
+ <item name="Webapp" href="index.html"/>
+ </breadcrumbs>
+
+ <menu name="Webapp">
+ <item name="About" href="index.html" />
+ <item name="Jottings" href="jottings.html" />
+ </menu>
+
+ <menu name="Core Modules">
+ <item name="Core Test Support" href="../testsupport/index.html" />
+ <item name="Core Commons" href="../commons/index.html" />
+ <item name="Core Metamodel" href="../metamodel/index.html" />
+ <item name="Core Progmodel" href="../progmodel/index.html" />
+ <item name="Core Runtime" href="../runtime/index.html" />
+ <item name="Core Webapp" href="../webapp/index.html" />
+ </menu>
+
+ <menu name="Maven Reports" ref="reports"/>
+ </body>
+</project>
Modified: incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/web.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/web.xml Fri May 13 13:52:06 2011
@@ -1,3 +1,22 @@
+<?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.
+-->
<!DOCTYPE web-app PUBLIC
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd" >
Modified: incubator/isis/trunk/examples/claims/viewer-restful/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-restful/src/main/webapp/WEB-INF/web.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-restful/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/claims/viewer-restful/src/main/webapp/WEB-INF/web.xml Fri May 13 13:52:06 2011
@@ -1,64 +1,83 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
-
-<web-app>
- <display-name>Restful Claims</display-name>
-
- <context-param>
- <param-name>javax.ws.rs.Application</param-name>
- <param-value>org.apache.isis.viewer.restful.viewer.RestfulApplication</param-value>
- </context-param>
-
- <filter>
- <filter-name>IsisSessionFilter</filter-name>
- <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
- <init-param>
- <!-- trusted client, so no authentication required -->
- <param-name>authenticationSessionLookupStrategy</param-name>
- <param-value>org.apache.isis.viewer.restful.viewer.authentication.AuthenticationSessionLookupStrategyTrusted</param-value>
- </init-param>
- </filter>
-
- <filter-mapping>
- <filter-name>IsisSessionFilter</filter-name>
- <url-pattern>*</url-pattern>
- </filter-mapping>
-
- <listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
- </listener>
-
- <listener>
- <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>RestEasy</servlet-name>
- <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>Resource</servlet-name>
- <servlet-class>org.apache.isis.core.webapp.content.ResourceServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>RestEasy</servlet-name>
- <url-pattern>/</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.js</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.gif</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.png</url-pattern>
- </servlet-mapping>
-
-</web-app>
+<?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.
+-->
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd" >
+
+<web-app>
+ <display-name>Restful Claims</display-name>
+
+ <context-param>
+ <param-name>javax.ws.rs.Application</param-name>
+ <param-value>org.apache.isis.viewer.restful.viewer.RestfulApplication</param-value>
+ </context-param>
+
+ <filter>
+ <filter-name>IsisSessionFilter</filter-name>
+ <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
+ <init-param>
+ <!-- trusted client, so no authentication required -->
+ <param-name>authenticationSessionLookupStrategy</param-name>
+ <param-value>org.apache.isis.viewer.restful.viewer.authentication.AuthenticationSessionLookupStrategyTrusted</param-value>
+ </init-param>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>IsisSessionFilter</filter-name>
+ <url-pattern>*</url-pattern>
+ </filter-mapping>
+
+ <listener>
+ <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ </listener>
+
+ <listener>
+ <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>RestEasy</servlet-name>
+ <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Resource</servlet-name>
+ <servlet-class>org.apache.isis.core.webapp.content.ResourceServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>RestEasy</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Resource</servlet-name>
+ <url-pattern>*.js</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Resource</servlet-name>
+ <url-pattern>*.gif</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Resource</servlet-name>
+ <url-pattern>*.png</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Modified: incubator/isis/trunk/examples/claims/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-scimpi/src/main/webapp/WEB-INF/web.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-scimpi/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/claims/viewer-scimpi/src/main/webapp/WEB-INF/web.xml Fri May 13 13:52:06 2011
@@ -1,4 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.
+-->
<web-app id="WebApp_ID" version="2.4"
xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
Modified: incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/web.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/web.xml Fri May 13 13:52:06 2011
@@ -1,35 +1,53 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <display-name>claims</display-name>
-
- <!--
- There are three means to configure Wickets configuration mode and they
- are tested in the order given. 1) A system property:
- -Dwicket.configuration 2) servlet specific <init-param> 3) context
- specific <context-param> The value might be either "development"
- (reloading when templates change) or "deployment". If no configuration
- is found, "development" is the default.
- -->
-
- <filter>
- <filter-name>wicket.claims</filter-name>
- <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
- <init-param>
- <param-name>applicationClassName</param-name>
- <param-value>org.apache.isis.viewer.wicket.viewer.IsisWicketApplication</param-value>
- <!--
- <param-value>org.apache.isis.example.claims.viewer.wicket.app.ClaimsApplication</param-value>
- -->
- </init-param>
- </filter>
-
- <filter-mapping>
- <filter-name>wicket.claims</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
-
-</web-app>
+<?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.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <display-name>claims</display-name>
+
+ <!--
+ There are three means to configure Wickets configuration mode and they
+ are tested in the order given. 1) A system property:
+ -Dwicket.configuration 2) servlet specific <init-param> 3) context
+ specific <context-param> The value might be either "development"
+ (reloading when templates change) or "deployment". If no configuration
+ is found, "development" is the default.
+ -->
+
+ <filter>
+ <filter-name>wicket.claims</filter-name>
+ <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
+ <init-param>
+ <param-name>applicationClassName</param-name>
+ <param-value>org.apache.isis.viewer.wicket.viewer.IsisWicketApplication</param-value>
+ <!--
+ <param-value>org.apache.isis.example.claims.viewer.wicket.app.ClaimsApplication</param-value>
+ -->
+ </init-param>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>wicket.claims</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+
+</web-app>
Modified: incubator/isis/trunk/examples/ecs/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/ecs/src/main/webapp/WEB-INF/web.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/examples/ecs/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/ecs/src/main/webapp/WEB-INF/web.xml Fri May 13 13:52:06 2011
@@ -1,39 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>demo-ecs</display-name>
-
- <welcome-file-list>
- <welcome-file>index.shtml</welcome-file>
- </welcome-file-list>
-
- <listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>dispatcher</servlet-name>
- <servlet-class>org.apache.isis.runtimes.dflt.webapp.servlet.DispatcherServlet</servlet-class>
- <init-param>
- <param-name>username</param-name>
- <param-value>shopper</param-value>
- </init-param>
- <init-param>
- <param-name>password</param-name>
- <param-value>shopper</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>dispatcher</servlet-name>
- <url-pattern>*.shtml</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>dispatcher</servlet-name>
- <url-pattern>*.app</url-pattern>
- </servlet-mapping>
-
-</web-app>
+<!--
+ 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.
+-->
+<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <display-name>demo-ecs</display-name>
+
+ <welcome-file-list>
+ <welcome-file>index.shtml</welcome-file>
+ </welcome-file-list>
+
+ <listener>
+ <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>dispatcher</servlet-name>
+ <servlet-class>org.apache.isis.runtimes.dflt.webapp.servlet.DispatcherServlet</servlet-class>
+ <init-param>
+ <param-name>username</param-name>
+ <param-value>shopper</param-value>
+ </init-param>
+ <init-param>
+ <param-name>password</param-name>
+ <param-value>shopper</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>dispatcher</servlet-name>
+ <url-pattern>*.shtml</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>dispatcher</servlet-name>
+ <url-pattern>*.app</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Modified: incubator/isis/trunk/examples/expensesOBSOLETE/commandline/src/main/assembly/demo.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/expensesOBSOLETE/commandline/src/main/assembly/demo.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/examples/expensesOBSOLETE/commandline/src/main/assembly/demo.xml (original)
+++ incubator/isis/trunk/examples/expensesOBSOLETE/commandline/src/main/assembly/demo.xml Fri May 13 13:52:06 2011
@@ -1,48 +1,67 @@
-<assembly>
- <id>example</id>
-
- <formats>
- <format>zip</format>
- </formats>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- </dependencySet>
- </dependencySets>
-
- <fileSets>
- <fileSet>
- <directory>target</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>src/main/resources</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>RELEASE*</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>config</directory>
- <outputDirectory>config</outputDirectory>
- <includes>
- <include>logging.properties</include>
- <include>isis.properties</include>
- <include>passwords</include>
- <include>web.properties</include>
- </includes>
- </fileSet>
- </fileSets>
-
-</assembly>
-
+<?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.
+-->
+<assembly>
+ <id>example</id>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>RELEASE*</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>config</directory>
+ <outputDirectory>config</outputDirectory>
+ <includes>
+ <include>logging.properties</include>
+ <include>isis.properties</include>
+ <include>passwords</include>
+ <include>web.properties</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
+
Modified: incubator/isis/trunk/examples/expensesOBSOLETE/commandline/src/main/assembly/descriptor.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/expensesOBSOLETE/commandline/src/main/assembly/descriptor.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/examples/expensesOBSOLETE/commandline/src/main/assembly/descriptor.xml (original)
+++ incubator/isis/trunk/examples/expensesOBSOLETE/commandline/src/main/assembly/descriptor.xml Fri May 13 13:52:06 2011
@@ -1,72 +1,91 @@
-<assembly>
- <id>commandline</id>
-
- <formats>
- <format>zip</format>
- <format>dir</format>
- </formats>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- </dependencySet>
- </dependencySets>
-
- <fileSets>
- <fileSet>
- <directory>target</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>src/main/resources</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>RELEASE*</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>config</directory>
- <outputDirectory>config</outputDirectory>
- <includes>
- <include>*.properties</include>
- <include>allow</include>
- <include>passwords</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/assembly/scripts</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>*.bat</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/assembly/scripts</directory>
- <outputDirectory>.</outputDirectory>
- <fileMode>0755</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>src/main/resources</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>**/*.png</include>
- <include>**/*.jpg</include>
- </includes>
- </fileSet>
-
- </fileSets>
-
-</assembly>
+<?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.
+-->
+<assembly>
+ <id>commandline</id>
+
+ <formats>
+ <format>zip</format>
+ <format>dir</format>
+ </formats>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>RELEASE*</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>config</directory>
+ <outputDirectory>config</outputDirectory>
+ <includes>
+ <include>*.properties</include>
+ <include>allow</include>
+ <include>passwords</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/assembly/scripts</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>*.bat</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/assembly/scripts</directory>
+ <outputDirectory>.</outputDirectory>
+ <fileMode>0755</fileMode>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>**/*.png</include>
+ <include>**/*.jpg</include>
+ </includes>
+ </fileSet>
+
+ </fileSets>
+
+</assembly>
Modified: incubator/isis/trunk/examples/expensesOBSOLETE/distclient/build.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/expensesOBSOLETE/distclient/build.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/examples/expensesOBSOLETE/distclient/build.xml (original)
+++ incubator/isis/trunk/examples/expensesOBSOLETE/distclient/build.xml Fri May 13 13:52:06 2011
@@ -1,4 +1,22 @@
-<?xml version="1.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 name="expenses" default="create-wars" basedir="." xmlns:jw="org.unintelligible.antjnlpwar">
Modified: incubator/isis/trunk/examples/expensesOBSOLETE/distclient/client.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/expensesOBSOLETE/distclient/client.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/examples/expensesOBSOLETE/distclient/client.xml (original)
+++ incubator/isis/trunk/examples/expensesOBSOLETE/distclient/client.xml Fri May 13 13:52:06 2011
@@ -1,54 +1,73 @@
-<assembly>
- <id>client</id>
- <baseDirectory>isis-client</baseDirectory>
-
- <formats>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <outputDirectory></outputDirectory>
- <includes>
- <include>lcp.bat</include>
- <include>run.bat</include>
- <include>run.sh</include>
- </includes>
- <fileMode>755</fileMode>
- </fileSet>
-
- <fileSet>
- <outputDirectory>images</outputDirectory>
- <directory>../expenses.app.client/src/main/resources/images</directory>
- <includes>
- <include>*</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <outputDirectory>config</outputDirectory>
- <includes>
- <include>logging.properties</include>
- <include>client.properties</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <outputDirectory>config</outputDirectory>
- <directory>../expenses.app.client/config</directory>
- <includes>
- <include>hibernate.properties</include>
- <include>isis.properties</include>
- <include>passwords</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
+<?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.
+-->
+<assembly>
+ <id>client</id>
+ <baseDirectory>isis-client</baseDirectory>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>lcp.bat</include>
+ <include>run.bat</include>
+ <include>run.sh</include>
+ </includes>
+ <fileMode>755</fileMode>
+ </fileSet>
+
+ <fileSet>
+ <outputDirectory>images</outputDirectory>
+ <directory>../expenses.app.client/src/main/resources/images</directory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <outputDirectory>config</outputDirectory>
+ <includes>
+ <include>logging.properties</include>
+ <include>client.properties</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <outputDirectory>config</outputDirectory>
+ <directory>../expenses.app.client/config</directory>
+ <includes>
+ <include>hibernate.properties</include>
+ <include>isis.properties</include>
+ <include>passwords</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Modified: incubator/isis/trunk/examples/expensesOBSOLETE/distserver/server.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/expensesOBSOLETE/distserver/server.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/examples/expensesOBSOLETE/distserver/server.xml (original)
+++ incubator/isis/trunk/examples/expensesOBSOLETE/distserver/server.xml Fri May 13 13:52:06 2011
@@ -1,62 +1,81 @@
-<assembly>
- <id>server</id>
- <baseDirectory>isis-server</baseDirectory>
-
- <formats>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <outputDirectory></outputDirectory>
- <includes>
- <include>lcp.bat</include>
- <include>run.bat</include>
- <include>run.sh</include>
- </includes>
- <fileMode>755</fileMode>
- </fileSet>
-
- <fileSet>
- <outputDirectory>images</outputDirectory>
- <directory>../expenses.app.client/src/main/resources/images</directory>
- <includes>
- <include>*</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <outputDirectory>config</outputDirectory>
- <includes>
- <include>logging.properties</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <outputDirectory>web</outputDirectory>
- <directory>../expenses.app.client/src/main/webapp</directory>
- <excludes>
- <exclude>WEB-INF</exclude>
- </excludes>
- </fileSet>
-
- <fileSet>
- <outputDirectory>config</outputDirectory>
- <directory>../expenses.app.client/config</directory>
- <includes>
- <include>isis.properties</include>
- <include>hibernate.properties</include>
- <include>web.properties</include>
- <include>passwords</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
+<?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.
+-->
+<assembly>
+ <id>server</id>
+ <baseDirectory>isis-server</baseDirectory>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>lcp.bat</include>
+ <include>run.bat</include>
+ <include>run.sh</include>
+ </includes>
+ <fileMode>755</fileMode>
+ </fileSet>
+
+ <fileSet>
+ <outputDirectory>images</outputDirectory>
+ <directory>../expenses.app.client/src/main/resources/images</directory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <outputDirectory>config</outputDirectory>
+ <includes>
+ <include>logging.properties</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <outputDirectory>web</outputDirectory>
+ <directory>../expenses.app.client/src/main/webapp</directory>
+ <excludes>
+ <exclude>WEB-INF</exclude>
+ </excludes>
+ </fileSet>
+
+ <fileSet>
+ <outputDirectory>config</outputDirectory>
+ <directory>../expenses.app.client/config</directory>
+ <includes>
+ <include>isis.properties</include>
+ <include>hibernate.properties</include>
+ <include>web.properties</include>
+ <include>passwords</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Modified: incubator/isis/trunk/examples/expensesOBSOLETE/hibernate/src/main/resources/hibernate.cfg.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/expensesOBSOLETE/hibernate/src/main/resources/hibernate.cfg.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/examples/expensesOBSOLETE/hibernate/src/main/resources/hibernate.cfg.xml (original)
+++ incubator/isis/trunk/examples/expensesOBSOLETE/hibernate/src/main/resources/hibernate.cfg.xml Fri May 13 13:52:06 2011
@@ -1,4 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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.
+-->
<!DOCTYPE hibernate-configuration PUBLIC
"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
@@ -25,9 +43,9 @@
<property name="connection.password"></property>
<property name="connection.url">jdbc:hsqldb:file:hsql-db/expenses</property>
<property name="dialect">org.hibernate.dialect.HSQLDialect</property>
-
- <!-- MySQL
- <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>
+
+ <!-- MySQL
+ <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>
<property name="hibernate.connection.url">jdbc:mysql://localhost:3306/expenses</property>
<property name="hibernate.connection.username">adapter</property>
<property name="hibernate.connection.password">password</property>
Modified: incubator/isis/trunk/examples/expensesOBSOLETE/scimpi/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/expensesOBSOLETE/scimpi/src/main/webapp/WEB-INF/web.xml?rev=1102735&r1=1102734&r2=1102735&view=diff
==============================================================================
--- incubator/isis/trunk/examples/expensesOBSOLETE/scimpi/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/expensesOBSOLETE/scimpi/src/main/webapp/WEB-INF/web.xml Fri May 13 13:52:06 2011
@@ -1,28 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>webapp-demo</display-name>
-
- <welcome-file-list>
- <welcome-file>index.shtml</welcome-file>
- </welcome-file-list>
-
- <listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.servlet.SystemInitializer</listener-class>
- </listener>
-
- <servlet >
- <servlet-name>dispatcher</servlet-name>
- <servlet-class>org.apache.isis.runtimes.dflt.webapp.servlet.DispatcherServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>dispatcher</servlet-name>
- <url-pattern>*.shtml</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>dispatcher</servlet-name>
- <url-pattern>*.app</url-pattern>
- </servlet-mapping>
-
-</web-app>
+<!--
+ 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.
+-->
+<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <display-name>webapp-demo</display-name>
+
+ <welcome-file-list>
+ <welcome-file>index.shtml</welcome-file>
+ </welcome-file-list>
+
+ <listener>
+ <listener-class>org.apache.isis.runtimes.dflt.webapp.servlet.SystemInitializer</listener-class>
+ </listener>
+
+ <servlet >
+ <servlet-name>dispatcher</servlet-name>
+ <servlet-class>org.apache.isis.runtimes.dflt.webapp.servlet.DispatcherServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>dispatcher</servlet-name>
+ <url-pattern>*.shtml</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>dispatcher</servlet-name>
+ <url-pattern>*.app</url-pattern>
+ </servlet-mapping>
+
+</web-app>