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/01/26 14:25:45 UTC
[23/23] git commit: ISIS-319: release preparation tasks
Updated Branches:
refs/heads/master 46827c99a -> a23e6e73b
ISIS-319: release preparation tasks
* updating core and components to correct -SNAPSHOT prior to release
* updating other components references
* tidy up of examples/application
* remove onlinedemo
* split quickstart into quickstart_scimpi_nosql and quickstart_html_sql
* general tidy up/improvement of dependencyManagement, dependency sections in poms.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a23e6e73
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a23e6e73
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a23e6e73
Branch: refs/heads/master
Commit: a23e6e73b9d8ea2b98ec8617630377700911ae3a
Parents: 46827c9
Author: Dan Haywood <da...@apache.org>
Authored: Sat Jan 26 13:25:16 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Sat Jan 26 13:25:16 2013 +0000
----------------------------------------------------------------------
component/objectstore/jdo/pom.xml | 3 +-
component/objectstore/nosql/pom.xml | 55 +-
component/objectstore/sql/pom.xml | 54 +-
component/objectstore/sql/sql-impl/pom.xml | 2 +-
component/objectstore/sql/sql-tests-common/pom.xml | 12 +-
component/objectstore/sql/sql-tests-served/pom.xml | 1 +
component/objectstore/xml/pom.xml | 8 +-
component/profilestore/sql/pom.xml | 6 +-
component/profilestore/xml/pom.xml | 6 +-
component/progmodel/groovy/pom.xml | 16 +-
component/progmodel/wrapper/pom.xml | 42 +-
.../progmodel/wrapper/wrapper-metamodel/pom.xml | 11 +-
component/security/file/pom.xml | 2 +-
component/security/ldap/pom.xml | 2 +-
component/security/shiro/pom.xml | 16 +-
component/security/sql/pom.xml | 2 +-
component/viewer/bdd/common/pom.xml | 5 -
component/viewer/bdd/pom.xml | 65 +-
component/viewer/bdd/tck/pom.xml | 23 +-
component/viewer/dnd/impl/pom.xml | 1 -
component/viewer/dnd/pom.xml | 53 +-
component/viewer/dnd/tck/pom.xml | 16 +-
component/viewer/html/pom.xml | 42 +-
component/viewer/html/tck/pom.xml | 9 +-
component/viewer/junit/pom.xml | 54 +-
component/viewer/junit/tck/pom.xml | 10 +-
component/viewer/restfulobjects/pom.xml | 2 +-
component/viewer/restfulobjects/tck/pom.xml | 22 +-
component/viewer/scimpi/pom.xml | 12 +-
component/viewer/scimpi/tck/pom.xml | 62 +-
component/viewer/wicket/impl/pom.xml | 3 +-
component/viewer/wicket/model/pom.xml | 7 +-
component/viewer/wicket/pom.xml | 36 +-
component/viewer/wicket/tck/pom.xml | 9 +-
component/viewer/wicket/ui/pom.xml | 17 +-
core/applib/pom.xml | 2 +-
core/bytecode-cglib/pom.xml | 2 +-
core/bytecode-javassist/pom.xml | 3 +-
core/integtestsupport/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/objectstore-inmemory/pom.xml | 2 +-
core/pom.xml | 55 +-
core/profilestore-inmemory/pom.xml | 2 +-
core/runtime/pom.xml | 2 +-
core/security-noop/pom.xml | 3 +-
core/tck/pom.xml | 2 +-
core/tck/tck-dom/pom.xml | 2 +-
core/tck/tck-fixture/pom.xml | 2 +-
core/unittestsupport/pom.xml | 3 +-
core/webserver/pom.xml | 3 +-
example/application/claims/objstore-jdo/pom.xml | 57 -
.../claims/objstore/jdo/ClaimRepositoryJdo.java | 59 -
.../claims/objstore/jdo/EmployeeRepositoryJdo.java | 36 -
example/application/claims/pom.xml | 303 +-
example/application/claims/viewer-dnd/pom.xml | 217 -
.../ide/eclipse/launch/claims-viewer-json.launch | 19 -
.../claims/viewer-restfulobjects/pom.xml | 114 -
.../src/main/webapp/WEB-INF/isis.properties | 27 -
.../src/main/webapp/WEB-INF/logging.properties | 30 -
.../src/main/webapp/WEB-INF/security_file.allow | 16 -
.../main/webapp/WEB-INF/security_file.passwords | 20 -
.../src/main/webapp/WEB-INF/web.xml | 122 -
.../ide/eclipse/launch/claims-viewer-wicket.launch | 20 -
example/application/claims/viewer-wicket/pom.xml | 169 -
.../claimwizard/ClaimWizardComponentFactory.java | 63 -
.../java-ARCHIVED/claimwizard/ClaimWizardPanel.css | 25 -
.../claimwizard/ClaimWizardPanel.html | 42 -
.../claimwizard/ClaimWizardPanel.java | 154 -
.../viewer/wicket/app/ClaimsApplication.java | 44 -
.../src/main/resources/css/application.css | 30 -
.../webapp/WEB-INF/authentication_file.passwords | 20 -
.../main/webapp/WEB-INF/authorization_file.allow | 16 -
.../src/main/webapp/WEB-INF/isis.properties | 205 -
.../viewer-wicket/src/main/webapp/WEB-INF/web.xml | 53 -
example/application/onlinedemo/dom/pom.xml | 43 -
.../onlinedemo/dom/demo/DemoFixtures.java | 50 -
.../onlinedemo/dom/items/Categories.java | 78 -
.../application/onlinedemo/dom/items/Category.java | 65 -
.../application/onlinedemo/dom/items/ToDoItem.java | 296 -
.../onlinedemo/dom/items/ToDoItems.java | 119 -
.../dom/src/main/resources/images/Category.gif | Bin 805 -> 0 bytes
.../dom/src/main/resources/images/ToDoItem.gif | Bin 1592 -> 0 bytes
example/application/onlinedemo/fixture/pom.xml | 38 -
.../fixture/items/DemoFixturesDefault.java | 80 -
.../onlinedemo/fixture/items/ToDoItemsFixture.java | 95 -
example/application/onlinedemo/pom.xml | 308 -
example/application/onlinedemo/webapp/pom.xml | 133 -
...gerSupportingInMemoryRegistrationInstaller.java | 43 -
.../onlinedemo/auth/AuthenticatorInMemory.java | 81 -
.../webapp/src/main/jettyconsole/isis-banner.pdn | Bin 39945 -> 0 bytes
.../webapp/src/main/jettyconsole/isis-banner.png | Bin 17837 -> 0 bytes
.../main/jettyconsole/isis-onlinedemo-banner.pdn | Bin 47110 -> 0 bytes
.../main/jettyconsole/isis-onlinedemo-banner.png | Bin 20695 -> 0 bytes
.../webapp/src/main/resources/images/Default.png | Bin 3016 -> 0 bytes
.../webapp/src/main/webapp/WEB-INF/isis.properties | 58 -
.../src/main/webapp/WEB-INF/logging.properties | 32 -
.../src/main/webapp/WEB-INF/security_file.allow | 23 -
.../main/webapp/WEB-INF/security_file.passwords | 28 -
.../src/main/webapp/WEB-INF/viewer_html.properties | 27 -
.../webapp/src/main/webapp/WEB-INF/web.xml | 288 -
.../onlinedemo/webapp/src/main/webapp/default.css | 939 --
.../webapp/src/main/webapp/doc/IsisUseCases.png | Bin 13336 -> 0 bytes
.../main/webapp/doc/apidocs/allclasses-frame.html | 40 -
.../webapp/doc/apidocs/allclasses-noframe.html | 40 -
.../main/webapp/doc/apidocs/constant-values.html | 147 -
.../main/webapp/doc/apidocs/deprecated-list.html | 147 -
.../src/main/webapp/doc/apidocs/help-doc.html | 224 -
.../src/main/webapp/doc/apidocs/index-all.html | 311 -
.../webapp/src/main/webapp/doc/apidocs/index.html | 40 -
.../examples/onlinedemo/dom/demo/DemoFixtures.html | 218 -
.../dom/demo/class-use/DemoFixtures.html | 145 -
.../onlinedemo/dom/demo/package-frame.html | 33 -
.../onlinedemo/dom/demo/package-summary.html | 158 -
.../examples/onlinedemo/dom/demo/package-tree.html | 152 -
.../examples/onlinedemo/dom/demo/package-use.html | 145 -
.../examples/onlinedemo/dom/items/Categories.html | 252 -
.../examples/onlinedemo/dom/items/Category.html | 311 -
.../examples/onlinedemo/dom/items/ToDoItem.html | 749 --
.../examples/onlinedemo/dom/items/ToDoItems.html | 275 -
.../onlinedemo/dom/items/class-use/Categories.html | 145 -
.../onlinedemo/dom/items/class-use/Category.html | 247 -
.../onlinedemo/dom/items/class-use/ToDoItem.html | 300 -
.../onlinedemo/dom/items/class-use/ToDoItems.html | 181 -
.../onlinedemo/dom/items/package-frame.html | 48 -
.../onlinedemo/dom/items/package-summary.html | 180 -
.../onlinedemo/dom/items/package-tree.html | 164 -
.../examples/onlinedemo/dom/items/package-use.html | 202 -
.../main/webapp/doc/apidocs/overview-frame.html | 45 -
.../main/webapp/doc/apidocs/overview-summary.html | 161 -
.../src/main/webapp/doc/apidocs/overview-tree.html | 163 -
.../src/main/webapp/doc/apidocs/package-list | 2 -
.../main/webapp/doc/apidocs/resources/inherit.gif | Bin 57 -> 0 bytes
.../src/main/webapp/doc/apidocs/stylesheet.css | 29 -
.../src/main/webapp/doc/htmlviewer-collection.png | Bin 196276 -> 0 bytes
.../webapp/src/main/webapp/doc/htmlviewer-demo.png | Bin 126807 -> 0 bytes
.../src/main/webapp/doc/htmlviewer-homepage.png | Bin 129750 -> 0 bytes
.../src/main/webapp/doc/htmlviewer-logon.png | Bin 125184 -> 0 bytes
.../src/main/webapp/doc/htmlviewer-object.png | Bin 166371 -> 0 bytes
.../src/main/webapp/doc/htmlviewer-register.png | Bin 126773 -> 0 bytes
.../main/webapp/doc/htmlviewer-resetfixtures.png | Bin 164188 -> 0 bytes
.../webapp/src/main/webapp/doc/index.html | 190 -
.../webapp/src/main/webapp/doc/isis-logo.png | Bin 14160 -> 0 bytes
.../webapp/src/main/webapp/doc/jqm-collection.png | Bin 57799 -> 0 bytes
.../webapp/src/main/webapp/doc/jqm-home.png | Bin 53346 -> 0 bytes
.../webapp/src/main/webapp/doc/jqm-list.png | Bin 59848 -> 0 bytes
.../webapp/src/main/webapp/doc/jqm-object.png | Bin 62886 -> 0 bytes
.../src/main/webapp/doc/restconsole-accept.png | Bin 116380 -> 0 bytes
.../main/webapp/doc/restconsole-basicauth-1.png | Bin 141964 -> 0 bytes
.../main/webapp/doc/restconsole-basicauth-2.png | Bin 145342 -> 0 bytes
.../main/webapp/doc/restconsole-basicauth-3.png | Bin 118466 -> 0 bytes
.../src/main/webapp/doc/restconsole-click-thru.png | Bin 119829 -> 0 bytes
.../src/main/webapp/doc/restconsole-headers.png | Bin 126396 -> 0 bytes
.../main/webapp/doc/restconsole-invoke-link.png | Bin 127748 -> 0 bytes
.../main/webapp/doc/restconsole-invoke-request.png | Bin 120997 -> 0 bytes
.../webapp/doc/restconsole-invoke-response.png | Bin 122223 -> 0 bytes
.../src/main/webapp/doc/restconsole-response.png | Bin 120164 -> 0 bytes
.../src/main/webapp/doc/restconsole-services.png | Bin 117444 -> 0 bytes
.../src/main/webapp/doc/xref/allclasses-frame.html | 32 -
.../webapp/src/main/webapp/doc/xref/index.html | 66 -
.../examples/onlinedemo/dom/demo/DemoFixtures.html | 60 -
.../onlinedemo/dom/demo/package-frame.html | 24 -
.../onlinedemo/dom/demo/package-summary.html | 67 -
.../examples/onlinedemo/dom/items/Categories.html | 65 -
.../examples/onlinedemo/dom/items/Category.html | 74 -
.../examples/onlinedemo/dom/items/ToDoItem.html | 295 -
.../examples/onlinedemo/dom/items/ToDoItems.html | 76 -
.../onlinedemo/dom/items/package-frame.html | 33 -
.../onlinedemo/dom/items/package-summary.html | 82 -
.../src/main/webapp/doc/xref/overview-frame.html | 28 -
.../src/main/webapp/doc/xref/overview-summary.html | 69 -
.../webapp/src/main/webapp/doc/xref/stylesheet.css | 116 -
.../webapp/src/main/webapp/doc/yuml-me.png | Bin 25026 -> 0 bytes
.../webapp/src/main/webapp/generic/app.js | 339 -
.../webapp/src/main/webapp/generic/generic.css | 56 -
.../webapp/src/main/webapp/generic/index.html | 87 -
.../webapp/src/main/webapp/images/banner-bg.png | Bin 936 -> 0 bytes
.../webapp/src/main/webapp/images/banner.png | Bin 30394 -> 0 bytes
.../webapp/jquery.mobile/images/ajax-loader.png | Bin 366 -> 0 bytes
.../webapp/jquery.mobile/images/icons-18-black.png | Bin 2152 -> 0 bytes
.../webapp/jquery.mobile/images/icons-18-white.png | Bin 1958 -> 0 bytes
.../webapp/jquery.mobile/images/icons-36-black.png | Bin 4260 -> 0 bytes
.../webapp/jquery.mobile/images/icons-36-white.png | Bin 3746 -> 0 bytes
.../webapp/jquery.mobile/jquery.mobile-1.0.css | 1847 ---
.../main/webapp/jquery.mobile/jquery.mobile-1.0.js | 6951 -----------
.../webapp/jquery.mobile/jquery.mobile-1.0.min.css | 2 -
.../webapp/jquery.mobile/jquery.mobile-1.0.min.js | 172 -
.../jquery.mobile/jquery.mobile.structure-1.0.css | 714 --
.../jquery.mobile.structure-1.0.min.css | 2 -
.../webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.js | 484 -
.../jquery.tmpl/jquery.tmpl-vBeta1.0.0.min.js | 10 -
.../webapp/src/main/webapp/jquery/jquery-1.6.4.js | 9046 ---------------
.../src/main/webapp/jquery/jquery-1.6.4.min.js | 4 -
.../webapp/src/main/webapp/mobile/app.js | 24 -
.../webapp/src/main/webapp/mobile/generic.js | 226 -
.../webapp/src/main/webapp/mobile/index.html | 191 -
.../webapp/src/main/webapp/mobile/namespace.js | 13 -
.../webapp/src/main/webapp/mobile/util.js | 94 -
.../application/quickstart/dom/log4j.properties | 24 -
example/application/quickstart/dom/pom.xml | 40 -
.../dom/src/main/java/dom/todo/ToDoItem.java | 225 -
.../dom/src/main/java/dom/todo/ToDoItems.java | 139 -
.../dom/src/main/resources/images/AuditEntry.png | Bin 2215 -> 0 bytes
.../dom/src/main/resources/images/ToDoItem.gif | Bin 1592 -> 0 bytes
example/application/quickstart/fixture/pom.xml | 39 -
.../src/main/java/fixture/LogonAsSvenFixture.java | 30 -
.../main/java/fixture/todo/ToDoItemsFixture.java | 74 -
.../fixture/todo/ToDoItemsFixturesService.java | 46 -
example/application/quickstart/pom.xml | 435 -
.../quickstart/viewer-dnd/config/isis.properties | 116 -
.../viewer-dnd/config/logging.properties | 34 -
.../config/persistor_in-memory.properties | 25 -
.../viewer-dnd/config/persistor_xml.properties | 22 -
.../viewer-dnd/config/viewer_dnd.properties | 22 -
.../eclipse/launch/quickstart-viewer-dnd.launch | 20 -
example/application/quickstart/viewer-dnd/pom.xml | 159 -
.../quickstart/viewer-html/hsql-db/tests.lck | Bin 16 -> 0 bytes
.../quickstart/viewer-html/hsql-db/tests.log | 2 -
.../viewer-html/hsql-db/tests.properties | 4 -
.../quickstart/viewer-html/hsql-db/tests.script | 46 -
.../eclipse/launch/quickstart-viewer-html.launch | 20 -
.../quickstart/viewer-html/lib/.gitignore | 5 -
example/application/quickstart/viewer-html/pom.xml | 185 -
.../src/main/jettyconsole/isis-banner.pdn | Bin 64679 -> 0 bytes
.../src/main/jettyconsole/isis-banner.png | Bin 24486 -> 0 bytes
.../src/main/resources/images/Default.png | Bin 3016 -> 0 bytes
.../webapp/WEB-INF/authentication_file.passwords | 28 -
.../webapp/WEB-INF/authentication_file.properties | 25 -
.../main/webapp/WEB-INF/authorization_file.allow | 28 -
.../webapp/WEB-INF/authorization_file.properties | 47 -
.../src/main/webapp/WEB-INF/isis.properties | 180 -
.../src/main/webapp/WEB-INF/logging.properties | 89 -
.../main/webapp/WEB-INF/persistor_sql.properties | 72 -
.../src/main/webapp/WEB-INF/viewer_html.properties | 31 -
.../viewer-html/src/main/webapp/WEB-INF/web.xml | 233 -
.../main/webapp/htmlviewer/images/banner-bg.png | Bin 936 -> 0 bytes
.../src/main/webapp/htmlviewer/images/banner.png | Bin 30394 -> 0 bytes
.../src/main/webapp/htmlviewer/style/default.css | 928 --
.../eclipse/launch/quickstart-viewer-scimpi.launch | 20 -
.../quickstart/viewer-scimpi/lib/.gitignore | 5 -
.../application/quickstart/viewer-scimpi/pom.xml | 182 -
.../src/main/jettyconsole/isis-banner.pdn | Bin 64679 -> 0 bytes
.../src/main/jettyconsole/isis-banner.png | Bin 24486 -> 0 bytes
.../src/main/resources/images/Default.png | Bin 3016 -> 0 bytes
.../src/main/webapp/ToDoItem/edit.shtml | 27 -
.../src/main/webapp/ToDoItem/object.shtml | 32 -
.../webapp/WEB-INF/authentication_file.passwords | 28 -
.../webapp/WEB-INF/authentication_file.properties | 25 -
.../main/webapp/WEB-INF/authorization_file.allow | 28 -
.../webapp/WEB-INF/authorization_file.properties | 47 -
.../src/main/webapp/WEB-INF/isis.properties | 182 -
.../src/main/webapp/WEB-INF/logging.properties | 89 -
.../webapp/WEB-INF/persistor_fileserver.properties | 25 -
.../webapp/WEB-INF/persistor_in-memory.properties | 25 -
.../webapp/WEB-INF/persistor_mongodb.properties | 47 -
.../main/webapp/WEB-INF/viewer_scimpi.properties | 25 -
.../viewer-scimpi/src/main/webapp/WEB-INF/web.xml | 174 -
.../viewer-scimpi/src/main/webapp/debug.shtml | 23 -
.../viewer-scimpi/src/main/webapp/error.shtml | 23 -
.../src/main/webapp/generic/action.shtml | 26 -
.../src/main/webapp/generic/collection.shtml | 26 -
.../src/main/webapp/generic/edit.shtml | 26 -
.../src/main/webapp/generic/object.shtml | 28 -
.../viewer-scimpi/src/main/webapp/index.shtml | 22 -
.../viewer-scimpi/src/main/webapp/login.shtml | 28 -
.../src/main/webapp/scimpi/custom/new-todo.shtml | 26 -
.../src/main/webapp/scimpi/images/scimpi-logo.png | Bin 7183 -> 0 bytes
.../src/main/webapp/scimpi/style/reset.css | 68 -
.../src/main/webapp/scimpi/style/screen.css | 338 -
.../main/webapp/scimpi/style/site-template.shtml | 54 -
.../src/main/webapp/scimpi/style/template.shtml | 35 -
.../quickstart_dnd_junit_bdd/dom/pom.xml | 2 +-
.../quickstart_dnd_junit_bdd/fixture/pom.xml | 2 +-
.../application/quickstart_dnd_junit_bdd/pom.xml | 237 +-
.../quickstart_dnd_junit_bdd/tests-bdd/pom.xml | 2 +-
.../quickstart_dnd_junit_bdd/tests-junit/pom.xml | 3 +-
.../quickstart_dnd_junit_bdd/viewer-dnd/pom.xml | 3 +-
.../quickstart_html_sql/dom/log4j.properties | 24 +
.../application/quickstart_html_sql/dom/pom.xml | 39 +
.../dom/src/main/java/dom/todo/ToDoItem.java | 225 +
.../dom/src/main/java/dom/todo/ToDoItems.java | 139 +
.../dom/src/main/resources/images/AuditEntry.png | Bin 0 -> 2215 bytes
.../dom/src/main/resources/images/ToDoItem.gif | Bin 0 -> 1592 bytes
.../quickstart_html_sql/fixture/pom.xml | 40 +
.../src/main/java/fixture/LogonAsSvenFixture.java | 30 +
.../main/java/fixture/todo/ToDoItemsFixture.java | 74 +
.../fixture/todo/ToDoItemsFixturesService.java | 46 +
example/application/quickstart_html_sql/pom.xml | 258 +
.../viewer-html/hsql-db/tests.lck | Bin 0 -> 16 bytes
.../viewer-html/hsql-db/tests.log | 2 +
.../viewer-html/hsql-db/tests.properties | 4 +
.../viewer-html/hsql-db/tests.script | 46 +
.../eclipse/launch/quickstart-viewer-html.launch | 20 +
.../quickstart_html_sql/viewer-html/lib/.gitignore | 5 +
.../quickstart_html_sql/viewer-html/pom.xml | 186 +
.../src/main/jettyconsole/isis-banner.pdn | Bin 0 -> 64679 bytes
.../src/main/jettyconsole/isis-banner.png | Bin 0 -> 24486 bytes
.../src/main/resources/images/Default.png | Bin 0 -> 3016 bytes
.../webapp/WEB-INF/authentication_file.passwords | 28 +
.../webapp/WEB-INF/authentication_file.properties | 25 +
.../main/webapp/WEB-INF/authorization_file.allow | 28 +
.../webapp/WEB-INF/authorization_file.properties | 47 +
.../src/main/webapp/WEB-INF/isis.properties | 180 +
.../src/main/webapp/WEB-INF/logging.properties | 89 +
.../main/webapp/WEB-INF/persistor_sql.properties | 72 +
.../src/main/webapp/WEB-INF/viewer_html.properties | 31 +
.../viewer-html/src/main/webapp/WEB-INF/web.xml | 233 +
.../main/webapp/htmlviewer/images/banner-bg.png | Bin 0 -> 936 bytes
.../src/main/webapp/htmlviewer/images/banner.png | Bin 0 -> 30394 bytes
.../src/main/webapp/htmlviewer/style/default.css | 928 ++
.../quickstart_scimpi_nosql/dom/log4j.properties | 24 +
.../quickstart_scimpi_nosql/dom/pom.xml | 40 +
.../dom/src/main/java/dom/todo/ToDoItem.java | 225 +
.../dom/src/main/java/dom/todo/ToDoItems.java | 139 +
.../dom/src/main/resources/images/AuditEntry.png | Bin 0 -> 2215 bytes
.../dom/src/main/resources/images/ToDoItem.gif | Bin 0 -> 1592 bytes
.../quickstart_scimpi_nosql/fixture/pom.xml | 40 +
.../src/main/java/fixture/LogonAsSvenFixture.java | 30 +
.../main/java/fixture/todo/ToDoItemsFixture.java | 74 +
.../fixture/todo/ToDoItemsFixturesService.java | 46 +
.../application/quickstart_scimpi_nosql/pom.xml | 229 +
.../eclipse/launch/quickstart-viewer-scimpi.launch | 18 +
.../viewer-scimpi/lib/.gitignore | 5 +
.../quickstart_scimpi_nosql/viewer-scimpi/pom.xml | 148 +
.../src/main/jettyconsole/isis-banner.pdn | Bin 0 -> 64679 bytes
.../src/main/jettyconsole/isis-banner.png | Bin 0 -> 24486 bytes
.../src/main/resources/images/Default.png | Bin 0 -> 3016 bytes
.../src/main/webapp/ToDoItem/edit.shtml | 27 +
.../src/main/webapp/ToDoItem/object.shtml | 32 +
.../webapp/WEB-INF/authentication_file.passwords | 28 +
.../webapp/WEB-INF/authentication_file.properties | 25 +
.../main/webapp/WEB-INF/authorization_file.allow | 28 +
.../webapp/WEB-INF/authorization_file.properties | 47 +
.../src/main/webapp/WEB-INF/isis.properties | 182 +
.../src/main/webapp/WEB-INF/logging.properties | 89 +
.../webapp/WEB-INF/persistor_fileserver.properties | 25 +
.../webapp/WEB-INF/persistor_in-memory.properties | 25 +
.../webapp/WEB-INF/persistor_mongodb.properties | 47 +
.../main/webapp/WEB-INF/viewer_scimpi.properties | 25 +
.../viewer-scimpi/src/main/webapp/WEB-INF/web.xml | 174 +
.../viewer-scimpi/src/main/webapp/debug.shtml | 23 +
.../viewer-scimpi/src/main/webapp/error.shtml | 23 +
.../src/main/webapp/generic/action.shtml | 26 +
.../src/main/webapp/generic/collection.shtml | 26 +
.../src/main/webapp/generic/edit.shtml | 26 +
.../src/main/webapp/generic/object.shtml | 28 +
.../viewer-scimpi/src/main/webapp/index.shtml | 22 +
.../viewer-scimpi/src/main/webapp/login.shtml | 28 +
.../src/main/webapp/scimpi/custom/new-todo.shtml | 26 +
.../src/main/webapp/scimpi/images/scimpi-logo.png | Bin 0 -> 7183 bytes
.../src/main/webapp/scimpi/style/reset.css | 68 +
.../src/main/webapp/scimpi/style/screen.css | 338 +
.../main/webapp/scimpi/style/site-template.shtml | 54 +
.../src/main/webapp/scimpi/style/template.shtml | 35 +
.../quickstart_wicket_restful_jdo/dom/pom.xml | 2 +-
.../quickstart_wicket_restful_jdo/fixture/pom.xml | 2 +-
.../objstore-jdo/pom.xml | 2 +-
.../quickstart_wicket_restful_jdo/pom.xml | 12 +-
.../viewer-webapp/pom.xml | 2 +-
example/domain-service/email-service/pom.xml | 11 +-
example/misc/metamodel/namefile/pom.xml | 6 +-
pom.xml | 5 +-
site-skin/pom.xml | 2 +-
tool/maven-plugin/pom.xml | 2 +-
363 files changed, 5655 insertions(+), 37242 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index 963e0a2..35890ff 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -94,7 +94,6 @@
<dependencies>
<!-- also for benefit of application developers, using scope=import -->
-
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/objectstore/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/pom.xml b/component/objectstore/nosql/pom.xml
index 79dc992..b025a72 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.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -75,49 +75,6 @@
</plugins>
</pluginManagement>
<plugins>
-
- <!--
- REVIEW: have removed, cos for some bizarre reason causes maven
- to restart the build???
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>assembly</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy todir="target/config" preservelastmodified="true">
- <fileset dir="config" />
- </copy>
- <copy file="server.sh" todir="target" />
- <chmod file="target/server.sh" perm="ugo+rx" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
-
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
@@ -153,6 +110,7 @@
</reporting>
<dependencyManagement>
+
<!-- for benefit of application developers, using scope=import -->
<dependencies>
<dependency>
@@ -162,7 +120,6 @@
</dependency>
-
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
@@ -187,9 +144,9 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
@@ -215,14 +172,12 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -230,28 +185,24 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-bytecode-cglib</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-objectstore</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/objectstore/sql/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/pom.xml b/component/objectstore/sql/pom.xml
index f13d673..337a6f4 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.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -32,6 +32,8 @@
<packaging>pom</packaging>
<properties>
+ <isis-objectstore-xml.version>1.0.0-SNAPSHOT</isis-objectstore-xml.version>
+
<siteBaseDir>.</siteBaseDir>
<relativeUrl/>
@@ -133,60 +135,12 @@
<version>1.0.0-SNAPSHOT</version>
</dependency>
-
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-integtestsupport</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
- <!-- Required for TestProxy -->
- <!-- Isis defaults -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-objectstore</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-objectstore</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-bytecode-cglib</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-tck-dom</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
<!-- Required to support the XML cross-test -->
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-xml</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${isis-objectstore-xml.version}</version>
</dependency>
-
<!-- Test environment -->
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/objectstore/sql/sql-impl/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/pom.xml b/component/objectstore/sql/sql-impl/pom.xml
index acb04fa..2c2cc81 100644
--- a/component/objectstore/sql/sql-impl/pom.xml
+++ b/component/objectstore/sql/sql-impl/pom.xml
@@ -61,7 +61,7 @@
<artifactId>isis-core-runtime</artifactId>
</dependency>
- <!-- Test dependencies -->
+ <!-- Test dependencies -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/objectstore/sql/sql-tests-common/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-tests-common/pom.xml b/component/objectstore/sql/sql-tests-common/pom.xml
index b3d7241..6d99dc3 100644
--- a/component/objectstore/sql/sql-tests-common/pom.xml
+++ b/component/objectstore/sql/sql-tests-common/pom.xml
@@ -89,12 +89,6 @@
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
</dependency>
- <!-- Required to support the XML cross-test -->
- <dependency>
- <groupId>org.apache.isis.core.objectstore</groupId>
- <artifactId>xml</artifactId>
- <version>${xml-objectstore.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -104,16 +98,16 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
+ <artifactId>isis-core-integtestsupport</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-integtestsupport</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
</dependency>
+
<!-- Required for TestProxy -->
<!-- Isis defaults -->
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/objectstore/sql/sql-tests-served/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-tests-served/pom.xml b/component/objectstore/sql/sql-tests-served/pom.xml
index 64c7f85..a274e93 100644
--- a/component/objectstore/sql/sql-tests-served/pom.xml
+++ b/component/objectstore/sql/sql-tests-served/pom.xml
@@ -149,6 +149,7 @@ Just add your server implementation to org.apache.isis.extensions.sql.objectstor
<scope>test</scope>
</dependency>
+
<!-- Required to support the implemented servers -->
<dependency>
<groupId>postgresql</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/objectstore/xml/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/pom.xml b/component/objectstore/xml/pom.xml
index 0454342..ff4d63d 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.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -121,39 +121,33 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-bytecode-cglib</artifactId>
- <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-dom</artifactId>
- <version>1.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/profilestore/sql/pom.xml
----------------------------------------------------------------------
diff --git a/component/profilestore/sql/pom.xml b/component/profilestore/sql/pom.xml
index 100d787..9667e8d 100755
--- a/component/profilestore/sql/pom.xml
+++ b/component/profilestore/sql/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -103,14 +103,12 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -118,12 +116,10 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/profilestore/xml/pom.xml
----------------------------------------------------------------------
diff --git a/component/profilestore/xml/pom.xml b/component/profilestore/xml/pom.xml
index 6e95fad..8a1733b 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.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -120,26 +120,22 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/progmodel/groovy/pom.xml
----------------------------------------------------------------------
diff --git a/component/progmodel/groovy/pom.xml b/component/progmodel/groovy/pom.xml
index 8326870..a33daad 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.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -95,20 +95,6 @@
<version>1.0.0-SNAPSHOT</version>
</dependency>
-
-
- <!-- Apache Isis -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
<!-- Groovy -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/progmodel/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/component/progmodel/wrapper/pom.xml b/component/progmodel/wrapper/pom.xml
index 89e191d..878950f 100644
--- a/component/progmodel/wrapper/pom.xml
+++ b/component/progmodel/wrapper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -106,56 +106,22 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>isis-progmodel-wrapper-applib</artifactId>
- <version>${project.version}</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>isis-progmodel-wrapper-applib</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>isis-progmodel-wrapper-impl</artifactId>
- <version>${project.version}</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
-
- <!-- isis core -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</dependencyManagement>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/progmodel/wrapper/wrapper-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/component/progmodel/wrapper/wrapper-metamodel/pom.xml b/component/progmodel/wrapper/wrapper-metamodel/pom.xml
index 85889e9..ed81cd4 100644
--- a/component/progmodel/wrapper/wrapper-metamodel/pom.xml
+++ b/component/progmodel/wrapper/wrapper-metamodel/pom.xml
@@ -88,12 +88,16 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-dom</artifactId>
<scope>test</scope>
- <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -111,11 +115,6 @@
<artifactId>cglib-nodep</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/security/file/pom.xml
----------------------------------------------------------------------
diff --git a/component/security/file/pom.xml b/component/security/file/pom.xml
index d336844..f388b39 100644
--- a/component/security/file/pom.xml
+++ b/component/security/file/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/security/ldap/pom.xml
----------------------------------------------------------------------
diff --git a/component/security/ldap/pom.xml b/component/security/ldap/pom.xml
index 7f745b5..68aafb6 100644
--- a/component/security/ldap/pom.xml
+++ b/component/security/ldap/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/security/shiro/pom.xml
----------------------------------------------------------------------
diff --git a/component/security/shiro/pom.xml b/component/security/shiro/pom.xml
index 46aa822..38cb484 100644
--- a/component/security/shiro/pom.xml
+++ b/component/security/shiro/pom.xml
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-shiro</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<name>Isis Shiro Security</name>
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-shiro</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -140,6 +140,11 @@
<artifactId>shiro-core</artifactId>
<version>${shiro.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-web</artifactId>
+ <version>${shiro.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -147,11 +152,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-web</artifactId>
- <version>${shiro.version}</version>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/security/sql/pom.xml
----------------------------------------------------------------------
diff --git a/component/security/sql/pom.xml b/component/security/sql/pom.xml
index a809fd9..a8cd7d6 100755
--- a/component/security/sql/pom.xml
+++ b/component/security/sql/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/bdd/common/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/common/pom.xml b/component/viewer/bdd/common/pom.xml
index 48cec9f..2b8fcd8 100755
--- a/component/viewer/bdd/common/pom.xml
+++ b/component/viewer/bdd/common/pom.xml
@@ -43,7 +43,6 @@
<artifactId>isis-core-metamodel</artifactId>
</dependency>
- <!-- TODO: remove this dependency -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
@@ -60,9 +59,5 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/bdd/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/pom.xml b/component/viewer/bdd/pom.xml
index 4cb0c7d..3eefd00 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.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -37,11 +37,13 @@
<properties>
<siteBaseDir>.</siteBaseDir>
- <relativeUrl/>
+ <relativeUrl/>
<docbkxGuideTitle>Apache Isis BDD Testing Guide</docbkxGuideTitle>
<docbkxGuideSubTitle>Acceptance Testing using BDD Frameworks</docbkxGuideSubTitle>
<docbkxGuideName>isis-bdd-integration</docbkxGuideName>
+
+ <isis-security-file.version>1.0.1-SNAPSHOT</isis-security-file.version>
</properties>
<!-- used in Site generation for relative references. -->
@@ -164,63 +166,10 @@ archetype includes this explicit dependency.
</dependency>
-
- <dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>isis-security-file</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-security</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
- <!-- 3rd party dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- </dependency>
-
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <version>2.5.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>1.3</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>13.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-objectstore</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-profilestore</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <groupId>org.apache.isis.security</groupId>
+ <artifactId>isis-security-file</artifactId>
+ <version>${isis-security-file.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/bdd/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/tck/pom.xml b/component/viewer/bdd/tck/pom.xml
index 76b5d77..7ceef6d 100644
--- a/component/viewer/bdd/tck/pom.xml
+++ b/component/viewer/bdd/tck/pom.xml
@@ -61,12 +61,6 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-fixture</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
</dependency>
<dependency>
@@ -81,7 +75,6 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-profilestore</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
@@ -102,18 +95,18 @@
<artifactId>xom</artifactId>
<version>1.2.5</version>
<exclusions>
- <exclusion>
- <!-- for dependency convergence -->
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
+ <exclusion>
+ <!-- for dependency convergence -->
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.3.03</version>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.03</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/dnd/impl/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/pom.xml b/component/viewer/dnd/impl/pom.xml
index 0808b2d..2dd37fc 100644
--- a/component/viewer/dnd/impl/pom.xml
+++ b/component/viewer/dnd/impl/pom.xml
@@ -26,7 +26,6 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-dnd-impl</artifactId>
<name>Isis Drag-n-Drop Viewer Implementation</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/dnd/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/pom.xml b/component/viewer/dnd/pom.xml
index 2134365..928c9d8 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.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -90,57 +90,6 @@
<version>1.0.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-dnd-tck</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
-
-
- <!-- isis core -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-integtestsupport</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-objectstore</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-bytecode-cglib</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/dnd/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/tck/pom.xml b/component/viewer/dnd/tck/pom.xml
index af814a2..65b44d0 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.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
@@ -36,10 +36,13 @@
<name>Isis Drag-n-Drop Viewer TCK tests</name>
<properties>
+ <isis-viewer-dnd.version>1.0.0-SNAPSHOT</isis-viewer-dnd.version>
+ <isis-objectstore-xml.version>1.0.0-SNAPSHOT</isis-objectstore-xml.version>
+
<siteBaseDir>..</siteBaseDir>
<relativeUrl>dnd-tck/</relativeUrl>
<!-- until someone comes up with a better solution -->
- <distMgmtSiteUrl>file:///tmp/m2-sites/isis/viewer/dnd</distMgmtSiteUrl>
+ <distMgmtSiteUrl>file:///tmp/m2-sites/isis/viewer/dnd</distMgmtSiteUrl>
</properties>
<build>
@@ -71,7 +74,6 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-fixture</artifactId>
- <version>1.0.1-SNAPSHOT</version>
</dependency>
<!-- isis core -->
@@ -97,18 +99,18 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
</dependency>
+
- <!-- isis viewers -->
+ <!-- isis non-core components -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-dnd-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${isis-viewer-dnd.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-xml</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${isis-objectstore-xml.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/html/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/html/pom.xml b/component/viewer/html/pom.xml
index 0ca5958..bf70aff 100644
--- a/component/viewer/html/pom.xml
+++ b/component/viewer/html/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -99,46 +99,6 @@
<version>1.0.0-SNAPSHOT</version>
</dependency>
-
-
- <!-- isis core -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-integtestsupport</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
-
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/html/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/html/tck/pom.xml b/component/viewer/html/tck/pom.xml
index c3d37e7..53a3607 100644
--- a/component/viewer/html/tck/pom.xml
+++ b/component/viewer/html/tck/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
@@ -31,6 +31,8 @@
<name>Isis Html Viewer TCK tests</name>
<properties>
+ <isis-viewer-html.version>1.0.0-SNAPSHOT</isis-viewer-html.version>
+
<siteBaseDir>..</siteBaseDir>
<relativeUrl>html-tck/</relativeUrl>
<!-- until someone comes up with a better solution -->
@@ -76,13 +78,11 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-dom</artifactId>
- <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-fixture</artifactId>
- <version>1.0.1-SNAPSHOT</version>
</dependency>
@@ -90,8 +90,9 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-html-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${isis-viewer-html.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/junit/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/junit/pom.xml b/component/viewer/junit/pom.xml
index 90d2b9b..d60b1b5 100644
--- a/component/viewer/junit/pom.xml
+++ b/component/viewer/junit/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -38,7 +38,7 @@
<siteBaseDir>.</siteBaseDir>
<relativeUrl/>
- <wrapper-progmodel.version>1.0.0-SNAPSHOT</wrapper-progmodel.version>
+ <isis-progmodel-wrapper.version>1.0.0-SNAPSHOT</isis-progmodel-wrapper.version>
<docbkxGuideTitle>Apache Isis JUnit Support</docbkxGuideTitle>
<docbkxGuideSubTitle>Acceptance Testing using JUnit</docbkxGuideSubTitle>
@@ -98,58 +98,12 @@
</dependency>
-
-
+ <!-- isis non-core components -->
<dependency>
<groupId>org.apache.isis.progmodel</groupId>
<artifactId>isis-progmodel-wrapper-metamodel</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-bytecode-cglib</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-objectstore</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-profilestore</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-security</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>${isis-progmodel-wrapper.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/junit/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/junit/tck/pom.xml b/component/viewer/junit/tck/pom.xml
index ba43c30..f3d42bb 100644
--- a/component/viewer/junit/tck/pom.xml
+++ b/component/viewer/junit/tck/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
@@ -32,6 +32,9 @@
<properties>
<maven.test.skip>true</maven.test.skip>
+
+ <isis-viewer-junit.version>1.0.0-SNAPSHOT</isis-viewer-junit.version>
+
<siteBaseDir>..</siteBaseDir>
<relativeUrl>junit-tck/</relativeUrl>
<!-- until someone comes up with a better solution -->
@@ -44,7 +47,6 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-fixture</artifactId>
- <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -52,6 +54,7 @@
<artifactId>isis-core-metamodel</artifactId>
</dependency>
+
<!-- isis default runtime -->
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -75,9 +78,10 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-junit-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${isis-viewer-junit.version}</version>
<scope>test</scope>
</dependency>
+
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/pom.xml b/component/viewer/restfulobjects/pom.xml
index aebf769..6a61100 100644
--- a/component/viewer/restfulobjects/pom.xml
+++ b/component/viewer/restfulobjects/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/restfulobjects/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/pom.xml b/component/viewer/restfulobjects/tck/pom.xml
index 02a888f..447f634 100644
--- a/component/viewer/restfulobjects/tck/pom.xml
+++ b/component/viewer/restfulobjects/tck/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
@@ -36,6 +36,9 @@
<properties>
<maven.test.skip>true</maven.test.skip>
+
+ <isis-viewer-restfulobjects.version>1.0.1-SNAPSHOT</isis-viewer-restfulobjects.version>
+
<siteBaseDir>..</siteBaseDir>
<relativeUrl>restfulobjects-tck/</relativeUrl>
<!-- until someone comes up with a better solution -->
@@ -75,18 +78,13 @@
<artifactId>isis-core-tck-fixture</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>2.3.1.GA</version>
- </dependency>
-
<!-- isis viewer -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-impl</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>${isis-viewer-restfulobjects.version}</version>
</dependency>
+
<!-- isis runtime -->
<dependency>
@@ -101,12 +99,16 @@
<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.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ </dependency>
+
<!-- to run using WebServer -->
<dependency>
<groupId>org.apache.isis.core</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/scimpi/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/pom.xml b/component/viewer/scimpi/pom.xml
index 86949c1..680fb1f 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.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
@@ -120,16 +120,6 @@
<version>1.0.0-SNAPSHOT</version>
</dependency>
-
-
- <!-- isis core -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
-
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/scimpi/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/tck/pom.xml b/component/viewer/scimpi/tck/pom.xml
index 04fd5eb..0b80414 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.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
@@ -32,13 +32,18 @@
<name>Isis Scimpi Viewer TCK tests</name>
<properties>
- <siteBaseDir>..</siteBaseDir>
- <relativeUrl>scimpi-tck/</relativeUrl>
- <!-- until someone comes up with a better solution -->
- <distMgmtSiteUrl>file:///tmp/m2-sites/isis/viewer/scimpi</distMgmtSiteUrl>
- </properties>
-
- <packaging>war</packaging>
+ <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>
+
+ <siteBaseDir>..</siteBaseDir>
+ <relativeUrl>scimpi-tck/</relativeUrl>
+ <!-- until someone comes up with a better solution -->
+ <distMgmtSiteUrl>file:///tmp/m2-sites/isis/viewer/scimpi</distMgmtSiteUrl>
+ </properties>
+
+ <packaging>war</packaging>
<build>
<plugins>
@@ -55,21 +60,35 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-dom</artifactId>
- <version>1.0.1-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck-fixture</artifactId>
- <version>1.0.1-SNAPSHOT</version>
</dependency>
- <!-- isis viewer -->
+
+ <!-- isis non-core components -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-scimpi-servlet</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${isis-viewer-scimpi.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-objectstore-xml</artifactId>
+ <version>${isis-objectstore-xml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.profilestore</groupId>
+ <artifactId>isis-profilestore-xml</artifactId>
+ <version>${isis-profilestore-xml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.security</groupId>
+ <artifactId>isis-security-file</artifactId>
+ <version>${isis-security-file.version}</version>
+ </dependency>
+
<!-- isis runtime -->
<dependency>
@@ -84,7 +103,6 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-profilestore</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
@@ -98,22 +116,6 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.apache.isis.objectstore</groupId>
- <artifactId>isis-objectstore-xml</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.profilestore</groupId>
- <artifactId>isis-profilestore-xml</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>isis-security-file</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/wicket/impl/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/pom.xml b/component/viewer/wicket/impl/pom.xml
index 19c3800..287909f 100644
--- a/component/viewer/wicket/impl/pom.xml
+++ b/component/viewer/wicket/impl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<name>Isis Wicket Viewer Implementation</name>
@@ -68,7 +68,6 @@
<artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/wicket/model/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/pom.xml b/component/viewer/wicket/model/pom.xml
index 0c8e75b..0367603 100644
--- a/component/viewer/wicket/model/pom.xml
+++ b/component/viewer/wicket/model/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-wicket-model</artifactId>
@@ -47,11 +47,6 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index 7f32e09..ddeacd1 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -17,20 +17,20 @@
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">
+<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.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<name>Isis Wicket Viewer</name>
@@ -100,36 +100,36 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -137,17 +137,6 @@
<!-- isis core -->
- <!-- HACK: missing in isis core's pom -->
- <!--
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- -->
-
<!-- Wicket -->
<dependency>
@@ -271,13 +260,6 @@
<version>1.7.2</version>
</dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-legacy</artifactId>
- <version>2.5.1</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</dependencyManagement>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/wicket/tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml
index 5c27b68..baac85a 100644
--- a/component/viewer/wicket/tck/pom.xml
+++ b/component/viewer/wicket/tck/pom.xml
@@ -23,17 +23,19 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-tck</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../../core/tck/pom.xml</relativePath>
</parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-tck</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<name>Isis Wicket Viewer TCK tests</name>
+
<properties>
+ <isis-viewer-wicket.version>1.1.0-SNAPSHOT</isis-viewer-wicket.version>
<jetty.version>6.1.4</jetty.version>
<siteBaseDir>..</siteBaseDir>
<relativeUrl>wicket-tck/</relativeUrl>
@@ -83,7 +85,7 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>${isis-viewer-wicket.version}</version>
</dependency>
<!-- isis runtime -->
@@ -99,7 +101,6 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-profilestore</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/component/viewer/wicket/ui/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/pom.xml b/component/viewer/wicket/ui/pom.xml
index 47408fa..e8e4147 100644
--- a/component/viewer/wicket/ui/pom.xml
+++ b/component/viewer/wicket/ui/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>isis-viewer-wicket-ui</artifactId>
@@ -59,16 +59,15 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-metamodel</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
@@ -78,27 +77,22 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-datetime</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-guice</artifactId>
</dependency>
-
<dependency>
<groupId>com.vaynberg.wicket.select2</groupId>
<artifactId>wicket-select2</artifactId>
@@ -122,5 +116,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 9d2cf73..0e18f3a 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/core/bytecode-cglib/pom.xml
----------------------------------------------------------------------
diff --git a/core/bytecode-cglib/pom.xml b/core/bytecode-cglib/pom.xml
index 9fa11b1..50773b0 100644
--- a/core/bytecode-cglib/pom.xml
+++ b/core/bytecode-cglib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-bytecode-cglib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/core/bytecode-javassist/pom.xml
----------------------------------------------------------------------
diff --git a/core/bytecode-javassist/pom.xml b/core/bytecode-javassist/pom.xml
index 7aec604..60da7d6 100644
--- a/core/bytecode-javassist/pom.xml
+++ b/core/bytecode-javassist/pom.xml
@@ -23,10 +23,9 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-bytecode-javassist</artifactId>
<name>Isis Core Javassist Bytecode</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/a23e6e73/core/integtestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index a684fc7..6bc611d 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>